From 384a05c7bbd003f2485e374fd7c5b1189257ef0b Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期二, 15 七月 2025 09:56:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 8 ++++----
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 3 +++
src/main/resources/mapper/asrs/OrderMapper.xml | 4 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 +++++----
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0503fa6..a802c01 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -627,15 +627,16 @@
Date date = format.parse("2025-06-24 00:00:00");
Date date2 = format.parse("2025-06-24 23:59:59");
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .ge("appe_time", format.format(date))
- .le("appe_time", format.format(date2))
+// .ge("appe_time", format.format(date))
+// .le("appe_time", format.format(date2))
+ .eq("weight", -1)
);
int i = 0;
for (LocDetl locDetl : locDetls) {
// 淇敼搴撳瓨
- Double anfme = MatUtils.calcAnfmeFromWeight(locDetl.getMatnr(), locDetl.getAnfme());
- locDetlService.updateAnfme(anfme, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
+// Double anfme = MatUtils.calcAnfmeFromWeight(locDetl.getMatnr(), locDetl.getAnfme());
+ locDetlService.updateAnfme(locDetl.getAnfme(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
locDetl.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3());
i++;
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 51050ca..44551b7 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -107,7 +107,7 @@
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
} catch (Exception e) {
- log.error(e.getMessage());
+ e.printStackTrace();
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
}
@@ -127,7 +127,7 @@
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
} catch (Exception e) {
- log.error(e.getMessage());
+ e.printStackTrace();
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 6c9b312..c2692bd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -135,6 +135,9 @@
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg(order.getOrderNo() + "璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 3d7868f..fcbb237 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -91,7 +91,7 @@
for (String string : strings) {
List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start2In(wmsFlag);
if (!returnT.isSuccess()) {
@@ -118,7 +118,7 @@
for (String string : strings) {
List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start2Out(wmsFlag);
if (!returnT.isSuccess()) {
@@ -143,7 +143,7 @@
for (String string : strings) {
List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start3(wmsFlag);
if (!returnT.isSuccess()) {
@@ -170,7 +170,7 @@
for (String string : strings) {
List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start5(wmsFlag);
if (!returnT.isSuccess()) {
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index 87e7e9a..9527226 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -89,7 +89,7 @@
</select>
<select id="selectComplete99" resultMap="BaseResultMap">
- select top 5 *
+ select top 100 *
from man_order
where 1=1
and settle = 99
@@ -98,7 +98,7 @@
</select>
<select id="selectComplete8" resultMap="BaseResultMap">
- select top 5 *
+ select top 100 *
from man_order
where 1=1
and settle = 8
--
Gitblit v1.9.1