设备之系统——保养检修 BUG

编号修复

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/MaintenanceService.java

@@ -60,6 +60,14 @@ public interface MaintenanceService  {
      */
 
     R uploadStandardSave(MultipartFile multipartFile) throws IOException;
-
+    /**
+     * 从10号开始 往后每天对计划中的任务进行识别 并生成任务
+     *
+     * @param
+     * @return {@link R}
+     * @date 2023/12/26 10:38
+     * @author shangmi
+     *
+     */
     R batchSavePlansTiming();
 }

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

@@ -163,7 +163,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             equMaintenancePartList.addAll(dataShiftSpareStandToPlan(partsSetoutStandardList,maintenanceScheduleDo.getId()));
             return maintenanceScheduleDo;
         }).collect(Collectors.toList());
-        int number = maintenanceScheduleService.saveBatchList(maintenanceScheduleList);
+        maintenanceScheduleService.saveBatchList(maintenanceScheduleList);
         maintenancePartService.saveBatchList(equMaintenancePartList);
         if (wrongData.length()==0){
             return R.ok();
@@ -289,9 +289,10 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         // 生成流水号
         for (EquMaintenanceStandardDo maintenanceStandard : newMaintenanceStandardList){
             SysSerialVo sysSerialVo = new SysSerialVo();
-            sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_BC");
-            sysSerialVo.setResetrule("date:yyyy");
-            sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(maintenanceStandard.getTenantid())+"-BYBZ-@{serialNumber:#00000}");
+            String plantSimp = PlantEnum.addrOf(maintenanceStandard.getTenantid());
+            sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_"+plantSimp);
+            // sysSerialVo.setResetrule("date:yyyy");
+            sysSerialVo.setRuleTemplateStr(plantSimp +"-BYBZ-@{serialNumber:#00000}");
             R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
             if ("200".equals(serialNumberCode.getCode())){
                 Object data = serialNumberCode.getData();
@@ -440,9 +441,10 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         List<EquMaintenanceTaskDo> maintenanceTaskList = new ArrayList<>();
         for (EquMaintenancePartDo maintenancePart : maintenancePartList) {
             SysSerialVo sysSerialVo = new SysSerialVo();
-            sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_BC");
+            String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+plantSimp);
             sysSerialVo.setResetrule("date:yyyy");
-            sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])+"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}-@{serialNumber:#00000}");
+            sysSerialVo.setRuleTemplateStr(plantSimp +"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}-@{serialNumber:#00000}");
             R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
             EquMaintenanceTaskDo equMaintenanceTask = new EquMaintenanceTaskDo();
             BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);