1.更新修改报工

2.增加工单修改生产版本接口

admin/src/main/resources/i18n/messages.properties

@@ -147,6 +147,7 @@ pro.tool.error.error29=\u5DE5\u5355\u7F16\u7801\uFF1A{0}\uFF0C\u5DE5\u88C5\u91CF
 #md.process
 md.process.error.not.exist=\u5DE5\u5E8F\u4E0D\u5B58\u5728
 #pro.workOrder
+pro.workOrder.status.published.error = \u53ea\u80fd\u4fee\u6539\u5904\u4e8e\u5df2\u53d1\u5e03\u72b6\u6001\u5de5\u5355
 pro.workOrder.error.not.exist=\u5DE5\u5355\u4E0D\u5B58\u5728
 pro.workOrder.error.limit.min.quantity=\u5DE5\u5355\u751F\u4EA7\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
 pro.workOrder.error.workOrderNo.exist=\u751F\u4EA7\u5DE5\u5355\u7F16\u53F7\u5DF2\u5B58\u5728
@@ -183,6 +184,7 @@ pro.schedule.limit.min.duration=\u751F\u4EA7\u65F6\u957F\u5FC5\u987B\u5927\u4E8E
 pro.schedule.error.canNot.use.standardTime=\u4E0D\u652F\u6301\u5DE5\u65F6\u5355\u4F4D{0}
 pro.schedule.error.cal.error1=\u65E5\u5386\u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u5927\u4E8E\u5F00\u59CB\u65F6\u95F4
 pro.schedule.error.not.exist.solution=\u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u751F\u4EA7\u7248\u672C\u672A\u627E\u5230
+pro.schedule.error.not.exist.process = \u751f\u4ea7\u5de5\u5355\u672a\u8bbe\u7f6e\u5de5\u827a\u8def\u7ebf
 pro.schedule.error.fail=\u6392\u4EA7\u5931\u8D25{0},{1},{2}
 pro.schedule.error.not.exist.main.task=\u6CA1\u6709\u67E5\u5230\u4E3B\u8981\u6392\u4EA7\u4EFB\u52A1
 pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u6392\u4EA7\u6570\u91CF

admin/src/main/resources/i18n/messages_en.properties

@@ -145,6 +145,7 @@ pro.tool.error.error29=Work order code: {0}, tooling and measuring tools: {1}, i
 #md.process
 md.process.error.not.exist=Process does not exist.
 #pro.workOrder
+pro.workOrder.status.published.error = This work order is not in the modified state.
 pro.workOrder.error.not.exist=Work order does not exist.
 pro.workOrder.error.limit.min.quantity=The production quantity of the work order must be greater than 0.
 pro.workOrder.error.workOrderNo.exist=The production work order number already exists.
@@ -180,6 +181,7 @@ pro.schedule.limit.min.duration=Production duration must be greater than 0.
 pro.schedule.error.canNot.use.standardTime=The labor hour unit {0} is not supported.
 pro.schedule.error.cal.error1=The calendar end time must be greater than the start time.
 pro.schedule.error.not.exist.solution=Production work order: {0} production version not found.
+pro.schedule.error.not.exist.process = Production work order process not found.
 pro.schedule.error.fail=Production scheduling failed {0}, {1}, {2}.
 pro.schedule.error.not.exist.main.task=No main production scheduling task found.
 pro.schedule.error.split.quantity.lack=The split quantity must be less than the production scheduling quantity.

admin/src/main/resources/i18n/messages_th.properties

