巡检任务 设备维修新增是否生成工单字段 及 生成工单

shiyunteng

5 天以前 1eb6f4824c270de1a3d0bf766d44f1abb2c7f55d

巡检任务  设备维修新增是否生成工单字段 及 生成工单

 platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java

@@ -160,5 +160,21 @@
     * 设备采购计划状态-待审批
     */
    Integer DEVICE_PURCHASE_STATUS_APPROVED = 1;
    /**
     * 设备盘点计划状态-待审批
     */
    Integer DEVICE_STOCKTAKING_STATUS_APPROVED = 0;
    /**
     * 设备盘点计划状态-待生成
     */
    Integer DEVICE_STOCKTAKING_STATUS_GEN = 1;
    /**
     * 设备盘点计划状态-盘点中
     */
    Integer DEVICE_STOCKTAKING_STATUS_STOCKTATING = 2;
    /**
     * 设备盘点计划状态-完成
     */
    Integer DEVICE_STOCKTAKING_STATUS_COMPLETE = 3;

}

 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java

@@ -30,7 +30,7 @@
     * 设备编码
     */
    @Schema(description="设备编码")
    @Column(columnDefinition="VARCHAR(16) comment '设备编码'")
    @Column(columnDefinition="VARCHAR(64 ) comment '设备编码'")
    private String deviceCode;

    /**

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java

@@ -79,7 +79,7 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('device_workOrder_add')" )
    public R save(@RequestBody WorkOrder workOrder) {
        return R.ok(workOrderService.save(workOrder));
        return workOrderService.saveNew(workOrder);
    }

    /**

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java

@@ -7,4 +7,6 @@
public interface WorkOrderService extends IService<WorkOrder> {

    R updateByIdNew(WorkOrder workOrder);

    R saveNew(WorkOrder workOrder);
}

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java

@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.device.constant.CommonStatusContant;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.entity.WorkOrder;
import com.by4cloud.platformx.device.mapper.DeviceInventoryMapper;
import com.by4cloud.platformx.device.mapper.DeviceRepairMapper;
import com.by4cloud.platformx.device.mapper.WorkOrderMapper;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.WorkOrderService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -24,6 +26,7 @@

    private final DeviceRepairMapper repairMapper;
    private final DeviceInventoryMapper inventoryMapper;
    private final JcMaxSizeService maxSizeService;

    @Override
    public R updateByIdNew(WorkOrder workOrder) {
@@ -50,4 +53,12 @@

        return R.ok();
    }

    @Override
    public R saveNew(WorkOrder workOrder) {
        workOrder.setWoCode(maxSizeService.nextNo(MaxSizeContant.DEVICE_PURCHASE_CODE));
        workOrder.setWoStatus(CommonStatusContant.WORK_ORDER_STATUS_CLOSING);
        baseMapper.insert(workOrder);
        return R.ok();
    }
}