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 | 15 ++++++++-------
src/main/java/com/zy/asrs/service/ReportToThirdService.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 1 +
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 5 ++++-
src/main/resources/application.yml | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2af50aa..0ffde18 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -318,6 +318,7 @@
matParam.setTiaoma(matnr);
map.put("orderNo", nccXsckmxTkWms.getVsourcebillcode());
+ map.put("khmc", nccXsckmxTkWms.getKhmc());
map.put("matData", matParam);
list.add(map);
}
diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
index 7fb8033..b406786 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, String orderNo, Double anfme);
+ boolean 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 2174899..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, String orderNo, Double 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) {
@@ -291,7 +293,6 @@
saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm());
saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode());
- saleOutBodyVO.setNshouldnum(anfme * -1);
saleOutBodyVO.setNnum(anfme * -1);
saleOutBodyVOList.add(saleOutBodyVO);
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 5765593..b73e4bf 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -71,7 +71,10 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (!Cools.isEmpty(waitPakin.getTkFlag())) {
- reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
+ boolean result = reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
+ if (!result) {
+ exceptionHandle("閫�搴撳叆搴撲笂鎶RP[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
}
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d915e10..3525f0a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -88,7 +88,7 @@
NYNC:
ip: http://192.168.5.200
port: 1105
- pageSize: 100
+ pageSize: 1000
#1.閿�鍞嚭搴撳崟鍙傜収鍙戣揣鍗曟柊澧�
saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
#2.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
--
Gitblit v1.9.1