@@ -159,6 +159,7 @@ pro.workOrder.error.error2=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E01\u0E23\u0E30\u0E1
 pro.workOrder.error.error3=\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25\u0E01\u0E23\u0E30\u0E1A\u0E27\u0E19\u0E01\u0E32\u0E23\u0E17\u0E35\u0E48\u0E2A\u0E2D\u0E14\u0E04\u0E25\u0E49\u0E2D\u0E07\u0E01\u0E31\u0E1A\u0E07\u0E32\u0E19\u0E01\u0E32\u0E23\u0E1C\u0E25\u0E34\u0E15\u0E1B\u0E31\u0E08\u0E08\u0E38\u0E1A\u0E31\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
 pro.workOrder.error.error4=\u0E15\u0E32\u0E23\u0E32\u0E07\u0E07\u0E32\u0E19\u0E17\u0E35\u0E48\u0E15\u0E49\u0E2D\u0E07\u0E1B\u0E34\u0E14\u0E1B\u0E34\u0E14\u0E1B\u0E34\u0E14\u0E2B\u0E23\u0E37\u0E2D\u0E40\u0E2A\u0E23\u0E47\u0E08\u0E2A\u0E34\u0E49\u0E19\u0E41\u0E25\u0E49\u0E27
 pro.workOrder.error.error5=\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E1B\u0E31\u0E08\u0E08\u0E38\u0E1A\u0E31\u0E19\u0E02\u0E2D\u0E07\u0E07\u0E32\u0E19\u0E16\u0E39\u0E01\u0E1B\u0E34\u0E14\u0E2B\u0E23\u0E37\u0E2D\u0E40\u0E2A\u0E23\u0E47\u0E08\u0E2A\u0E34\u0E49\u0E19\u0E41\u0E25\u0E30\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E1B\u0E34\u0E14\u0E44\u0E14\u0E49\u0E0B\u0E49\u0E4D\u0E32
+pro.workOrder.status.published.error = \u0e44\u0e21\u0e48\u0e2d\u0e19\u0e38\u0e0d\u0e32\u0e15\u0e43\u0e2b\u0e49\u0e41\u0e01\u0e49\u0e44\u0e02\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e40\u0e15\u0e34\u0e21\u0e43\u0e19\u0e2a\u0e16\u0e32\u0e19\u0e30\u0e43\u0e1a\u0e2a\u0e31\u0e48\u0e07\u0e07\u0e32\u0e19\u0e19\u0e35\u0e49
 #pro.material
 pro.material.error.not.exist=\u0E27\u0E31\u0E2A\u0E14\u0E38\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48
 pro.material.error.error1=\u0E23\u0E2B\u0E31\u0E2A\u0E1A\u0E34\u0E25:{0},\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E01\u0E32\u0E23\u0E1C\u0E25\u0E34\u0E15\u0E02\u0E2D\u0E07\u0E1A\u0E34\u0E25
@@ -182,7 +183,7 @@ pro.schedule.limit.min.duration=\u0E23\u0E30\u0E22\u0E30\u0E40\u0E27\u0E25\u0E32
 pro.schedule.error.not.null.vendor=\u0E15\u0E31\u0E27\u0E1B\u0E23\u0E30\u0E21\u0E27\u0E25\u0E1C\u0E25\u0E20\u0E32\u0E22\u0E19\u0E2D\u0E01\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E27\u0E48\u0E32\u0E07\u0E44\u0E14\u0E49
 pro.schedule.error.cannot.use.standardtime=\u0E44\u0E21\u0E48\u0E23\u0E2D\u0E07\u0E23\u0E31\u0E1A\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E07\u0E32\u0E19\u0E0A\u0E31\u0E48\u0E27\u0E42\u0E21\u0E07{0}
 pro.schedule.error.cal.error1=\u0E40\u0E27\u0E25\u0E32\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14\u0E02\u0E2D\u0E07\u0E1B\u0E0F\u0E34\u0E17\u0E34\u0E19\u0E15\u0E49\u0E2D\u0E07\u0E21\u0E32\u0E01\u0E01\u0E27\u0E48\u0E32\u0E40\u0E27\u0E25\u0E32\u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19
