From 10a64879ad89e547d176c5ba90d3e2607ef18458 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Thu, 1 Feb 2024 18:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=20=E7=9B=98=E7=82=B9=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20DB=E8=84=9A=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存 盘点 日志 DB脚本更新
---
 .../views/heli/storagecheck/checkdetail.vue   | 26 ++++++++++---------
 sql/v1.3.0/1.structure.sql                    | 13 +++++++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index 142cc10f..f8939918 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -115,7 +115,7 @@
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
                         <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)">
-                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
+                          <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rg_name" :value="dict.id" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -125,7 +125,7 @@
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
                         <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%">
-                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pnName"
+                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name"
                             :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -365,6 +365,8 @@ const getList = async (arrMat) => {
       })
     }else{
       formData.value.matItemDOList= []
+      row.pnlist = ref([])
+      row.pnlist =  pnList.value.filter(pn => pn.rg_id === row.rg_id)
       formData.value.matItemDOList.push(row)
     }
   });
@@ -530,15 +532,8 @@ var pnList = ref([])
 
 const handleRg = async (scope) => {
   //-------------------库位全数据
-  const queryParamsRPn = reactive({
-    pageNo: 1,
-    pageSize: 99,
-    rgId: scope.row.rgId,
-    pnStatus: 1
-  })
-  const dataPn = await PnApi.getPnPage(queryParamsRPn)
   scope.row.pnid = ''
-  scope.row.pnlist = dataPn.list
+  scope.row.pnlist = pnList.value.filter(pn => pn.rg_id === scope.row.rgId)
   //-------------------
 }
 
@@ -551,14 +546,21 @@ const init_page_wh = (async ()=>{
 })
 //库区列表
 const init_page_rg = (async ()=>{
-  rgList.value = await RgApi.getSimpList()
+  rgList.value = (await RgApi.getSimpList()).filter(item =>item.wh_id== formData.value.whId)
+})
+//库位列表
+const init_page_pn = (async ()=>{
+  pnList.value = (await PnApi.getSimpList()).filter(item =>item.wh_id== formData.value.whId)
 })
 /** 初始化 **/
 onMounted(async () => {
 
+  
+  formData.value = await CheckApi.getStorageCheck(query.id)
+
   await init_page_wh()
   await init_page_rg()
-  formData.value = await CheckApi.getStorageCheck(query.id)
+  await init_page_pn()
 
   // 附件信息
   let attParams = {
diff --git a/sql/v1.3.0/1.structure.sql b/sql/v1.3.0/1.structure.sql
index cfcc806c..2044a6f6 100644
--- a/sql/v1.3.0/1.structure.sql
+++ b/sql/v1.3.0/1.structure.sql
@@ -1,4 +1,9 @@
-ALTER table wms_storage MODIFY column header_no VARCHAR(128);
-ALTER table wms_storage_mat MODIFY column  wh_id BIGINT(20) null;
-ALTER table wms_storage_mat MODIFY column  rg_id BIGINT(20) null;
-ALTER table wms_storage_mat MODIFY column  pn_id BIGINT(20) null;
\ No newline at end of file
+ALTER table wms_storage MODIFY column header_no VARCHAR(128) comment '上游单据单号';
+ALTER table wms_storage MODIFY column  wh_id BIGINT(20) null comment '仓库 Id，对应 wms_wh 表中的Id';
+ALTER table wms_storage_mat MODIFY column  wh_id BIGINT(20) null comment '仓库 Id，对应 wms_wh 表中的Id';
+ALTER table wms_storage_mat MODIFY column  rg_id BIGINT(20) null comment '库区 Id，对应 wms_rg 表中的Id';
+ALTER table wms_storage_mat MODIFY column  pn_id BIGINT(20) null comment  '库区 Id，对应 wms_rg 表中的Id';
+
+ALTER table wms_storage_log MODIFY column  wh_id BIGINT(20) null comment '仓库 Id，对应 wms_wh 表中的Id';
+ALTER table wms_storage_log MODIFY column  rg_id BIGINT(20) null comment '库区 Id，对应 wms_rg 表中的Id';
+ALTER table wms_storage_log MODIFY column  pn_id BIGINT(20) null comment  '库区 Id，对应 wms_rg 表中的Id';
\ No newline at end of file