From f5f7889cd423667b4b6d63d12ff9c78750952262 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 17 五月 2023 16:48:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0506530..6182266 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -604,7 +604,7 @@
             matNew.setTagId(tag.getId());
             matNew.setMatnr(param.getPackName());
             matNew.setMaktx(param.getPackName());
-            matNew.setDeadWarn(param.getSettingTimes());
+            matNew.setDeadWarn(480);//8灏忔椂  480鍒嗛挓
             matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
             matNew.setCreateTime(new Date());
             matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -761,14 +761,9 @@
                     throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
                 }
                 locMast.setPackStatus(2);
-                CombParam combParam = new CombParam();
-                combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocNo(locMast.getLocNo());
-                combParam.setPackSts(2);
-                combParam.setRequestTime(DateUtils.convert(new Date()));
-                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
                 if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+
+
                     throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
                 }
             } else if (Cools.isEmpty(testMast.getStatus())){
@@ -803,12 +798,12 @@
                 Date date = new Date();
                 locMast.setPackStatus(3);
                 locMast.setModiTime(date);
-                CombParam combParam = new CombParam();
-                combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocNo(locMast.getLocNo());
-                combParam.setPackSts(3);
-                combParam.setRequestTime(DateUtils.convert(new Date()));
-                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+//                CombParam combParam = new CombParam();
+//                combParam.setPackNo(locMast.getBarcode());
+//                combParam.setLocNo(locMast.getLocNo());
+//                combParam.setPackSts(3);
+//                combParam.setRequestTime(DateUtils.convert(new Date()));
+//                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
 
                 if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                     throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
@@ -844,12 +839,12 @@
                 Date date = new Date();
                 locMast.setPackStatus(4);
                 locMast.setModiTime(date);
-                CombParam combParam = new CombParam();
-                combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocNo(locMast.getLocNo());
-                combParam.setPackSts(4);
-                combParam.setRequestTime(DateUtils.convert(new Date()));
-                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+//                CombParam combParam = new CombParam();
+//                combParam.setPackNo(locMast.getBarcode());
+//                combParam.setLocNo(locMast.getLocNo());
+//                combParam.setPackSts(4);
+//                combParam.setRequestTime(DateUtils.convert(new Date()));
+//                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
 
                 if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                     throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");

--
Gitblit v1.9.1