-pro.schedule.error.not.exist.solution=\u0E15\u0E32\u0E23\u0E32\u0E07\u0E07\u0E32\u0E19\u0E01\u0E32\u0E23\u0E1C\u0E25\u0E34\u0E15:{0}\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E23\u0E38\u0E48\u0E19\u0E01\u0E32\u0E23\u0E1C\u0E25\u0E34\u0E15
+pro.schedule.error.not.exist.solution=\u0e43\u0e1a\u0e2a\u0e31\u0e48\u0e07\u0e07\u0e32\u0e19\u0e02\u0e32\u0e14\u0e40\u0e2a\u0e49\u0e19\u0e17\u0e32\u0e07\u0e01\u0e23\u0e30\u0e1a\u0e27\u0e19\u0e01\u0e32\u0e23
 pro.schedule.error.fail=\u0E01\u0E32\u0E23\u0E40\u0E23\u0E35\u0E22\u0E07\u0E25\u0E4D\u0E32\u0E14\u0E31\u0E1A\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27{0},{1},{2}
 pro.schedule.error.not.exist.main.task=\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E20\u0E32\u0E23\u0E01\u0E34\u0E08\u0E01\u0E32\u0E23\u0E16\u0E48\u0E32\u0E22\u0E42\u0E2D\u0E19\u0E2B\u0E25\u0E31\u0E01
 pro.schedule.error.split.quantity.black=\u0E08\u0E4D\u0E32\u0E19\u0E27\u0E19\u0E17\u0E35\u0E48\u0E41\u0E1A\u0E48\u0E07\u0E08\u0E30\u0E15\u0E49\u0E2D\u0E07\u0E19\u0E49\u0E2D\u0E22\u0E01\u0E27\u0E48\u0E32\u0E08\u0E4D\u0E32\u0E19\u0E27\u0E19\u0E17\u0E35\u0E48\u0E1B\u0E25\u0E48\u0E2D\u0E22\u0E2D\u0E2D\u0E01\u0E21\u0E32

admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -147,6 +147,7 @@ pro.tool.error.error29=\u5DE5\u5355\u7F16\u7801\uFF1A{0}\uFF0C\u5DE5\u88C5\u91CF
 #md.process
 md.process.error.not.exist=\u5DE5\u5E8F\u4E0D\u5B58\u5728
 #pro.workOrder
+pro.workOrder.status.published.error = \u53ea\u80fd\u4fee\u6539\u5904\u4e8e\u5df2\u53d1\u5e03\u72b6\u6001\u5de5\u5355
 pro.workOrder.error.not.exist=\u5DE5\u5355\u4E0D\u5B58\u5728
 pro.workOrder.error.limit.min.quantity=\u5DE5\u5355\u751F\u4EA7\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
 pro.workOrder.error.workOrderNo.exist=\u751F\u4EA7\u5DE5\u5355\u7F16\u53F7\u5DF2\u5B58\u5728
@@ -183,6 +184,7 @@ pro.schedule.limit.min.duration=\u751F\u4EA7\u65F6\u957F\u5FC5\u987B\u5927\u4E8E
 pro.schedule.error.canNot.use.standardTime=\u4E0D\u652F\u6301\u5DE5\u65F6\u5355\u4F4D{0}
 pro.schedule.error.cal.error1=\u65E5\u5386\u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u5927\u4E8E\u5F00\u59CB\u65F6\u95F4
 pro.schedule.error.not.exist.solution=\u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u751F\u4EA7\u7248\u672C\u672A\u627E\u5230
+pro.schedule.error.not.exist.process = \u751f\u4ea7\u5de5\u5355\u672a\u8bbe\u7f6e\u5de5\u827a\u8def\u7ebf
 pro.schedule.error.fail=\u6392\u4EA7\u5931\u8D25{0},{1},{2}
 pro.schedule.error.not.exist.main.task=\u6CA1\u6709\u67E5\u5230\u4E3B\u8981\u6392\u4EA7\u4EFB\u52A1
 pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u6392\u4EA7\u6570\u91CF

mes/src/main/java/com/ximai/mes/pro/controller/proWorkOrder/ProWorkorderController.java

@@ -277,6 +277,22 @@ public class ProWorkorderController extends BaseController {
         return toAjax(ret);
     }
 
+    /**
+     * 修改生产工单
+     */
+    @ApiOperation("生产工单修改生产版本以及工艺路线")
+    @PreAuthorize("@ss.hasPermi('mes:pro:workorder:edit')")
+    @Log(title = "生产工单", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateWorkProcess")
+    public AjaxResult updateWorkProcess(@RequestBody ProWorkorderVo proWorkorderVo) {
+        int ret = proWorkorderService.updateWorkProcess(proWorkorderVo);
+
+        return toAjax(ret);
+    }
+
+
+
+
     /**
      * 删除生产工单
      */

mes/src/main/java/com/ximai/mes/pro/mapper/ProFeedbackMapper.java

@@ -6,6 +6,7 @@ import com.ximai.mes.pro.domain.vo.ProFeedbackVo;
 import com.ximai.mes.pro.domain.vo.ProProcessTaskVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -108,4 +109,6 @@ public interface ProFeedbackMapper {
             "sum(quantity_uncheck) quantity_uncheck" +
             "from pro_feedback  where task_id=#{taskId} and process_id=#{processId} GROUP BY task_id, process_id")
     ProProcessTaskVo selectProFeedbackFeedback(@Param("taskId") Long taskId, @Param("processId") Long processId);
+
+    void updateAbnormal(@Param("abnormalId") Long abnormalId, @Param("abnormalReason")String abnormalReason, @Param("abnormalRemark")String abnormalRemark,@Param("abnormalType") String abnormalType,@Param("recordId") Long recordId);
 }

