From fa5632638d1f6f7e28234ca4b0982b03f58b98f3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 05 九月 2024 11:07:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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..1ce74c4 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,23 @@
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.getReportSign()!=1
+ || basDevp.getBarcode().equals("")){
+ return FAIL;
+ }
+ if (basDevp.getWrkNo()>9899 && basDevp.getWrkNo()<10000 && basDevp.getAutoing().equals("Y")
+ && basDevp.getLoading().equals("Y") && basDevp.getInEnable().equals("Y")){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
+ int zpalletCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
+ if (zpalletCount==0){
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;
- }
+ basDevp.setReportSign(2);
+ basDevpService.updateById(basDevp);
+ return SUCCESS;
+ }else {
+ log.error("鏉＄爜涓婁紶涓帶澶辫触");
}
}
}
@@ -93,7 +96,7 @@
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤erp绯荤粺澶辫触");
+ throw new CoolException("鏉＄爜涓婁紶涓帶澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
@@ -103,10 +106,10 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤erp绯荤粺",
+ "鏉＄爜涓婁紶涓帶",
erpUrl + erpPath,
null,
- "127.0.0.1",
+ erpUrl,
JSON.toJSONString(combParam),
response,
success
--
Gitblit v1.9.1