From d2df4690ad1856d1969cab4f147c361bf52d57b6 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 70b93c3..9eb6b97 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -29,10 +29,6 @@
 
     @Value("${wcs-slave.doubleDeep}")
     private boolean confirmDeep;
-    @Value("${wcs-slave.doubleLocs}")
-    private String deepLocs;
-    @Value("${wcs-slave.shallowLocs}")
-    private String shallowLocs;
     @Autowired
     private LocDetlService locDetlService;
     @Autowired
@@ -58,7 +54,7 @@
 
                 //鏆傚仠绉诲簱
                 BasCrnp crnp = basCrnpService.selectById(crnNo);
-                if(!Cools.isEmpty(crnp) && crnp.getTankQty()==0){
+                if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
                     continue;
                 }
 

--
Gitblit v1.9.1