YT-663新增相同物料，报包装号重复，这几个应该都有这个问题 @张立

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -136,7 +136,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         //到货主代码
         row['toOwnerCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))

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

@@ -354,8 +354,8 @@ const fromManagementPrecision = ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'itemCode'){
+      if (formField == 'itemCode') {
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(async item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -738,17 +738,17 @@ const submitForm = async (formType, submitData) => {
   }
   data.businessType = businessType.value
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);

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

@@ -297,7 +297,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     console.log(formField)
     if (type == 'tableForm') {
       if (formField == 'itemCode') {
-        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch']  && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
+        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode']  && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
         if (val.length == 0) return
         val.forEach(item => {
           const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
@@ -642,17 +642,17 @@ const submitForm = async (formType, submitData) => {
   }
   data.businessType = businessType.value
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);

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

@@ -312,7 +312,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async() => {
     if (type == 'tableForm') {
       if(formField == 'itemCode'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -708,16 +708,16 @@ const submitForm = async (formType, submitData) => {
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     if(fromInventoryStatus.value){

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

@@ -317,7 +317,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async() => {
     if (type == 'tableForm') {
       if(formField == 'fromBatch'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
 
         const toLocationCode =formRef.formModel.toLocationCode//主数据选择的到库位代码
@@ -712,18 +712,18 @@ const submitForm = async (formType, submitData) => {
     message.warning("数量不能大于库存数量")
     return
   }
-  let isExist = false
+  // let isExist = false
-  tableData.value.forEach(item => {
+  // tableData.value.forEach(item => {
-    item['toLocationCode'] = toLocationCode
+  //   item['toLocationCode'] = toLocationCode
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
-    console.log(rs,5666);
+  //   console.log(rs,5666);
-   if(rs.length > 1) isExist = true
+  //  if(rs.length > 1) isExist = true
-  })
+  // })
-  if (isExist) {
+  // if (isExist) {
-    formRef.value.formLoading = false
+  //   formRef.value.formLoading = false
-    isExist = false
+  //   isExist = false
-    return message.warning('包装号重复')
+  //   return message.warning('物料号重复')
-  }
+  // }
   flag.value = false
   data.subList.forEach(item => {
     console.log(556565,item);