From 4c7ab64e5a6bf855ece40e760ba7ad16cf6c367b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 七月 2025 23:19:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 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 c9e5522..393e27c 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.nc.SendUtil;
import com.zy.nc.entity.*;
+import com.zy.nc.service.NccSaleDbddWmsService;
import com.zy.nc.service.NccSaleXsfhmxWmsService;
import com.zy.nc.service.NccScPcdaWmsService;
import com.zy.nc.util.NcResultMessage;
@@ -49,6 +50,8 @@
@Autowired
private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService;
+ @Autowired
+ private NccSaleDbddWmsService nccSaleDbddWmsService;
@Value("${NYNC.ip}")
private String nyncIp;
@@ -218,17 +221,47 @@
@Override
public boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme) {
- Object process1 = processTKRK(matnr, batch, orderNo, anfme);
- //鍙戦�佽姹�
- NcResultMessage response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
- log.info("閫�搴撳叆搴搑esponse:{}", response);
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("閫�搴撳叆搴搑esponse:{}", response);
- return true;
- } else {
-// remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
- return false;
+ Object process1 = null;
+ NcResultMessage response1 = null;
+ boolean success1 = false;
+ try {
+ process1 = processTKRK(matnr, batch, orderNo, anfme);
+ //鍙戦�佽姹�
+ response1 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
+ log.info("閫�搴撳叆搴搑esponse:{}", response1);
+ if (!Cools.isEmpty(response1) && response1.isSuccess()) {
+ log.info("閫�搴撳叆搴搑esponse:{}", response1);
+ success1 = true;
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ process1 = e.getMessage();
+ } finally {
+ reportApiLog(null, process1, process1, response1, "TKRK", nyncIp, saveRefDelivery, success1);
}
+
+ Object process2 = null;
+ NcResultMessage response2 = null;
+ boolean success2 = false;
+ try {
+ process2 = processDBTK(matnr, batch, orderNo, anfme);
+ //鍙戦�佽姹�
+ response2 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, dbdd, JSONObject.toJSONString(process2));
+ log.info("閫�搴撳叆搴搑esponse:{}", response2);
+ if (!Cools.isEmpty(response2) && response2.isSuccess()) {
+ log.info("閫�搴撳叆搴搑esponse:{}", response2);
+ success2 = true;
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ process2 = e.getMessage();
+ } finally {
+ reportApiLog(null, process2, process2, response2, "DBRK", nyncIp, dbdd, success2);
+ }
+
+ return false;
}
@Override
@@ -309,6 +342,7 @@
saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
saleOutBodyVO.setNshouldnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
saleOutBodyVO.setNnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
+ saleOutBodyVO.setCstateid(orderDetl.getCstateid());
saleOutBodyVOList.add(saleOutBodyVO);
}
data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -351,6 +385,43 @@
data.put("SaleOutHeadVO", saleOutHeadVO);
data.put("SaleOutBodyVO", saleOutBodyVOList);
+ return data;
+ }
+
+ private Object processDBTK(String matnr, String batch, String orderNo, Double anfme) {
+ List<NccSaleDbddWms> nccSaleDbddWmsList = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>()
+ .eq("wlbm", matnr)
+ .eq("vbillcode", orderNo)
+ );
+
+ if (nccSaleDbddWmsList.isEmpty()) {
+ throw new CoolException("璋冩嫧璁㈠崟ERP鏁版嵁涓虹┖");
+ }
+
+ NccSaleDbddWms nccSaleDbddWms = nccSaleDbddWmsList.get(0);
+
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+
+ List<IaIjBillB> bids = new ArrayList<>();
+ IaIjBillB iaIjBillB = new IaIjBillB();
+ NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", batch).eq("wlbm", matnr));
+ if (nccScPcdaWms == null) {
+ throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + batch + "-" + matnr);
+ }
+
+ Double weight = MatUtils.calcWeight(matnr, anfme);
+ iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
+ iaIjBillB.setNassistnum(weight * -1);
+ iaIjBillB.setNnum(anfme * -1);
+ iaIjBillB.setVbatchcode(batch);
+ iaIjBillB.setClocationid("");
+ iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+
+ bids.add(iaIjBillB);
+
+ data.put("hid", nccSaleDbddWms.getCbillid());
+ data.put("bids", bids);
return data;
}
@@ -451,11 +522,6 @@
IaIjBillB iaIjBillB = new IaIjBillB();
String remark = orderDetl.getRemark();
if (!Cools.isEmpty(remark)) {
- NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
- if (nccScPcdaWms == null) {
- throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetl.getBatch() + orderDetl.getMatnr());
- }
-
Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -463,7 +529,7 @@
iaIjBillB.setNnum(orderDetl.getQty());
iaIjBillB.setVbatchcode(orderDetl.getBatch());
iaIjBillB.setClocationid("");
- iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+ iaIjBillB.setCstateid(orderDetl.getCstateidVcode());
hid = nccSaleDbddWms.getCbillid();
}
--
Gitblit v1.9.1