From b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 16:18:24 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index d492cfa..e668565 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -100,24 +100,37 @@
}
break;
case "杞簱-鍑哄簱":
- process1 = processZKCK(orderDetls);
- List<Object> zkck1 = new ArrayList<>();
- zkck1.add(process1);
- //鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("杞簱-鍑哄簱1response:{}", response);
- step = 1;
- }
+ if (step == 1) {
+ process2 = processGENERALOUT2(orderDetls);
+ List<Object> zkck2 = new ArrayList<>();
+ zkck2.add(process2);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱2response:{}", response);
+ step = 10;
+ }
+ } else {
+ process1 = processZKCK(order, orderDetls);
+ List<Object> zkck1 = new ArrayList<>();
+ zkck1.add(process1);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱1response:{}", response);
- process2 = processGENERALOUT2(orderDetls);
- List<Object> zkck2 = new ArrayList<>();
- zkck2.add(process2);
- //鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("杞簱-鍑哄簱2response:{}", response);
- step = 10;
+ process2 = processGENERALOUT2(orderDetls);
+ List<Object> zkck2 = new ArrayList<>();
+ zkck2.add(process2);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱2response:{}", response);
+ step = 10;
+ }
+ } else {
+ step = 1;
+ }
}
break;
case "闆嗗洟鍐呴儴璋冩嫧":
@@ -139,7 +152,7 @@
}
} else if (step != 0) {
// 淇敼璁㈠崟鐘舵�� 鍋氭爣璁�
- if (!orderService.updateSettleStep(order.getId(), 6L, null, step)) {
+ if (!orderService.updateSettleStep(order.getId(), 4L, null, step)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -242,27 +255,25 @@
return data;
}
- private Object processZKCK(List<OrderDetl> orderDetls) {
+ private Object processZKCK(Order order, List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
whsTransBillHeaderVO.setPk_org("FYT");
- whsTransBillHeaderVO.setCwarehouseid("6101");
+ whsTransBillHeaderVO.setCwarehouseid(order.getItemId());
+ whsTransBillHeaderVO.setCtrantypeid("4K-01");
WhsTransBillBodyVO whsTransBillBodyVO = null;
List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
whsTransBillBodyVO = new WhsTransBillBodyVO();
String remark = orderDetl.getRemark();
- if (!Cools.isEmpty(remark)) {
- NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
- whsTransBillBodyVO.setCsourcetype("4331");
- whsTransBillBodyVO.setClocationid("610101");
- whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
- whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
- whsTransBillBodyVO.setNnum(orderDetl.getQty());
- whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
- whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
- }
+ //if (!Cools.isEmpty(remark)) {
+ //NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+ whsTransBillBodyVO.setNnum(orderDetl.getQty());
+ whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+ whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
+ //}
+ whsTransBillHeaderVO.setCotherbizid(orderDetl.getStandby1());
whsTransBillBodyVOS.add(whsTransBillBodyVO);
}
data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
--
Gitblit v1.9.1