From cbe346528fea2fea06b92b354ec5a71717544c12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:18:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java          |   16 ++++++++++++----
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   19 +++++++++++++++----
 src/main/java/com/zy/common/service/CommonService.java     |    9 ++++++---
 3 files changed, 33 insertions(+), 11 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 b78196a..7492ff1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,12 +1,11 @@
 package com.zy.asrs.task.handler;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
 import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,10 +27,22 @@
     private WrkDetlService wrkDetlService;
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private WaitPakinService waitPakinService;
+    @Autowired
+    private WaitPakinLogService waitPakinLogService;
 
     @Transactional
     public ReturnT<String> start(WrkMast wrkMast) {
         try {
+
+            if (!Cools.isEmpty(wrkMast.getBarcode())) {
+                // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。
+                waitPakinLogService.save(wrkMast.getBarcode());
+                // 鍒犻櫎鍏ュ簱閫氱煡妗�
+                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+            }
+
             // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
             if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                 exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 8112dba..9c36d7a 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,9 +1,7 @@
 package com.zy.asrs.utils;
 
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.LocTypeDto;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 
 /**
@@ -154,5 +152,15 @@
         matCode.setNum6(excel.getNum6());
     }
 
+    /**
+     *  搴撲綅绉昏浆鏃剁被鍨嬫娴�
+     **/
+    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+        // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+            return false;
+        }
+        return true;
+    }
 
 }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 69348e0..f2100fc 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
+import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.model.LocTypeDto;
 import com.zy.common.model.Shelves;
 import com.zy.common.model.StartupDto;
@@ -139,9 +140,11 @@
                 // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                 LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                 if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                    locMast = shallowLoc;
-                    crnNo = locMast.getCrnNo();
-                    break;
+                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+                        locMast = shallowLoc;
+                        crnNo = locMast.getCrnNo();
+                        break;
+                    }
                 }
             }
         }

--
Gitblit v1.9.1