From 054e8e34d07b8372f43866ae0e18f8871df992aa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 十一月 2023 13:16:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
index 4a60c5c..14fe7d7 100644
--- a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
@@ -33,7 +33,7 @@
public class BarcodeUploadHandler extends AbstractHandler<String> {
@Autowired
- private WrkMastService wrkMastService;
+ private WaitPakinService waitPakinService;
@Autowired
private LocMastService locMastService;
@Autowired
@@ -53,20 +53,16 @@
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()!=0){
- WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
- if (!Cools.isEmpty(wrkMast) && wrkMast.getIoType().equals(201) && wrkMast.getWrkSts().equals(41L)){
+ if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
+ if (Cools.isEmpty(waitPakin)){
ReturnT<String> result = null;
- result = postMesData(barcodeUploadpath,wrkMast);
+ result = postMesData(barcodeUploadpath,basDevp);
System.out.println(result);
if (result.getCode()==200){
- wrkMast.setWrkSts(42L);
- // 淇敼璁㈠崟鐘舵�� 41. ===>> 42.宸蹭笂鎶�
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳:鏇存柊宸ヤ綔鍙�"+wrkMast.getWrkNo()+"宸ヤ綔妗ｇ姸鎬�41==銆�42澶辫触");
- }else {
- return SUCCESS;
- }
+ return SUCCESS;
+ }else {
+ log.error("鏉＄爜涓婁紶涓帶澶辫触");
}
}
}
@@ -106,7 +102,7 @@
"涓婃姤erp绯荤粺",
erpUrl + erpPath,
null,
- "127.0.0.1",
+ erpUrl,
JSON.toJSONString(combParam),
response,
success
--
Gitblit v1.9.1