From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 2aa7ee6..1ce74c4 100644
--- a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
@@ -53,13 +53,20 @@
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
- if (Cools.isEmpty(waitPakin)){
+ 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,basDevp);
System.out.println(result);
if (result.getCode()==200){
+ basDevp.setReportSign(2);
+ basDevpService.updateById(basDevp);
return SUCCESS;
}else {
log.error("鏉＄爜涓婁紶涓帶澶辫触");
@@ -89,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);
@@ -99,10 +106,10 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤erp绯荤粺",
+ "鏉＄爜涓婁紶涓帶",
erpUrl + erpPath,
null,
- "127.0.0.1",
+ erpUrl,
JSON.toJSONString(combParam),
response,
success
--
Gitblit v1.9.1