From aa360de4381100150d34a469ecc087a78cf1720e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 03 十二月 2025 16:44:10 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 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 914e08c..e7dccc5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -67,15 +67,6 @@
                             throw new CoolException("绌烘澘鍏ュ簱鏉$爜涓嶈兘涓虹┖");
                         }
                         locMast.setBarcode(wrkMast.getBarcode());
-                        if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==5){
-                            locMast.setLocType2((short)5);
-                        }else if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==6){
-                            locMast.setLocType2((short)6);
-                        }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==7){
-                            locMast.setLocType2((short)7);
-                        }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==8){
-                            locMast.setLocType2((short)8);
-                        }
                         locMast.setLocSts("D");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -118,6 +109,10 @@
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
+                            locDetl.setModel(wrkDetl.getModel());
+
+                            locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
+
                             if (!locDetlService.insert(locDetl)) {
 //                                exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -232,6 +227,9 @@
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
+
+                            locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
+
                             if (!locDetlService.insert(locDetl)) {
 //                                exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -381,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)) {
@@ -396,8 +393,6 @@
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
                         locMast.setLocSts("O");
-                        locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
-                        locMast.setLocType2((short)0);
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);
                         if (!locMastService.updateById(locMast)) {

--
Gitblit v1.9.1