From bd2eb4480540d2bf6ee1c12fd72d7f778b036a4a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 18 六月 2025 12:54:43 +0800
Subject: [PATCH] #导入订单时分批导入
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 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 619b6e9..fc60578 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1436,7 +1436,7 @@
@Override
public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
- if (Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param,param.getMatList())) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
}
if (Cools.isEmpty(param.getBarcode())) {
@@ -1468,6 +1468,7 @@
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
+ wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
@@ -1547,10 +1548,67 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 涓�妤艰繑淇叆搴撴帹閫乵es鍋氳褰�
+ pushFxrkToMes(param);
+
// 杩斿洖GWCS鐩爣淇℃伅
- openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "浜屾ゼ杩斾慨鍏ュ簱鎺ㄩ�乬wcs");
+ openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤艰繑淇叆搴撴帹閫乬wcs");
return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
+ }
+
+ private void pushFxrkToMes(GwmsGenerateInventoryDto param) {
+
+ for (GwmsGenerateInventoryDto.MatList matList : param.getMatList()){
+ matList.setOutOrIn("in");
+ matList.setStockType("杩斾慨鍏ュ簱");
+ }
+
+ boolean success = false;
+ // 鑾峰彇璇锋眰澶�
+ Map<String,Object> headers = new HashMap<>();
+ headers.put("Content-Type","application/json;charset=UTF-8");
+
+ // 鏋勯�犺姹備綋
+ String body = JSON.toJSONString(param);
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.MES_CC_IP_PORT)
+ .setPath(MesConstant.MES_CC_FXRK_URL)
+ .setHeaders(headers)
+ .setJson(body)
+ .build()
+ .doGet();
+ if (!Cools.isEmpty(response)) {
+ JSONObject jsonObject1 = JSONObject.parseObject(response);
+ int code = (int) jsonObject1.get("code");
+ boolean state = jsonObject1.getBoolean("state");
+ if (code == 200 && state) {
+ success = true;
+ }
+ } else {
+ log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL, body, response);
+ }
+ } catch (Exception e) {
+ log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍寮傚父锛歿}", e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍",
+ MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+
}
@Override
@@ -1760,6 +1818,27 @@
return R.ok("璋冩暣鎴愬姛");
}
+ @Override
+ public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+ String orderNo = param.getOrderNo();
+
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+ } else if (!order.getSettle().equals(4L)) {
+ return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+ }
+
+ order.setSettle(5L);
+ order.setUpdateBy(userId);
+ order.setUpdateTime(new Date());
+
+ orderService.updateById(order);
+
+ return R.ok("鍙戣揣鏍稿鎴愬姛");
+ }
+
// 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
void kctzPushMes(JSONObject jsonObject) {
// 鎺ュ彛璇锋眰缁撴灉
@@ -1914,7 +1993,7 @@
}
throw new CoolException(msg);
} else {
- log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT, body, response);
+ log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL, body, response);
throw new CoolException("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐�");
}
} catch (Exception e) {
@@ -1924,7 +2003,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒�",
- MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT,
+ MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL,
null,
"127.0.0.1",
body,
--
Gitblit v1.9.1