更改生产版本的工序列表IDX值

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

@@ -77,6 +77,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1011,7 +1012,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
             proWorkOrderProcess.setWorkorderProcessId(null);
             proWorkOrderProcess.setWorkorderId(workorderId);
             proWorkOrderProcess.setWorkorderCode(workorderCode);
-            proWorkOrderProcess.setIdx(j + "");
+            //proWorkOrderProcess.setIdx(j + "");
             proWorkOrderProcessService.insertProWorkOrderProcess(proWorkOrderProcess);
 
             Long workorderProcessId = proWorkOrderProcess.getWorkorderProcessId();
@@ -1091,7 +1092,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
                     proWorkOrderProcess.init(solutionProcess);
                     proWorkOrderProcess.setWorkorderId(proWorkorder.getWorkorderId());
                     proWorkOrderProcess.setWorkorderCode(proWorkorder.getWorkorderCode());
-                    proWorkOrderProcess.setIdx(i + "");
+                    //proWorkOrderProcess.setIdx(i + "");
                     proWorkOrderProcessService.insertProWorkOrderProcess(proWorkOrderProcess);
                     i++;
                 }

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -239,12 +240,15 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
             }
         }
         // 保存工序
+        DecimalFormat df = new DecimalFormat("0000");
         List<ProProductionSolutionProcessVo> processList = proProductionSolutionVo.getProcessList();
         if (StringUtils.isNotNull(processList)) {
             int k=1;
             for (ProProductionSolutionProcessVo proProductionSolutionProcessVo : processList) {
                 // 保存工序主表信息
                 ProProductionSolutionProcess proProductionSolutionProcess = new ProProductionSolutionProcess();
+                String idx = df.format(k * 10);
+                proProductionSolutionProcess.setIdx(idx);
                 BeanUtils.copyProperties(proProductionSolutionProcessVo, proProductionSolutionProcess);
                 proProductionSolutionProcess.setSerial(k);
                 if (proProductionSolutionProcessVo.getQuantity() == null) {
@@ -381,11 +385,14 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
             Map<Long,List<ProProductionSolutionProcessDrawing>> processDrawingMap = productionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingList(new QueryWrapper<ProProductionSolutionProcessDrawing>().eq("production_solution_id", proProductionSolutionVo.getProductionSolutionId()))
                     .stream().collect(Collectors.groupingBy(s->s.getProductionSolutionProcessId()));
             int k=1;
+            DecimalFormat df = new DecimalFormat("0000");
             for (ProProductionSolutionProcessVo proProductionSolutionProcessVo : processList) {
                 proProductionSolutionProcessVo.setProductionSolutionId(proProductionSolution.getProductionSolutionId());
                 // 保存工序
                 ProProductionSolutionProcess tempProcess = proProductionSolutionProcessVo.getProductionSolutionProcess(proProductionSolutionProcessVo);
                 tempProcess.setSerial(k);
+                String idx = df.format(k * 10);
+                tempProcess.setIdx(idx);
                 if(tempProcess.getProductionSolutionProcessId()==null) {
                     proProductionSolutionProcessMapper.insertProProductionSolutionProcess(tempProcess);
                 }else{