From 1b8db0473522c886428767f7eeaaf7f52d47ce42 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 15:30:41 +0800
Subject: [PATCH] 1.盘带人级联 2.盘点物品为仓库内物品

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java     |   20 +-------------------
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java |   20 +++++++++++++++-----
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java |    2 +-
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java    |    6 +++---
 admin-web/src/views/stock/inventorycount/inventorytask/edit.vue                         |    6 +++---
 consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java         |    4 +++-
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 449175e..5bca285 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="鐩樼偣浠撳簱" prop="warehouseId">
-        <el-select v-model="formData.warehouseId" placeholder="璇烽�夋嫨" style="width: 100%">
+        <el-select @change="getPdr" v-model="formData.warehouseId" placeholder="璇烽�夋嫨" style="width: 100%">
           <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -97,7 +97,7 @@
       this.formData.businessFormName = formatDate(new Date(), 'yyyy骞碝M鏈堜唤鐩樼偣');
     }
     this.handleSelectTenantWarehouse();
-    this.getPdr();
+    //this.getPdr();
     this.getJpr();
   },
   methods: {
@@ -113,7 +113,7 @@
     },
     // 鑾峰彇鐩樼偣浜�
     getPdr() {
-      warehouseManagerList({ tenantId: this.userInfo.tenantId }).then((res) => {
+      warehouseManagerList({ warehouseId: this.formData.warehouseId }).then((res) => {
         this.count++
         this.operatorOptions = res;
         if(this.count>1){
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index bc750e4..3390647 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -124,11 +124,10 @@
         if (transferBusinessType == 1) {
             // 鍏堝嚭搴擄紝鍐嶅叆搴�
             // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
-            List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+            List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
             Set<Long> baseModelIds =
                 modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
 
-            // TODO 涓嶅悓搴撳鐞�
             FinSysTenantUser sysTenantUser = this.getSysInfo();
             String agencyId = sysTenantUser.getTenantId();
             List<BaseWarehouse> baseWarehouseList =
@@ -140,14 +139,6 @@
             if (ObjectUtils.isEmpty(goodsInfoDTO)) {
                 return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
             }
-            // FinSysTenantUser sysTenantUser = this.getSysInfo();
-            // String agencyId = sysTenantUser.getTenantId();
-            // List<BaseWarehouse> baseWarehouseList =
-            // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
-            // if (CollectionUtils.isEmpty(baseWarehouseList)) {
-            // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
-            // }
-            // BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
 
             Long wareHouseId = goodsInfoDTO.getWarehouseId();
             String warehouseName = goodsInfoDTO.getWarehouseName();
@@ -295,7 +286,6 @@
         Set<Long> baseModelIds =
             modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
 
-        // TODO 涓嶅悓搴撳鐞嗕笖涓烘湰鏈烘瀯鐨勪粨搴撶墿鍝�
         FinSysTenantUser sysTenantUser = this.getSysInfo();
         String agencyId = sysTenantUser.getTenantId();
         List<BaseWarehouse> baseWarehouseList =
@@ -305,14 +295,6 @@
         // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
         List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
         GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
-        // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
-        // FinSysTenantUser sysTenantUser = this.getSysInfo();
-        // String agencyId = sysTenantUser.getTenantId();
-        // List<BaseWarehouse> baseWarehouseList =
-        // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
-        // if (CollectionUtils.isEmpty(baseWarehouseList)) {
-        // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
-        // }
         if (ObjectUtils.isEmpty(goodsInfoDTO)) {
             return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
         }
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
index 84157bf..0088cce 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
@@ -331,7 +331,7 @@
             //鏂板L_WH_PROCURE_MODEL璁板綍
             LWhProcureModel lWhProcureModel = new LWhProcureModel();
             lWhProcureModel.setId(IdUtil.generateId());
-            lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue() + 0);
+            lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue());
             lWhProcureModel.setBusinessId(lWhFormOutputId);
             lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
             lWhProcureModel.setCounts(counts);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 3cf6f64..9393423 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -342,19 +342,29 @@
             return null;
         }
         Long warehouseId = inventory.getWarehouseId();
-        Integer warehouseType = inventory.getWarehouseType();
 
         formInventoryVO.setBusinessFormCode(inventory.getBusinessFormCode());
         formInventoryVO.setBusinessFormName(inventory.getBusinessFormName());
         formInventoryVO.setWarehouseId(warehouseId);
         formInventoryVO.setWarehouseName(inventory.getWarehouseName());
 
+        // 缁熻浠撳簱鍐呯殑鐗╁搧
         String sql =
-            "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
-                + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
-                + "where bgt.AGENCY_ID = :agencyId";
+            "SELECT distinct bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,"
+                + "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
+                + "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
+                + "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
+                + "WAREHOUSE_ID = :warehouseId ";
         HashMap<String, Object> param = new HashMap<>();
-        param.put("agencyId", inventory.getAgencyId());
+        param.put("warehouseId", warehouseId);
+
+        // String sql =
+        // "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME
+        // baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+        // + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
+        // + "where bgt.AGENCY_ID = :agencyId";
+        // HashMap<String, Object> param = new HashMap<>();
+        // param.put("agencyId", inventory.getAgencyId());
         List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
         List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
         result.forEach(item -> {
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index 8b1b785..6d7034a 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -20,6 +20,7 @@
 import com.consum.base.core.type.GoodsModelType;
 import com.consum.base.core.type.InAndOutPutType;
 import com.consum.base.core.type.OutPutStatesType;
+import com.consum.base.core.type.WareHouseType;
 import com.consum.base.core.utils.CurrencyUtil;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.core.utils.MapUtils;
@@ -132,9 +133,8 @@
                 lWhProcureModel.setCounts(model.getCounts());
                 // 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
                 List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
-                // 鏌ヨ搴撳瓨鏃朵笉鍖哄垎鏈烘瀯鍜岄儴闂�
-                int goodsNum =
-                    this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds, model.getBaseGoodsModelsId(), 1, null);
+                int goodsNum = this.lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIds,
+                    model.getBaseGoodsModelsId(), 1, null);
                 lWhProcureModel.setWorehouseCount(goodsNum);
                 modelList.add(lWhProcureModel);
             }
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
index c25120e..7155ab3 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
@@ -361,7 +361,9 @@
             "SELECT distinct WAREHOUSE_ID,WAREHOUSE_NAME from L_WH_GOODS where base_goods_models_id in (:baseGoodsModelsIds) "
                 + "and WAREHOUSE_TYPE =0 and BUY_TYPE =1 and states =1 and WAREHOUSE_ID in (:wareHouseIds)");
         Map<String, Object> param = new HashMap<>();
-        param.put("baseGoodsModelsIds", baseModelIds);
+        if (!CollectionUtils.isEmpty(baseModelIds)) {
+            param.put("baseGoodsModelsIds", baseModelIds);
+        }
         param.put("wareHouseIds", wareHouseIds);
         List<Map<String, Object>> result = this.select(sql.toString(), param, new MapperUtil());
         result.forEach(item -> {

--
Gitblit v1.9.1