Browse Source

设备之系统——保养检修 BUG
对生成计划时设备的规格型号进行修复

hyq 1 năm trước cách đây
mục cha
commit
a58af4148e

+ 3 - 3
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -222,7 +222,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setModifyusername(currentUser.getName())
                     .setModifyuserid(currentUser.getId())
                     .setModifydate(newDate)
-                    .setPlannedstatus("unlocked");
+                    .setPlannedstatus(PlannedStatusEnum.UNLOCKED.getValue());
 
             collect.forEach(item ->{
                 item.setId(SecurityUtil.getUUID())
@@ -452,7 +452,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
             BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
             equMaintenanceTask.setId(SecurityUtil.getUUID())
-                    .setMonth(month<10?"0"+month:String.valueOf(month))
+                    .setMonth(month.toString())
                     .setCreateuserid(currentUser.getId())
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
                     .setCreateusername(currentUser.getName())
@@ -552,7 +552,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 .setPlantype("BY")
                 .setSpecialequipment(aspCheckItem.getSource())
                 .setObjecttype("1")
-                .setSpecification(aspCheckItem.getDeleted())
+                .setSpecification(aspCheckItem.getDevicemodel())
                 .setWorkshop(aspCheckItem.getUsedeptname())
                 .setWorkshopid(aspCheckItem.getUsedeptid())
                 .setPlannedstatus("unlocked")

+ 8 - 0
cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/MaintenanceController.java

@@ -28,6 +28,14 @@ public class MaintenanceController {
     @Autowired
     private MaintenanceService maintenanceService;
 
+    /**
+     * 发布任务
+     *
+     * @param taskCreator 入参
+     * @return {@link R}
+     * @date 2023/11/27 16:25
+     * @author shangmi
+     */
     @PostMapping("saveTask")
     public R saveTask(@RequestBody TaskCreatorDTO taskCreator){
         try {