From d2362f13ebef44316836b888074d3747b430447e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 13 Dec 2023 15:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countPlan/CountPlanMainServiceImpl.java   |  2 +-
 .../CountRequestMainServiceImpl.java          | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java
index 9b4f39d3..b4bdebaa 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java
@@ -278,7 +278,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
         } else if (mainDO.getType().equals("CYCLE")) {//循环盘点
             // 添加 Job 到 Quartz 中
             try {
-                schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob", String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10);
+                schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob_" + mainDO.getId(), String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10);
             } catch (SchedulerException e) {
                 throw new ServiceException(COUNT_PLAN_CRON_ERROR);
             }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
index aed675d3..862f260c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
@@ -479,20 +479,22 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
     private void validateCountRequestDetailCreate(CountRequestDetailDO detailDO) {
         //校验库位基础信息
         locationService.selectLocation(detailDO.getLocationCode());
-        // 校验物品基础信息
-        ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode());
-        if (!Objects.equals(itembasicDO.getUom(), detailDO.getUom())) {
-            throw new UtilException("计量单位" + detailDO.getUom() + "错误，应该是" + itembasicDO.getUom());
-        } else {
-            detailDO.setItemDesc1(itembasicDO.getDesc1());
-            detailDO.setItemDesc2(itembasicDO.getDesc2());
-            detailDO.setItemName(itembasicDO.getName());
-            detailDO.setProjectCode(itembasicDO.getProject());
+        // 校验物品基础信息，空库位没有物品
+        if(detailDO.getItemCode() != null && !detailDO.getItemCode().isEmpty()) {
+            ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode());
+            if (!Objects.equals(itembasicDO.getUom(), detailDO.getUom())) {
+                throw new UtilException("计量单位" + detailDO.getUom() + "错误，应该是" + itembasicDO.getUom());
+            } else {
+                detailDO.setItemDesc1(itembasicDO.getDesc1());
+                detailDO.setItemDesc2(itembasicDO.getDesc2());
+                detailDO.setItemName(itembasicDO.getName());
+                detailDO.setProjectCode(itembasicDO.getProject());
+            }
         }
         // 校验业务类型
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRequest");
-        jobUtils.ifInToLocationType(detailDO.getLocationCode(), businesstypeDO);
-        jobUtils.ifOutInventoryStatuses(detailDO.getInventoryStatus(), businesstypeDO);
+        //BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRequest");
+        //jobUtils.ifInToLocationType(detailDO.getLocationCode(), businesstypeDO);
+        //jobUtils.ifOutInventoryStatuses(detailDO.getInventoryStatus(), businesstypeDO);
     }
 
     private CountPlanDetailDO selectCountPlanExist(String pnumber){
@@ -508,7 +510,6 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
         }
         QueryWrapper<CountPlanDetailDO> queryWrapperDetail = new QueryWrapper<>();
         queryWrapperDetail.eq("number", pnumber);
-        queryWrapperDetail.eq("available","TRUE");
         CountPlanDetailDO countPlanDetailDO = countPlanDetailMapper.selectOne(queryWrapperDetail);
         if(countPlanDetailDO != null) {
             return countPlanDetailDO;