From 8de479c3fa16fd07d3565e1f77d73082431f7e49 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 八月 2025 08:14:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 9 +++++++++
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 28 +++++++++++++++++-----------
src/main/java/com/zy/asrs/service/ReportToThirdService.java | 7 ++-----
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2 +-
4 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c8180af..4773df0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -308,6 +308,15 @@
return String.valueOf(this.cstateid);
}
+ public String getCstateidVcode() {
+ KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+ KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+ if (!Cools.isEmpty(kcztMap)){
+ return String.valueOf(kcztMap.getVcode());
+ }
+ return String.valueOf(this.cstateid);
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
index 9bd1923..aabd1d9 100644
--- a/src/main/java/com/zy/asrs/service/ReportToThirdService.java
+++ b/src/main/java/com/zy/asrs/service/ReportToThirdService.java
@@ -1,9 +1,6 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import java.util.List;
@@ -11,7 +8,7 @@
void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception;
- boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme);
+ boolean reportTkrk(WaitPakin waitPakin);
boolean reportCheckOrder(String matnr, String batch);
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 393e27c..d950ce2 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -220,12 +220,17 @@
}
@Override
- public boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme) {
+ public boolean reportTkrk(WaitPakin waitPakin) {
+ String matnr = waitPakin.getMatnr();
+ String batch = waitPakin.getBatch();
+ String orderNo = waitPakin.getOrderNo();
+ Double anfme = waitPakin.getAnfme();
+
Object process1 = null;
NcResultMessage response1 = null;
boolean success1 = false;
try {
- process1 = processTKRK(matnr, batch, orderNo, anfme);
+ process1 = processTKRK(matnr, batch, orderNo, anfme, waitPakin.getCstateid());
//鍙戦�佽姹�
response1 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
log.info("閫�搴撳叆搴搑esponse:{}", response1);
@@ -245,7 +250,7 @@
NcResultMessage response2 = null;
boolean success2 = false;
try {
- process2 = processDBTK(matnr, batch, orderNo, anfme);
+ process2 = processDBTK(matnr, batch, orderNo, anfme, waitPakin.getCstateidVcode());
//鍙戦�佽姹�
response2 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, dbdd, JSONObject.toJSONString(process2));
log.info("閫�搴撳叆搴搑esponse:{}", response2);
@@ -350,7 +355,7 @@
return data;
}
- private Object processTKRK(String matnr,String batch, String orderNo, Double anfme) {
+ private Object processTKRK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
// EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
// wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
// NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
@@ -362,7 +367,7 @@
.eq("VBILLCODE", orderNo)
.eq("WLBM", matnr)
);
- if(null == nccSaleXsfhmxWms) {
+ if (null == nccSaleXsfhmxWms) {
throw new CoolException("鏈壘鍒伴攢鍞崟鎹�");
}
@@ -381,6 +386,7 @@
saleOutBodyVO.setVbatchcode(batch);
saleOutBodyVO.setNnum(anfme * -1);
+ saleOutBodyVO.setCstateid(cstateid);
saleOutBodyVOList.add(saleOutBodyVO);
data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -388,7 +394,7 @@
return data;
}
- private Object processDBTK(String matnr, String batch, String orderNo, Double anfme) {
+ private Object processDBTK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
List<NccSaleDbddWms> nccSaleDbddWmsList = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>()
.eq("wlbm", matnr)
.eq("vbillcode", orderNo)
@@ -405,10 +411,10 @@
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);
- }
+// 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());
@@ -416,7 +422,7 @@
iaIjBillB.setNnum(anfme * -1);
iaIjBillB.setVbatchcode(batch);
iaIjBillB.setClocationid("");
- iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+ iaIjBillB.setCstateid(cstateid);
bids.add(iaIjBillB);
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 dff8484..65fcf70 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.getMatnr(), waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
+ boolean result = reportToThirdService.reportTkrk(waitPakin);
if (!result) {
exceptionHandle("閫�搴撳叆搴撲笂鎶RP[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
--
Gitblit v1.9.1