mes/src/main/java/com/ximai/mes/pro/mapper/proWorkOrder/ProWorkorderMapper.java

@@ -144,4 +144,6 @@ public interface ProWorkorderMapper extends BaseMapper<ProWorkorder> {
 
     @Select(value = "select max(erp_update_time) from pro_workorder")
     Date maxErpUpdateTime();
+
+    int updateProductionSolution(@Param("productionSolutionId") Long productionSolutionId, @Param("productionSolutionCode")String productionSolutionCode, @Param("productionSolutionName")String productionSolutionName,@Param("workorderId")Long workorderId);
 }

mes/src/main/java/com/ximai/mes/pro/schedule/impl/AlgorithmDataSourceImpl.java

@@ -135,6 +135,10 @@ public class AlgorithmDataSourceImpl implements AlgorithmDataSource {
             processQuery.eq("t1.workorder_id", firstWorkorder.getWorkorderId());
             processQuery.orderByAsc("t1.idx");
             List<ProWorkOrderProcess> productionOrderRoutings = proWorkOrderProcessService.selectListByQw(processQuery);
+            //
+            if(productionOrderRoutings==null){
+                throw new ServiceException(MessageUtils.message("pro.schedule.error.not.exist.process", firstWorkorder.getWorkorderCode()));
+            }
             //生产版本查询
             ProProductionSolutionVo productionSolution = proProductionSolutionService.selectProProductionSolutionByProductionSolutionId(firstWorkorder.getProductionSolutionId());
             if(productionSolution==null){

mes/src/main/java/com/ximai/mes/pro/service/impl/ProFeedbackServiceImpl.java

@@ -678,11 +678,11 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
         ExceptionUtil.checkTrueThrowException(CollectionUtil.isEmpty(proFeedbacks), MessageUtils.message("pro.feedback.error.not.data"));
         ProFeedback oldFeedback = proFeedbacks.get(0);
         proFeedback.setFeedbackCode(oldFeedback.getFeedbackCode());
-        BigDecimal feedbackQuantitySubtract = quantityFeedback.subtract(oldFeedback.getQuantityFeedback());
+//        BigDecimal feedbackQuantitySubtract = quantityFeedback.subtract(oldFeedback.getQuantityFeedback());
 
-        if (feedbackQuantitySubtract.doubleValue() == 0) {
-            return 1;
-        }
+//        if (feedbackQuantitySubtract.doubleValue() == 0) {
+//            return 1;
+//        }
 
         BigDecimal updateUnQuality = proFeedback.getQuantityUnqualify();
         BigDecimal updateQuality = proFeedback.getQuantityQualify();
@@ -698,6 +698,9 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
 
 
         if (v1 == 0 && b3 && v2 == 0) {
+            //有可能是修改异常信息
+            if(proFeedback.getAbnormalId() != null)
+                proFeedbackMapper.updateAbnormal(proFeedback.getAbnormalId(),proFeedback.getAbnormalReason(),proFeedback.getAbnormalRemark(),proFeedback.getAbnormalType(),proFeedback.getRecordId());
             return 1;
         }
 

mes/src/main/java/com/ximai/mes/pro/service/impl/proWorkOrder/ProWorkorderServiceImpl.java

@@ -1066,7 +1066,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
                 proWorkorder.setAncestors(parent.getAncestors() + "," + parent.getParentId());
             }
         }
-        proWorkorder.setStatus(WorkorderStatusEnum.PUBLISHED.getValue());
+        proWorkorder.setStatus(WorkorderStatusEnum.PREPARE.getValue());
         proWorkorder.createAction();
         proWorkorder.setQuantityProduced(BigDecimal.ZERO);
         proWorkorder.setQuantityQualify(BigDecimal.ZERO);
@@ -1842,6 +1842,88 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
         }
     }
 
