From 67da83c698e77ccf178669a31e4bd3a4e8fc1ca7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 03 八月 2021 16:10:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 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 baf05c9..4d56e19 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.task.handler;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
@@ -217,17 +218,21 @@
                         }
                     }
                     // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
-                    // 淇敼婧愬簱浣嶇姸鎬� ==> O
-                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
-                    if (null != sourceLoc) {
-                        sourceLoc.setBarcode("");
-                        sourceLoc.setLocSts("O");
-                        sourceLoc.setModiTime(now);
-                        sourceLoc.setIoTime(now);
-                        if (!locMastService.updateById(sourceLoc)) {
-                            exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+                    // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
+                    if (Cools.isEmpty(wrkMast.getCtnNo()) || !wrkMast.getCtnNo().equals("Y")) {
+                        // 淇敼婧愬簱浣嶇姸鎬� ==> O
+                        LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
+                        if (null != sourceLoc) {
+                            sourceLoc.setBarcode("");
+                            sourceLoc.setLocSts("O");
+                            sourceLoc.setModiTime(now);
+                            sourceLoc.setIoTime(now);
+                            if (!locMastService.updateById(sourceLoc)) {
+                                exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+                            }
                         }
                     }
+
                     // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
                     locMast.setLocSts(locSts);
                     locMast.setBarcode(wrkMast.getBarcode());

--
Gitblit v1.9.1