From f517c3f941d7c7e40b8d6dadc02fea97fa440fd1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 09:41:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2f22fbd..117d794 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * 鍙屾繁寮忚揣鏋舵牳蹇冨姛鑳�
+ * 璐ф灦鏍稿績鍔熻兘
  * Created by vincent on 2020/6/11
  */
 @Service
@@ -119,7 +119,7 @@
                 throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
             }
             BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
-            int inQty = staNo.getInQty();
+            int inQty = staNo.getInQty()==null?0:staNo.getInQty();
             if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
                 // 鏌ユ壘搴撲綅
                 LocMast locMast = locMastService.queryFreeLocMast(curRow);

--
Gitblit v1.9.1