From 5ee8d702138b67a8070e850ba622aa4b07d64fb9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 30 十月 2025 13:00:08 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 7acd213..ea659f7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
@@ -62,9 +63,10 @@
                 case 10:
                     // 淇敼搴撲綅鐘舵��=D
                     if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
-                        if (!Cools.isEmpty(wrkMast.getBarcode())) {
-                            locMast.setBarcode(wrkMast.getBarcode());
+                        if (Cools.isEmpty(wrkMast.getBarcode())) {
+                            throw new CoolException("绌烘澘鍏ュ簱鏉$爜涓嶈兘涓虹┖");
                         }
+                        locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setLocSts("D");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -107,6 +109,10 @@
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
+                            locDetl.setModel(wrkDetl.getModel());
+
+                            locDetl.setSPgNO(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
+
                             if (!locDetlService.insert(locDetl)) {
 //                                exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -221,6 +227,9 @@
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
+
+                            locDetl.setSPgNO(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
+
                             if (!locDetlService.insert(locDetl)) {
 //                                exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -370,7 +379,6 @@
                     // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
                         locMast.setLocSts("O");
-                        locMast.setBarcode("");
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);
                         if (!locMastService.updateById(locMast)) {
@@ -385,7 +393,6 @@
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
                         locMast.setLocSts("O");
-                        locMast.setBarcode("");
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);
                         if (!locMastService.updateById(locMast)) {

--
Gitblit v1.9.1