From c98d437554627a5f8a4cc85d2a8d452b0f81bd5f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 20 十二月 2024 10:27:39 +0800
Subject: [PATCH] 可维护站点出入状态
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 9a28eec..29f863d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -91,8 +91,15 @@
// 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
// 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
- .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
+ Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
+ switch (inSta) {
+ case "1040": wrapper.in("source_sta_no","1043","1044");break;
+ case "2010": wrapper.in("source_sta_no","2013","2014"); break;
+ case "2000": wrapper.in("source_sta_no","2003","2004");break;
+ case "3010": wrapper.in("source_sta_no","3013","3014");break;
+ default:
+ }
+ int count = wrkMastService.selectCount(wrapper);
if (count == 0) {
// 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
basDevp.setDevMk("1");
@@ -131,10 +138,10 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- jsonObject.getString("message");
if (jsonObject.getInteger("code").equals(0)) {
success = true;
} else {
+ message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
}
} catch (Exception e) {
@@ -364,7 +371,9 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
+ , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -393,6 +402,14 @@
waitPakin.setModiTime(now);
waitPakin.setManu(detlDto.getMark()); //鏍囪
waitPakin.setOrigin(order.getItemName());//浠撳簱
+ waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
+ waitPakin.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
+ waitPakin.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
+ waitPakin.setTemp1(detlDto.getTemp1());
+ waitPakin.setTemp2(detlDto.getTemp2());
+ waitPakin.setTemp3(detlDto.getTemp3());
+ waitPakin.setTemp4(detlDto.getTemp4());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -781,7 +798,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,null);
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
--
Gitblit v1.9.1