From bbb98371ad9e677127c48320b3ebf863a4c6e7b6 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 16:44:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 28 ++++++++++++++--------------
src/main/java/com/zy/asrs/service/ReportToThirdService.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 5 -----
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2 +-
4 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a92533c..effe8ca 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -19,9 +19,7 @@
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
-import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
-import com.zy.nc.service.NccXsckmxTkWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -76,9 +74,6 @@
@Autowired
private OrderDetlPakinService orderDetlPakinService;
-
- @Autowired
- private NccXsckmxTkWmsService nccXsckmxTkWmsService;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
index b406786..26af8a2 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;
- boolean reportTkrk(String batch, String orderNo, Double anfme);
+ boolean reportTkrk(String matnr, 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 ad36b7d..36d77ce 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 boolean reportTkrk(String batch, String orderNo, Double anfme) {
- Object process1 = processTKRK(batch, orderNo, anfme);
+ 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);
@@ -263,17 +263,17 @@
return data;
}
- private Object processTKRK(String batch, String orderNo, Double anfme) {
- EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
- wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
- NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
- if (null == nccXsckmxTkWms) {
- throw new CoolException("鏈壘鍒版鏉＄爜");
- }
+ private Object processTKRK(String matnr,String batch, String orderNo, Double anfme) {
+// EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
+// 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("WLBM", nccXsckmxTkWms.getWlbm())
+ .eq("VBILLCODE", orderNo)
+ .eq("WLBM", matnr)
);
if(null == nccSaleXsfhmxWms) {
throw new CoolException("鏈壘鍒伴攢鍞崟鎹�");
@@ -288,11 +288,11 @@
saleOutBodyVO = new SaleOutBodyVO();
saleOutBodyVO.setCsourcetype("4331");
- saleOutBodyVO.setCsourcebillbid(nccXsckmxTkWms.getCsourcebillbid());
- saleOutBodyVO.setCsourcebillhid(nccXsckmxTkWms.getCsourcebillhid());
+ saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+ saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm());
- saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode());
+ saleOutBodyVO.setVbatchcode(batch);
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 b73e4bf..dff8484 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,7 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (!Cools.isEmpty(waitPakin.getTkFlag())) {
- boolean result = reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
+ boolean result = reportToThirdService.reportTkrk(waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
if (!result) {
exceptionHandle("閫�搴撳叆搴撲笂鎶RP[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
--
Gitblit v1.9.1