From 710f7a55f6023f6d490b0ca66d4679bfc270480b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 七月 2025 14:17:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2 ++
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 7 +------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e5c4b00..e689cb4 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -610,6 +610,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -624,6 +625,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
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 85a3500..33375ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -521,11 +521,6 @@
IaIjBillB iaIjBillB = new IaIjBillB();
String remark = orderDetl.getRemark();
if (!Cools.isEmpty(remark)) {
- NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
- if (nccScPcdaWms == null) {
- throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetl.getBatch() + "-" + orderDetl.getMatnr());
- }
-
Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -533,7 +528,7 @@
iaIjBillB.setNnum(orderDetl.getQty());
iaIjBillB.setVbatchcode(orderDetl.getBatch());
iaIjBillB.setClocationid("");
- iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+ iaIjBillB.setCstateid(orderDetl.getCstateid());
hid = nccSaleDbddWms.getCbillid();
}
--
Gitblit v1.9.1