+    @Override
+    public int updateWorkProcess(ProWorkorderVo proWorkorderVo) {
+        ProWorkorder proWorkorder = proWorkorderMapper.selectWorkorderById(proWorkorderVo.getWorkorderId());
+        ExceptionUtil.checkTrueThrowException(proWorkorder == null, MessageUtils.message("pro.workOrder.error.not.exist"));
+        ExceptionUtil.checkTrueThrowException(proWorkorder.getStatus().equals(WorkorderStatusEnum.PUBLISHED.getValue()), MessageUtils.message("pro.workOrder.status.published.error"));
+        List<ProWorkOrderProcessVo> processList = proWorkorderVo.getProcessList();
+        if (processList != null) {
+            for (ProWorkOrderProcessVo proWorkOrderProcessVo : processList) {
+                // 保存工序
+                ProWorkOrderProcess tempProcess = proWorkOrderProcessVo.deepCopyObj(ProWorkOrderProcess.class);
+                tempProcess.setWorkorderId(proWorkorderVo.getWorkorderId());
+                if (tempProcess.getWorkorderProcessId() == null) {
+                    proWorkOrderProcessService.insertProWorkOrderProcess(tempProcess);
+                }
+                Long workorderProcessId = tempProcess.getWorkorderProcessId();
+                // 获取工序物料-保存
+                if (proWorkOrderProcessVo.getProcessItemList() == null) {
+                    proWorkOrderProcessVo.setProcessItemList(new ArrayList<ProWorkOrderProcessItem>());
+                }
+                List<ProWorkOrderProcessItem> proWorkOrderProcessItemList = proWorkOrderProcessVo.getProcessItemList();
+                ProWorkOrderProcessItem proWorkOrderProcessItemQuery = new ProWorkOrderProcessItem();
+                proWorkOrderProcessItemQuery.setWorkorderProcessId(workorderProcessId);
+                List<ProWorkOrderProcessItem> proWorkOrderProcessItemListDb = proWorkOrderProcessItemMapper.selectProWorkOrderProcessItemList(proWorkOrderProcessItemQuery);
+                for (ProWorkOrderProcessItem proWorkOrderProcessItem : proWorkOrderProcessItemList) {
+                    proWorkOrderProcessItem.setWorkorderProcessId(workorderProcessId);
+                    if (proWorkOrderProcessItem.getWorkorderProcessItemId() == null) {
+                        proWorkOrderProcessItemService.insertProWorkOrderProcessItem(proWorkOrderProcessItem);
+                    } else {
+                        proWorkOrderProcessItemService.updateProWorkOrderProcessItem(proWorkOrderProcessItem);
+                    }
+                }
+
+                proWorkOrderProcessItemListDb.forEach(v -> {
+                    if (!proWorkOrderProcessItemList.stream().filter(v2 -> v.getWorkorderProcessItemId().equals(v2.getWorkorderProcessItemId())).findFirst().isPresent()) {
+                        proWorkOrderProcessItemMapper.deleteProWorkOrderProcessItemByWorkorderProcessItemId(v.getWorkorderProcessItemId());
+                    }
+                });
+
+                //检验项保存、删除
+                List<ProWorkOrderProcessQcindex> proWorkOrderProcessQcindexList = proWorkOrderProcessVo.getQcindexList();
+                ProWorkOrderProcessQcindex proWorkOrderProcessQcindexQuery = new ProWorkOrderProcessQcindex();
+                proWorkOrderProcessQcindexQuery.setWorkorderProcessId(workorderProcessId);
+                List<ProWorkOrderProcessQcindex> proWorkOrderProcessQcindexListDb = proWorkOrderProcessQcindexMapper.selectProWorkOrderProcessQcindexList(proWorkOrderProcessQcindexQuery);
+                for (ProWorkOrderProcessQcindex proWorkOrderProcessQcindex : proWorkOrderProcessQcindexList) {
+                    proWorkOrderProcessQcindex.setWorkOrderId(proWorkorderVo.getWorkorderId());
+                    proWorkOrderProcessQcindex.setWorkorderProcessId(workorderProcessId);
+                    if (proWorkOrderProcessQcindex.getId() == null) {
+                        proWorkOrderProcessQcindexService.insertProWorkOrderProcessQcindex(proWorkOrderProcessQcindex);
+                    } else {
+                        proWorkOrderProcessQcindexService.updateProWorkOrderProcessQcindex(proWorkOrderProcessQcindex);
+                    }
+                }
+                proWorkOrderProcessQcindexListDb.forEach(v -> {
+                    if (!proWorkOrderProcessQcindexList.stream().filter(v2 -> v.getId().equals(v2.getId())).findFirst().isPresent()) {
+                        proWorkOrderProcessQcindexMapper.deleteProWorkOrderProcessQcindexById(v.getId());
+                    }
+                });
+                //工装
+                List<ProWorkOrderProcessTool> proWorkOrderProcessToolList = proWorkOrderProcessVo.getToolList();
+                ProWorkOrderProcessTool proWorkOrderProcessToolQuery = new ProWorkOrderProcessTool();
+                proWorkOrderProcessToolQuery.setWorkorderProcessId(workorderProcessId);
+                List<ProWorkOrderProcessTool> proWorkOrderProcessToolListDb = proWorkOrderProcessToolMapper.selectProWorkOrderProcessToolList(proWorkOrderProcessToolQuery);
+                for (ProWorkOrderProcessTool proWorkOrderProcessTool : proWorkOrderProcessToolList) {
+                    proWorkOrderProcessTool.setWorkorderProcessId(workorderProcessId);
+                    proWorkOrderProcessTool.setWorkOrderId(proWorkorderVo.getWorkorderId());
+                    if (proWorkOrderProcessTool.getWorkorderProcessToolId() == null) {
+                        proWorkOrderProcessToolService.insertProWorkOrderProcessTool(proWorkOrderProcessTool);
+                    } else {
+                        proWorkOrderProcessToolService.updateProWorkOrderProcessTool(proWorkOrderProcessTool);
+                    }
+                }
+                proWorkOrderProcessToolListDb.forEach(v -> {
+                    if (!proWorkOrderProcessToolList.stream().filter(v2 -> v.getWorkorderProcessToolId().equals(v2.getWorkorderProcessToolId())).findFirst().isPresent()) {
+                        proWorkOrderProcessToolMapper.deleteProWorkOrderProcessToolByWorkorderProcessToolId(v.getWorkorderProcessToolId());
+                    }
+                });
+            }
+            proWorkOrderProcessMapper.deleteProWorkOrderProcessByWorkorderId(proWorkorderVo.getWorkorderId());
+        }
+        return proWorkorderMapper.updateProductionSolution(proWorkorderVo.getProductionSolutionId(),proWorkorderVo.getProductionSolutionCode(),proWorkorderVo.getProductionSolutionName(),proWorkorderVo.getWorkorderId());
+    }
+
     @MethodExtendedProcesses(config ={
             @MethodExtendedProcess(sysSwitchParam = "erp.finish.stockin.create.enable", processClz = FinishStockInCreateProcess.class,
                     newThread = true, errorCatch = true)

mes/src/main/java/com/ximai/mes/pro/service/proWorkOrder/IProWorkorderService.java

@@ -211,4 +211,6 @@ public interface IProWorkorderService {
      * 每次更新1000行，直到所有数据同步完成为止
      */
     void syncEditErpData(ProWorkorderErpDto workorderErpDto, Map<String, MdItem> itemMap);
+
+    int updateWorkProcess(ProWorkorderVo proWorkorderVo);
 }

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -352,6 +352,9 @@
         </trim>
         where record_id = #{recordId}
     </update>
+    <update id="updateAbnormal">
+        update pro_feedback set abnormal_id = #{abnormalId}, abnormal_type = #{abnormalType},abnormal_reason = #{abnormalReason},abnormal_remark = #{abnormalRemark} where  record_id = #{recordId}
+    </update>
 
     <delete id="deleteProFeedbackByRecordId" parameterType="Long">
         delete

mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml

@@ -434,6 +434,10 @@
         set pr.status = #{status}
         where pr.workorder_id = #{workorderId}
     </update>
+    <update id="updateProductionSolution">
+        update pro_workorder set production_solution_id = #{productionSolutionId},production_solution_code = #{productionSolutionCode} ,production_solution_name = #{productionSolutionName}
+        where workorder_id = #{workorderId}
+    </update>
 
     <delete id="deleteProWorkorderByWorkorderId" parameterType="Long">
         delete