From d953e40c7badd8be505d133ae1bb410e4024229f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 四月 2026 11:05:16 +0800
Subject: [PATCH] #
---
src/main/resources/license.lic | 0
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 25 +++++++++++++++----------
src/main/resources/application.yml | 6 +++---
src/main/resources/mapper/OrderDetlPakinMapper.xml | 1 +
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 19 ++++++++-----------
5 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index a0e3a33..3565412 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -577,17 +577,14 @@
}
Double erpAnfme = anfme*mat.getSafeQty();
Order order1 = orderService.selectByNo( billNo);
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
- boolean sign = false;
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getMatnr().equals(matnr)){
- sign = true;
- break;
- }
- }
- if (sign){
- continue;
- }
+ List<OrderDetl> orderDetls =
+ orderDetlService.selectByOrderId(order.getId());
+ boolean exists = orderDetls.stream()
+ .anyMatch(o ->
+ o.getMatnr().equals(matnr) &&
+ o.getBoxType3().equals(pOrderNo)
+ );
+ if (exists) continue;
LocSupp locSupp = null;
String supp =null;
locSupp = locSuppService.selectByUuid(suppCode);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c680cc4..da559b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -107,7 +107,7 @@
ReviewOrderSwitch: true
# 鍦板潃
address:
- URL: https://shyucheng.test.kdgalaxy.com
+ URL: https://shyucheng.kdgalaxy.com/
#鐧诲綍鍦板潃
loginaddress: /kapi/oauth2/getToken
#鍟嗗搧妗ｆ鍦板潃
@@ -176,8 +176,8 @@
imMdcOmprdinbillBatchAudit: /kapi/v2/im/im_mdc_omprdinbill/batchAudit
# 鐧诲綍璐﹀彿绠＄悊
login :
- xAcfwIdentity: "djF8MTlhNTNhZjJhOWEwMWRlODhlMDF8NDkxNTk0MDU4MTQxNXwus9WaEHKRh0daJe1TWmVoMkv3zQY2knNTZRzaOhRgwnw"
+ xAcfwIdentity: "djF8MTlkMjllNzhjNDIwMTUwMzk0MDF8NDkyODEyNDUzNzMzM3xW-C9bLLZxtyzdBOu24fegjNWenhJEuRRBO6MjoKWF4nw="
clientId: "WMS"
clientSecret: "123456789Asd!@123456789"
- accountId: "2182793143735298048"
+ accountId: "2182793143190120448"
username: "admin"
\ No newline at end of file
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index df0c814..7024d80 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index d691eaf..c5cc6f7 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -138,6 +138,7 @@
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
+ and box_type3 = #{boxType3}
<!-- <include refid="standbyAll"></include>-->
</select>
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index 83b758e..da90a99 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -871,7 +871,7 @@
beforeClose: (action, instance, done) => {
if (action === 'confirm') {
instance.confirmButtonLoading = true;
- this.confirmReport(orderNo, done);
+ this.confirmReport(orderNo, instance, done);
} else {
done();
}
@@ -888,13 +888,21 @@
},
// 纭涓婃姤
- confirmReport(orderNo, done) {
+ confirmReport(orderNo, instance, done) {
this.reportLoading = true;
+ const finish = () => {
+ this.reportLoading = false;
+ if (instance) {
+ instance.confirmButtonLoading = false;
+ }
+ if (typeof done === 'function') {
+ done();
+ }
+ };
const rowsToIssue = (this.tableDataB || []).filter(item => parseInt(item.inspect) === 1);
if (rowsToIssue.length === 0) {
- this.reportLoading = false;
- if (typeof done === 'function') done();
+ finish();
this.$message.error('娌℃湁寰呬笅鍙戦」');
return;
}
@@ -926,8 +934,7 @@
Promise.all(updates).then(results => {
const failed = results.find(r => !r.ok);
if (failed) {
- this.reportLoading = false;
- if (typeof done === 'function') done();
+ finish();
this.$message.error(failed.msg || '鍚屾beBatch澶辫触');
return;
}
@@ -938,8 +945,7 @@
data: { orderNo: orderNo },
method: 'POST',
success: (res) => {
- this.reportLoading = false;
- if (typeof done === 'function') done();
+ finish();
if (res.code === 200 || res.success) {
this.$message({
message: `璁㈠崟鍙� ${orderNo} 涓嬪彂鎴愬姛`,
@@ -956,8 +962,7 @@
}
},
error: (error) => {
- this.reportLoading = false;
- if (typeof done === 'function') done();
+ finish();
console.error('涓嬪彂澶辫触:', error);
this.$message.error('涓嬪彂澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
}
--
Gitblit v1.9.1