Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -554,7 +554,11 @@ const handleStatus = async (num) => {
     isShowBtnCancel.value = false
     isShowBtnOther.value = true
   }
+  query.type= 'update'
+  query.id = storageid.value
+  formData.value.id = storageid.value
   reload()
+
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -655,7 +659,10 @@ const submitForm = async () => {
     message.success(t(commonResult))
 
     // 成功后刷新
-    reload()
+    query.type= 'update'
+    query.id = storageid.value
+    formData.value.id = storageid.value
+    reload();
   } finally {
     formLoading.value = false
   }

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue

@@ -251,7 +251,7 @@
                       <el-input v-model="scope.row.description" />
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="120" fixed="right">
+                  <el-table-column label="操作" align="center" width="240">
                     <template #default="scope">
                       <!-- <el-button v-if="!scope.row.editable" type="primary" size="small" link
                         @click="handleEdit(scope.$index)">
@@ -525,6 +525,9 @@ const handleStatus = async (num) => {
     isShowBtnCancel.value = false
     isShowBtnOther.value = true
   }
+  query.id = storageid.value
+  query.type= 'update'
+  formData.value.id = storageid.value
   reload()
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -647,6 +650,9 @@ const submitForm = async () => {
     message.success(t(commonResult))
 
     // 成功后刷新
+    query.id = storageid.value
+    query.type= 'update'
+    formData.value.id = storageid.value
     reload()
   } finally {
     formLoading.value = false
@@ -676,6 +682,8 @@ const onAddItem = () => {
       productBomItemValueDOList: []
     }
     matCount = matCount + 1
+
+
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -706,11 +714,23 @@ const handleWh = async (wid) => {
   pnList.value = []
   rgList.value = dataRg.list
 
-  formData.value.matItemDOList.forEach((item) => {
-    item.rgId = ''
-    item.pnId = ''
-    item.pnlist.value = []
-  })
+  const matLastRemoteData = await StorageMatApi.getStorageMatList()
+
+  let matParams = {
+    pageNo: 1,
+    pageSize: 99,
+    status: "1"
+  }
+  const dataMat = await MaterialApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+
+  formData.value.matItemDOList = []
+  // formData.value.matItemDOList.forEach(item => {
+  //   item.rgId = ''
+  //   item.pnId = ''
+  //   item.pnlist.value = []
+  // })
   //-------------------
 }
 const handleRg = async (scope) => {
@@ -743,9 +763,7 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) => matLastRemoteData.find((fish) => fish.matId === item.id) !== undefined
-  )
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
   matSelectLoading.value = false
 }
 

sql/v1.1.0/heli.sql

@@ -160,3 +160,16 @@ CREATE TABLE `base_serial_number` (
                                       PRIMARY KEY ( `id` ) USING BTREE,
                                       UNIQUE KEY `uk_business_segment` ( `business_type`, `segment` ) USING BTREE
 ) ENGINE = InnoDB COMMENT = '序列号记录表';
+
+CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_amount` AS
+select `t`.`tenant_id` AS `tenant_id`,`t`.`mat_id` AS `mat_id`,`t`.`mat_name` AS `mat_name`,`t`.`mat_code` AS `mat_code`,
+       `t`.`wh_id` AS `wh_id`,`t`.`rg_id` AS `rg_id`,`t`.`pn_id` AS `pn_id`,`t`.`spec` AS `spec`,`t`.`unit` AS `unit`,
+       `t`.`material_type` AS `material_type`,`t`.`lot_no` AS `lot_no`,'' AS `storage_ok_qty`,sum(`t`.`storage_ok_qty`) AS `mat_rest`
+from (
+    select `st`.`stock_type` AS `stock_type`,`mat`.`tenant_id` AS `tenant_id`,`mat`.`mat_id` AS `mat_id`,`bm`.`code` AS `mat_code`,`bm`.`name` AS `mat_name`,
+           `mat`.`wh_id` AS `wh_id`,`mat`.`rg_id` AS `rg_id`,`mat`.`pn_id` AS `pn_id`,`mat`.`lot_no` AS `lot_no`,`bm`.`spec` AS `spec`,`bm`.`unit` AS `unit`,`bm`.`material_type` AS `material_type`,
+           (case when (`st`.`stock_type` = 1) then `mat`.`storage_ok_qty` else (`mat`.`storage_ok_qty` * -(1)) end) AS `storage_ok_qty`
+    from ((`mes-heli`.`wms_storage_mat` `mat`
+        left join `mes-heli`.`wms_storage` `st` on((`mat`.`stock_id` = `st`.`id`)))
+        left join `mes-heli`.`base_material` `bm` on((`mat`.`mat_id` = `bm`.`id`)))
+    where ((`mat`.`deleted` = 0) and (`st`.`status` <> 3) and (`st`.`deleted` = 0) and (`bm`.`deleted` = 0) and (`bm`.`status` = 1))) `t` group by `t`.`mat_id`