Merge branch 'hella_online_20240927' into master_hella

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -164,6 +164,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(
               key: 'isReturnedQty', // 查询列表中字段
               value: 'FALSE', // 指查询具体值
               action: '==', // 查询拼接条件
+              isSearch: true, // 使用自定义拼接条件
               isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
             },
             {

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -234,6 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             tableData.value = [...res.list]
             originTableData.value = [...res.list]
           }
+          
         }).catch(err => {
           console.log(err)
           message.error('错误')
@@ -745,11 +746,16 @@ const clearSearchInput = (field)=>{
 }
 //为true表示子表数据中存在数量为0的数据
 const inputNumberChange = (field, val,row, index) => {
+  console.log('inputNumberChange',formRef.value.formRef)
   if(field=='qty'){
+    if(row['subReturnedQty']<=0){
+      message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}批次${row['batch']}被占用`)
+    }
     if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){
       message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`)
     }
   }
+
   console.log('inputNumberChange',field, val,row, index)
 }
 // 主子数据 提交
@@ -760,25 +766,20 @@ const submitForm = async (formType, submitData) => {
   }
   let flag = true
   tableData.value.forEach(item=>{
+    if(item['subReturnedQty']<=0){
+      flag = false
+      message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}批次${item['batch']}被占用`)
+    }
     if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){
       flag = false
       message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`)
     }
   })
+  
   if(!flag){
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
-  data.subList.forEach(obj => {
-    if(obj.qty == 0){
-      message.error(`数量不能为0!`)
-      flag.value = true
-      return;
-    }
-  })
-  if(flag.value){
-    return
-  }
   formRef.value.formLoading = true
   try {
     if (formType === 'create') {

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -899,19 +899,19 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false
   },
-  {
-    label: '未执行任务数量',
-    field: 'unexecutedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    isTableForm:false,
-    hiddenInMain:true,
-  },
+  // {
+  //   label: '未执行任务数量',
+  //   field: 'unexecutedQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   },
+  //   isTableForm:false,
+  //   hiddenInMain:true,
+  // },
   {
     label: '操作',
     field: 'action',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -735,7 +735,7 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item => {
     console.log(556565,item);
     if(fromInventoryStatus.value){
-      item.fromInventoryStatus = fromInventoryStatus.value
+      //item.fromInventoryStatus = fromInventoryStatus.value
       item.toInventoryStatus = toInventoryStatus.value
     }
     if(item.qty == 0){

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue

@@ -627,7 +627,7 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item => {
     console.log(556565,item);
     if(fromInventoryStatus.value){
-      item.fromInventoryStatus = fromInventoryStatus.value
+      //item.fromInventoryStatus = fromInventoryStatus.value
       item.toInventoryStatus = toInventoryStatus.value
     }
     if(item.qty == 0){

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@@ -644,7 +644,7 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item => {
     console.log(556565,item);
     if(fromInventoryStatus.value){
-      item.fromInventoryStatus = fromInventoryStatus.value
+      //item.fromInventoryStatus = fromInventoryStatus.value
       item.toInventoryStatus = toInventoryStatus.value
     }
     if(item.qty == 0){

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@@ -681,7 +681,7 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item => {
     console.log(556565,item);
     if(fromInventoryStatus.value){
-      item.fromInventoryStatus = fromInventoryStatus.value
+      //item.fromInventoryStatus = fromInventoryStatus.value
       item.toInventoryStatus = toInventoryStatus.value
     }
     if(item.qty == 0){

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -383,7 +383,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.masterId
+      number: row.number
     }
     await getDetailListBom()
   }

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -423,7 +423,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.id
+      number: row.number
     }
     await getDetailListBom()
   }