From edb540e6444a6e809c66393500bb175a8a4eef44 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 11:51:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
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 4b2d3ec..a3d318b 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -172,12 +172,11 @@
@Transactional
public ReturnT<String> startV1(WrkMast wrkMast) {
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
if (wrkDetls.isEmpty()) {
return SUCCESS;
}
- String packageGroupNo; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
String outOrIn; //out 鍑猴紱in鍏ワ紱
/*
* 鎺ュ彛1=銆嬩笉鍚堟牸鍝佸嚭搴撲簩妤硷細 涓嶅悎鏍煎搧鍑哄簱
@@ -209,7 +208,9 @@
return SUCCESS;
}
for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetl.setDeadTime(null);
if (outOrIn.equals("out")){
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍑哄簱")){
wrkDetl.setManu("鐩樼偣鍑哄簱");
} else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
@@ -221,14 +222,14 @@
// packageGroupNo = order.getItemName();
wrkDetl.setDeadTime(order.getItemName());
}
- wrkDetl.setManu(docType.getDocName$());
+ wrkDetl.setManu(docType.getDocName$(outOrIn));
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
- } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
}
} else {
@@ -276,7 +277,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶ES",
+ "鎴愬搧搴撳叆鍑哄簱涓婃姤MES",
productInventoryUrl+"/"+productInventory,
null,
"127.0.0.1",
--
Gitblit v1.9.1