From be5c6de69ba20049aba8a26591be1cd4a3934dca Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 10:50:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d26a89d..87508d1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -74,19 +74,17 @@
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
-// if(Cools.isEmpty(wrkMast.getPacked()){
-// JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-// JSONObject data = res.getJSONObject("data");
-// String tlocation = data == null ? null : data.getString("tlocation");
-// if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
-// List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", wrkMast.getLocNo()));
-// if (!Cools.isEmpty(detls)) {
-// for (LocDetl detl : detls) {
-// detl.setStandby1(tlocation);
-// locDetlService.updateById(detl);
-// }
+// JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
+// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+// JSONObject data = res.getJSONObject("data");
+// String tlocation = data == null ? null : data.getString("tlocation");
+// if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
+// List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("loc_no", wrkMast.getLocNo()));
+// if (!Cools.isEmpty(detls)) {
+// for (LocDetl detl : detls) {
+// detl.setStandby1(tlocation);
+// locDetlService.updateById(detl);
// }
// }
// }
@@ -119,19 +117,19 @@
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
-// if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1){
-// List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// WrkDetl wrkDetl = wrkDetls1.get(0);
-// JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-//
-// }
-// }else{
-// JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-//
-// }
-// }
+ if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){
+ List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ WrkDetl wrkDetl = wrkDetls1.get(0);
+ JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
+ if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+
+ }
+ }else if(Objects.isNull(wrkMast.getLocNo())){
+ JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
+ if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+
+ }
+ }
// if (!Objects.isNull(wrkMast.getWrkCode())) {
// return FAIL;
--
Gitblit v1.9.1