From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 683c4b3..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")
@@ -175,7 +175,7 @@
}
/**
- * 鍏ㄦ澘鍏ュ簱
+ * 鍏ㄦ澘鍏ュ簱
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
@@ -249,7 +249,6 @@
}
}else if(wrkMast.getStaNo()==209){
testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setChannel(locMast.getChannel());
testMast.setLocNo(locMast.getLocNo());
testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
testMast.setAppeTime(now);
@@ -293,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