From 3c8343535bec2a53855956e25598e2271fc84c0d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 07 七月 2024 10:28:21 +0800
Subject: [PATCH] 更新测试管理搜索功能

---
 src/main/java/com/zy/common/web/WcsController.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 55d8621..8e622ae 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -52,10 +52,10 @@
     @Autowired
     private  MatService matService;
 
-    @Value("mes.url")
+    @Value("${mes.url}")
     private String mesUrl;
 
-    @Value("mes.inPath")
+    @Value("${mes.inPath}")
     private String inpath;
 
     @PostMapping("/pakin/loc/v1")
@@ -292,16 +292,17 @@
             if (!locMastService.updateById(locMast)){
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }else{
-//                if (locMast.getRow1()<3){
-//                    //1.鎵爜涓婃姤
-//                    CombParam combParam = new CombParam();
-//                    combParam.setPackNo(wrkMast.getBarcode());
-//                    combParam.setLocNo(wrkMast.getLocNo());
-//                    combParam.setPackSts(0);
-//                    combParam.setStepSts(1);
-//                    combParam.setRequestTime(DateUtils.convert(now));
-//                    new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-//                }
+                if (locMast.getRow1()<2){
+                    //1.鎵爜涓婃姤
+                    CombParam combParam = new CombParam();
+                    combParam.setPackNo(waitPakins.get(0).getMatnr());
+                    combParam.setBarcode(wrkMast.getBarcode());
+                    combParam.setLocNo(wrkMast.getLocNo());
+                    combParam.setPackSts(0);
+                    combParam.setStepSts(1);
+                    combParam.setRequestTime(DateUtils.convert(now));
+                    new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+                }
             }
         } else {
             throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");

--
Gitblit v1.9.1