From 318b01bda7bd75d1979e6a8c8ab303327582dabb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 三月 2025 19:24:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a0295ca..ffb5484 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3085,10 +3085,26 @@
command.setWeight2(weight2);
if (workNo1 == 0 && workNo2 !=0){
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
} else if (workNo1 != 0 && workNo2 ==0) {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT1); // 浠诲姟妯″紡: 1鍙栨斁璐�
}else {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT_ALL); // 浠诲姟妯″紡: all鍙栨斁璐�
}
command.setCommand(false);
@@ -3432,6 +3448,11 @@
wrkMast.setWrkSts(105L);
wrkMast.setModiTime(date);
wrkMastService.updateById(wrkMast);
+ } else if (wrkMast.getIoType() == 105){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
}
}
@@ -3747,12 +3768,13 @@
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/process/loc/v1")
+ .setJson(JSON.toJSONString(""))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
log.info("浠诲姟涓嬪彂鎴愬姛");
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, null));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, null));
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/comb/auth", response);
}
--
Gitblit v1.9.1