From 5677fd88b56cd69e416b52144734f3997ef8f8f4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 28 四月 2026 16:29:12 +0800
Subject: [PATCH] 找库位

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 2623345..596ce64 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -81,7 +81,7 @@
             return false;
         }
         Integer ioType = wrkMast.getIoType();
-        return ioType != null && (ioType == 1 || ioType == 8 || ioType == 53 || ioType == 54 || ioType == 57);
+        return ioType != null && (ioType == 1 || ioType == 5 || ioType == 8 || ioType == 53 || ioType == 54 || ioType == 57);
     }
 
     private boolean needOutboundErpReport(WrkMast wrkMast) {
@@ -449,6 +449,36 @@
                         return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                     }
                     break;
+                // 娴呭簱浣嶇Щ搴�
+                case 5:
+                    String changeLocSts = "D";
+                    if ("N".equals(wrkMast.getEmptyMk())) {
+                        changeLocSts = "F";
+                        if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                            return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+                        }
+                    }
+                    LocMast changeLocSource = locMastService.selectById(wrkMast.getSourceLocNo());
+                    if (null != changeLocSource) {
+                        changeLocSource.setBarcode("");
+                        changeLocSource.setLocSts("O");
+                        changeLocSource.setModiTime(now);
+                        changeLocSource.setIoTime(now);
+                        if (!locMastService.updateById(changeLocSource)) {
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                            return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+                        }
+                    }
+                    locMast.setLocSts(changeLocSts);
+                    locMast.setBarcode(wrkMast.getBarcode());
+                    locMast.setIoTime(now);
+                    locMast.setModiTime(now);
+                    if (!locMastService.updateById(locMast)) {
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+                    }
+                    break;
                 default:
                     break;
             }

--
Gitblit v1.9.1