Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sql/v1.3.0/1.structure.sql

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 = {

sql/v1.3.0/1.structure.sql

@@ -1,7 +1,12 @@
-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;
+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';
 
 UPDATE base_material set virtual_part = 'N';
 ALTER TABLE base_material MODIFY COLUMN virtual_part CHAR ( 1 ) NOT NULL DEFAULT 'N' COMMENT '虚拟物料标识，只能填写Y和N，Y表示虚拟物料，N表示反之';