From ec2155ec79560105b6e6933c014e419a554c3bf6 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 21 十二月 2024 09:23:19 +0800 Subject: [PATCH] #订单出库批量更改出库站 --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 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 fda0cdf..e2f5bc5 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) { @@ -791,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,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2()); if (locDetls.size() == 0) { throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡"); } -- Gitblit v1.9.1