lrl-2021-09-27

src/main/java/com/steerinfo/ems/emsgmpcjh/service/impl/EmsGmPcJhServiceImpl.java

@@ -172,7 +172,8 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
             spp.setStartTime(arr[0]);
             switch (name) {
                 case "型钢" :
-                        spp.setType("G-X2-");
+                        spp.setType("G-X1-");
+                        spp.setWorkprocType("AT2007");
                     break;
                 case "钢坯" :
                     spp.setType("G-L1-");
@@ -200,11 +201,7 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
             for(int j =1;j<arr1.length;j++) {
                 switch (arr1[j].trim()) {
                     case "规格" :
-                        if (name.equals("型钢")) {
-                            spp.setLengthTimesWidth(arr[j]);
-                        } else {
                             spp.setSpecifications(arr[j]);
-                        }
                         break;
                     case "钢种" :
                         spp.setGrades(arr[j]);
@@ -223,6 +220,7 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
                             throw new MarketSlmException(500,"订单量有误，请仔细检查");
                         }
                         spp.setKxfWeight(new BigDecimal(arr[j]));
+                        spp.setYxfWeight(new BigDecimal("0"));
                         spp.setPlanWeight(new BigDecimal(arr[j]));
                         break;
                     case "交货日期" :

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/controller/EmsProdplanWeightAdjustmentController.java

@@ -124,8 +124,11 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
         String userId = JwtUtil.getUseridByToken();
         String soketMessage="国贸订单编号";
         boolean result = false;
+        EmsProdplanWeightAdjustment emsProdplanWeightAdjustment;
         for (EmsProdplanWeightAdjustment model : models) {
-            EmsProdplanWeightAdjustment emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            emsProdplanWeightAdjustment = emsProdplanWeightAdjustmentMapper.selectByPrimaryKey(model.getId());
+            System.out.println(models.length);
+            System.out.println(emsProdplanWeightAdjustment);
             if (emsProdplanWeightAdjustment.getAuditStatus().equals("1")) {
                 return failed(null,"编号为"+emsProdplanWeightAdjustment.getId()+",已经提交申请,请勿重复操作");
             }
@@ -143,17 +146,17 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
             emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
             result = true;
             soketMessage+=model.getId()+",";
-            if(result){
-                soketMessage += "已提交审核,请注意接收";
-                String[] roles = {"生产部-生产处"};
-                Map <String, Object> map = new HashMap<String,Object>();
-                map.put("role",roles);
-                map.put("title","销售订单调整");
-                map.put("message",soketMessage);
-                map.put("tips","您好，有新的销售订单需要进行重量调整,请注意接收。");
-                soketMessage= JSON.toJSONString(map);
-                webSocket.sendAllMessage(soketMessage);
-            }
+        }
+        if(result){
+            soketMessage += "已提交审核,请注意接收";
+            String[] roles = {"生产部-生产处"};
+            Map <String, Object> map = new HashMap<String,Object>();
+            map.put("role",roles);
+            map.put("title","销售订单调整");
+            map.put("message",soketMessage);
+            map.put("tips","您好，有新的销售订单需要进行重量调整,请注意接收。");
+            soketMessage= JSON.toJSONString(map);
+            webSocket.sendAllMessage(soketMessage);
         }
             return success(null,"提交成功");
     }
@@ -211,18 +214,18 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
                 emsProdplanWeightAdjustment.setAuditStatus("0");
                 emsProdplanWeightAdjustmentMapper.updateByPrimaryKey(emsProdplanWeightAdjustment);
                 result = true;
-                soketMessage+=model.getId()+",";
-                if(result){
-                    soketMessage += "不通过,请注意查看";
-                    String[] roles = {"国贸-业务人员"};
-                    Map <String, Object> map = new HashMap<String,Object>();
-                    map.put("role",roles);
-                    map.put("title","销售订单重量调整");
-                    map.put("message",soketMessage);
-                    map.put("tips","您好，有提交的订单不通过，请注意查看。");
-                    soketMessage= JSON.toJSONString(map);
-                    webSocket.sendAllMessage(soketMessage);
-                }
+            }
+            soketMessage+=model.getId()+",";
+            if(result){
+                soketMessage += "不通过,请注意查看";
+                String[] roles = {"国贸-业务人员"};
+                Map <String, Object> map = new HashMap<String,Object>();
+                map.put("role",roles);
+                map.put("title","销售订单重量调整");
+                map.put("message",soketMessage);
+                map.put("tips","您好，有提交的订单不通过，请注意查看。");
+                soketMessage= JSON.toJSONString(map);
+                webSocket.sendAllMessage(soketMessage);
             }
         }
                  return success();