From ebdd49ff02db7109aa125757b1234059fef30a2a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 14 六月 2025 00:34:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 12 +++++++-----
src/main/java/com/zy/asrs/service/ReportToThirdService.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
index f7624c4..7fb8033 100644
--- a/src/main/java/com/zy/asrs/service/ReportToThirdService.java
+++ b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
@@ -10,6 +10,6 @@
void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception;
- void reportTkrk(String batch, Double anfme);
+ void reportTkrk(String batch, String orderNo, Double anfme);
}
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..2174899 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -210,8 +210,8 @@
}
@Override
- public void reportTkrk(String batch, Double anfme) {
- Object process1 = processTKRK(batch, anfme);
+ public void 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);
@@ -261,16 +261,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("鏈壘鍒伴攢鍞崟鎹�");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 0ae0e0e..bf40617 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -70,7 +70,7 @@
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- if ("Y".equals(waitPakin.getTkFlag())) {
+ if (!Cools.isEmpty(waitPakin.getTkFlag())) {
reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getAnfme());
}
--
Gitblit v1.9.1