From 29bb07ca180354c23d67f8886ea54df31d9bdc51 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Tue, 23 Apr 2024 22:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=E8=B4=A7=E5=8C=BA?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehousingNotificationController.java     |  3 +--
 .../warehousing/warehousinginventory/form.vue  | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
index 7fa2b4eb..b56e18e4 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
@@ -126,7 +126,6 @@ public class WarehousingNotificationController {
                 //其他入库
             }
 
-            //明天写这个，这里是计划查询，到时候直接sql查询
 //            List<WarehousingProductEntity> warehousingProductEntityList=warehousingNotificationService.getWarehousingProductList(entity.getId());
 
 
@@ -136,7 +135,7 @@ public class WarehousingNotificationController {
                 entity.setRemainingStockableQuantity(warehousingProductEntity.getRemainingStockableQuantity());
                 entity.setNotificationStorageNumber(warehousingProductEntity.getNotificationStorageNumber());
             }
-            
+
             List<BusinessOrderEntity> businessOrderEntityList =warehousingNotificationService.queryBusinessOrderType(entity.getId());
             for (BusinessOrderEntity businessOrderEntity:businessOrderEntityList){
                 entity.setTransactionMode(businessOrderEntity.getTransactionMode());
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
index d0361046..95f58c25 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
@@ -48,14 +48,26 @@
             <jnpf-form-tip-item label="货区名称" v-if="judgeShow('cargoId')" prop="cargoId">
               <JnpfPopupSelect v-model="dataForm.cargoId" @change="changeData('cargoId',-1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.cargoId"
-                placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='cargo_name' field='cargoId'
-                interfaceId="530700536261903749" :pageSize="20"
+                placeholder="请选择" :disabled="judgeWrite('cargoId')" hasPage propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
+                field='cargoId' interfaceId="530700536261903749" :pageSize="20"
                 :columnOptions="cargoIdcolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
 
+          <!-- <el-col :span="8" v-if="judgeShow('cargoId')">
+            <jnpf-form-tip-item label="货区名称" v-if="judgeShow('cargoId')" prop="cargoId">
+              <JnpfPopupSelect v-model="dataForm.cargoId" @change="changeData('cargoId',-1)"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.cargoId"
+                placeholder="请选择" :disabled="judgeWrite('cargoId')" hasPage propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
+                field='cargoId' interfaceId="530700536261903749" :pageSize="20"
+                :columnOptions="cargoIdcolumnOptions" clearable :style='{"width":"100%"}'>
+              </JnpfPopupSelect>
+            </jnpf-form-tip-item>
+          </el-col> -->
+
           <el-col :span="8" v-if="judgeShow('documentNo')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
               <JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo', -1)"