From 4188991b66415e591b636dd304340b9d4674dcdf Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期三, 30 七月 2025 14:47:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 6 ++++--
src/main/webapp/static/js/orderPakout/out.js | 2 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 15 +++++----------
src/main/java/com/zy/common/model/LocDto.java | 6 ++++++
src/main/java/com/zy/asrs/controller/OutController.java | 2 ++
7 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 389ce8f..99f2937 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -547,11 +547,12 @@
return R.error("璁㈠崟宸茶鎵ц锛屾棤娉曞悓姝�");
}
- OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
- if(orderPakout == null) {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
+ .like("order_no", orderNo));
+ if(orderPakoutList.isEmpty()) {
return R.error("鍑哄簱璁㈠崟涓嶅瓨鍦�");
}
-
+ OrderPakout orderPakout = orderPakoutList.get(0);
if (orderPakout.getDocType$().equals("閿�鍞彂璐�")) {
NccSaleXsfhmxWms nccSaleXsfhmxWms = new NccSaleXsfhmxWms();
nccSaleXsfhmxWms.setWmsFlag(0);
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f4fafd2..6130fb6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -168,6 +168,8 @@
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
locDto.setUnit(orderDetl.getUnit());
+ locDto.setInitialAnfme(locDetl.getAnfme());//鍘熸墭鐩樻暟閲�
+ locDto.setInitialWeight(locDetl.getWeight());//鍘熸墭鐩樿緟鏁伴噺
//璁＄畻杈呭崟浣�
Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index b94df0c..ace2531 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -57,7 +57,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 10;
}
@Override
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 013a2ca..85a3500 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -236,6 +236,7 @@
}
} catch (Exception e) {
e.printStackTrace();
+ process1 = e.getMessage();
} finally {
reportApiLog(null, process1, process1, response1, "TKRK", nyncIp, saveRefDelivery, success1);
}
@@ -255,6 +256,7 @@
}
} catch (Exception e) {
e.printStackTrace();
+ process2 = e.getMessage();
} finally {
reportApiLog(null, process2, process2, response2, "DBRK", nyncIp, dbdd, success2);
}
@@ -409,7 +411,7 @@
Double weight = MatUtils.calcWeight(matnr, anfme);
iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
- iaIjBillB.setNassistnum(weight);
+ iaIjBillB.setNassistnum(weight * -1);
iaIjBillB.setNnum(anfme * -1);
iaIjBillB.setVbatchcode(batch);
iaIjBillB.setClocationid("");
@@ -417,7 +419,7 @@
bids.add(iaIjBillB);
- data.put("hid", nccSaleDbddWms.getCbill_bid());
+ data.put("hid", nccSaleDbddWms.getCbillid());
data.put("bids", bids);
return data;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 45865c7..f5f6d6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -340,17 +340,12 @@
// 鑾峰彇璺緞
List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
StaDesc staDesc = staDescs.get(0);
+ Integer crnStn = staDesc.getCrnStn();
if (locMast.getCrnNo() == 1) {
- int finalCrnStn = 1016;
if (locMast.getRow1() <= 3) {
- finalCrnStn = 1013;
- }
-
- for (StaDesc desc : staDescs) {
- if (desc.getCrnStn() == finalCrnStn) {
- staDesc = desc;
- break;
- }
+ crnStn = 1013;
+ }else {
+ crnStn = 1016;
}
}
@@ -378,7 +373,7 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setSourceStaNo(crnStn); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 67187bc..fb1c584 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -32,6 +32,12 @@
private Double anfme;
+ /*鍘熸墭鐩樻暟閲�*/
+ private Double initialAnfme;
+
+ /*鍘熸墭鐩樿緟鏁伴噺*/
+ private Double initialWeight;
+
/**
* 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
*/
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 6fdb19b..70ba831 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -224,6 +224,8 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'initialWeight', title: '鍘熸墭鐩樿緟鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'initialAnfme', title: '鍘熸墭鐩樻暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'anfme', title: '涓绘暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'weight', title: '杈呮暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'unit', align: 'center',title: '鍗曚綅'},
--
Gitblit v1.9.1