From e1067677ba7b4d258e05427e2993c97428274207 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 20:35:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 43ffc1c..ad36b7d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -210,16 +210,18 @@
}
@Override
- public void reportTkrk(String batch, Double anfme) {
- Object process1 = processTKRK(batch, anfme);
+ public boolean reportTkrk(String batch, String orderNo, Double anfme) {
+ Object process1 = processTKRK(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);
-// } else {
+ 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;
+ }
}
private Object processXSFH(List<OrderDetl> orderDetls, Boolean flag) {
@@ -261,16 +263,18 @@
return data;
}
- private Object processTKRK(String batch, Double anfme) {
+ private Object processTKRK(String batch, String orderNo, Double anfme) {
EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
- wrapper.like("VBATCHCODE", batch);
+ wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
if (null == nccXsckmxTkWms) {
throw new CoolException("鏈壘鍒版鏉＄爜");
}
NccSaleXsfhmxWms nccSaleXsfhmxWms = nccSaleXsfhmxWmsService.selectOne(new EntityWrapper<NccSaleXsfhmxWms>()
- .eq("VBILLCODE", nccXsckmxTkWms.getVsourcebillcode()));
+ .eq("VBILLCODE", nccXsckmxTkWms.getVsourcebillcode())
+ .eq("WLBM", nccXsckmxTkWms.getWlbm())
+ );
if(null == nccSaleXsfhmxWms) {
throw new CoolException("鏈壘鍒伴攢鍞崟鎹�");
}
@@ -289,7 +293,6 @@
saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm());
saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode());
- saleOutBodyVO.setNshouldnum(anfme * -1);
saleOutBodyVO.setNnum(anfme * -1);
saleOutBodyVOList.add(saleOutBodyVO);
--
Gitblit v1.9.1