1.出入库通知mes地址修改

2.对接接料机修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -668,19 +668,23 @@ public class LiteOrderCache {
                                 String model = orderItem.getModel();
                                 if (StringUtils.isEmpty(model)) {
                                     //C02-3FSMT-18,C02-3FSMT-19,C02-3FSMT-09,C02-3FSMT-08
-                                    if ("C02-3FSMT-18".equals(cacheOrder.getLine())
-                                            || "C02-3FSMT-19".equals(cacheOrder.getLine())
-                                            || "C02-3FSMT-08".equals(cacheOrder.getLine())
-                                            || "C02-3FSMT-09".equals(cacheOrder.getLine())
-                                    ) {
-                                        model = "X8";
+                                    String orderLine = cacheOrder.getLine();
+                                    if (StringUtils.isNotEmpty(orderLine)) {
+                                        if (orderLine.startsWith("C02-3FSMT-18") ||
+                                                orderLine.startsWith("C02-3FSMT-19") ||
+                                                orderLine.startsWith("C02-3FSMT-08") ||
+                                                orderLine.startsWith("C02-3FSMT-09")) {
+                                            model = "X8";
+                                        } else {
+                                            model = "EVEREST";
+                                        }
                                     } else {
                                         model = "EVEREST";
                                     }
                                 }
 
                                 //如果是迈征工单,不是满料,不出库
-                                if (cacheOrder.isMaiZheng()){
+                                /*if (cacheOrder.isMaiZheng()){
                                     Barcode barcode = pos.getBarcode();
                                     BrandQtyResult result = lizhenApi.brandQty(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider()));
                                     int qty = result.getQty();
@@ -688,7 +692,7 @@ public class LiteOrderCache {
                                     if (qty != barcode.getAmount()){
                                         throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库");
                                     }
-                                }
+                                }*/
 
                                 List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model);
                                 if (batchCheckReel != null && !batchCheckReel.isEmpty()){

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengController.java

@@ -150,6 +150,7 @@ public class MaiZhengController {
         liteOrder.setCount(askReelBox.getCount());
         liteOrder.setStartTime(askReelBox.getStartTime());
         liteOrder.setMaiZheng(true);
+        liteOrder.setServerId(askReelBox.getServerId());
 
         liteOrder = liteOrderManager.save(liteOrder);
 

src/main/resources/config/application-21088prod.yml

@@ -14,11 +14,11 @@ api:
   barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo
 
   #入库
-  save2DReelInfoUrl: http://10.68.27.68:8002/SmtAutoWH/Save2DReelInfo
+  save2DReelInfoUrl: http://10.68.25.40:8002/SmtAutoWH/Save2DReelInfo
   #发料
-  commonGIRecordUrl: http://10.68.27.68:8002/Sct/CommonGIRecord
+  commonGIRecordUrl: http://10.68.25.40:8002/Sct/CommonGIRecord
   #退料
-  commonRMRecordUrl: http://10.68.27.68:8002/Sct/CommonRMRecord
+  commonRMRecordUrl: http://10.68.25.40:8002/Sct/CommonRMRecord
   #获取有限期
   getInDateUrl: http://10.68.30.22:8082/api/mes/GetInDate
   #散料是否量测

src/main/resources/config/application-21088test.yml

@@ -15,11 +15,11 @@ api:
   barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo
 
   #入库
-  save2DReelInfoUrl: http://10.68.27.68:8002/SmtAutoWH/Save2DReelInfo
+  save2DReelInfoUrl: http://10.68.25.40:8002/SmtAutoWH/Save2DReelInfo
   #发料
-  commonGIRecordUrl: http://10.68.27.68:8002/Sct/CommonGIRecord
+  commonGIRecordUrl: http://10.68.25.40:8002/Sct/CommonGIRecord
   #退料
-  commonRMRecordUrl: http://10.68.27.68:8002/Sct/CommonRMRecord
+  commonRMRecordUrl: http://10.68.25.40:8002/Sct/CommonRMRecord
   #获取有限期
   getInDateUrl: http://10.42.220.171:8082/api/mes/GetInDate
   #散料是否量测