Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -644,10 +644,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             log.error("无法根据ID:{}获取到工序作业明细", id);
             return R.error("无法获取到工序作业信息");
         }
-        if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
-            log.error("已开工的作业不可修改");
-            return R.error("已开工的作业不可修改");
-        }
         if (StringUtils.isBlank(apsProcessOperationProcessEquDo.getProcessid())) {
             log.error("工序作业明细对应工序作业ID为空");
             return R.error("无法获取作业明细对应的工序作业");
@@ -657,6 +653,17 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         if (apsProcessOperationDo == null) {
             log.error("根据ID：{} 获取工序作业失败", apsProcessOperationProcessEquDo.getProcessid());
         }
+        if (apsProcessOperationDo!= null&&"合并加工".equals(apsProcessOperationDo.getProcessway())){
+            if (Arrays.asList(COMPLETED, PROCESSING).contains(apsProcessOperationDo.getProcessstatus())) {
+                log.error("已开工的作业不可修改");
+                return R.error("已开工的作业不可修改");
+            }
+        }else {
+            if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
+                log.error("已开工的作业不可修改");
+                return R.error("已开工的作业不可修改");
+            }
+        }
         // 更新开工时间 jobDetailsVo
         String equId = jobDetailsVo.getEquId();
         String equName = jobDetailsVo.getEquName();

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentDisposeController.java

@@ -0,0 +1,39 @@
+package com.rongwei.bsserver.sys.controller;
+
+import cn.hutool.json.JSONUtil;
+import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/equipmentDispose")
+@Slf4j
+public class EquipmentDisposeController {
+
+    @PostMapping("/dealExcelData")
+    @ResponseBody
+    public R wordExportLubricationTask(@RequestBody Map<String, Object> map){
+        
+        ArrayList<List<Map<String,Object>>> listall = new ArrayList<>();
+         List<Map<String,Object>> main = new ArrayList<>();
+        List<Map<String,Object>> list= (List<Map<String, Object>>) map.get("excelExportData");
+        Map<String, Object> objectMap = list.get(0);
+        String[] updateFields ={"ROLLINLOCATION","MSSMANAGERTIME","MTOMANAGERTIME","EQUMANAGERTIME","WDMANAGERTIME","VICEPRESIDENTTIME","GENERALMANAGERTIME","FINANCEOFFICETIME"};
+        for (String fieldName : updateFields) {
+            Object value = objectMap.get(fieldName);
+            if (value != null && value instanceof String) {
+                String dateStr = (String) value;
+                String formattedDate = dateStr.replaceAll("-", "/").substring(0, 10);
+                objectMap.put(fieldName, formattedDate);
+            } else {
+                objectMap.put(fieldName, ""); // 或者您可以选择不更新该字段
+            }
+        }
+        main.add(objectMap);
+        listall.add(main);
+        return R.ok(listall);
+    }
+}