From f3cac25391d657dea7be24ba82862c867d7eb752 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 十二月 2024 11:15:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 4fe3a9b..8279896 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -88,25 +88,29 @@
public R inLocCallAgv(String sta, String inSta) {
BasDevp basDevp = basDevpMapper.selectById(inSta);
- // 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
- if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
- // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
- 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");
- basDevpMapper.updateById(basDevp);
- } else {
- return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
- }
+
+ // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
+ 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);
+ log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}",sta,inSta,count);
+ if (count != 0) {
+ return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
}
// 鍏堢粦瀹�
@@ -138,10 +142,13 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- jsonObject.getString("message");
if (jsonObject.getInteger("code").equals(0)) {
success = true;
+ // 鍏ュ簱鏆傚瓨+1
+ basDevp.setInQty(basDevp.getInQty() + 1);
+ basDevpMapper.updateById(basDevp);
} else {
+ message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
}
} catch (Exception e) {
@@ -410,6 +417,10 @@
waitPakin.setTemp2(detlDto.getTemp2());
waitPakin.setTemp3(detlDto.getTemp3());
waitPakin.setTemp4(detlDto.getTemp4());
+ int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countWrk2 > 0) {
+ throw new CoolException("宸ヤ綔妗ｆ潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode());
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -798,7 +809,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
--
Gitblit v1.9.1