Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/productrepairRequestMain/index.ts

@@ -94,3 +94,8 @@ export const agreeProductrepairRequestMain = async (id) => {
 export const handleProductrepairRequestMain = async (id) => {
   return await request.put({ url: `/wms/productrepair-request-main/handle?id=` + id })
 }
+
+// 修改制品返修BOM数据
+export const updateProductscrapDetailRequestBom = async (id, data) => {
+  return await request.post({ url: `/wms/productrepair-request-main/updateBom?id=`+id, data })
+}

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -296,6 +296,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -337,6 +342,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -345,7 +361,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@@ -420,6 +420,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -457,6 +462,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -465,7 +481,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -807,6 +807,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -869,6 +874,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -877,7 +893,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@@ -519,6 +519,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -566,6 +572,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -574,7 +591,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -309,6 +309,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -350,6 +355,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+      let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -358,7 +374,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@@ -467,6 +467,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -508,6 +514,18 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    console.log(arr)
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -516,7 +534,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@@ -467,6 +467,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -508,6 +513,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -516,7 +532,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -422,7 +422,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.status = data.status == 0 ? true : false
       if (formData.value.priority == 0) {
         Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
       } else {
@@ -433,6 +433,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -458,14 +463,25 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
-  
-  if(formData.value.priority == 0){
+
+  if (formData.value.priority == 0) {
     message.error('优先级不可以为0')
     return
   }
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -474,7 +490,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -747,6 +747,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -809,6 +814,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -817,7 +833,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue

@@ -332,6 +332,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -362,6 +367,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -370,7 +386,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/countManage/count/countRequestMain/index.vue

@@ -261,7 +261,7 @@ const isShowReCountMainButton = (row, val) => {
 }
 // 根据状态返回该按钮是否显示
 const isShowGenerateMainButton = (row, val) => {
-  if (row.countAdjustStatus == 2) {
+  if (val.indexOf(row.countAdjustStatus) > -1) {
     return false
   } else {
     return true
@@ -310,7 +310,7 @@ const butttondata = (row) => {
       hasPermi: 'wms:count-request-main:supervise'
     }), // 监盘
     defaultButtons.mainCountAdjustRequesttBtn({
-      hide: isShowGenerateMainButton(row, ['1']),
+      hide: isShowGenerateMainButton(row, ['2']),
       hasPermi: 'wms:count-request-main:generate'
     }) // 生成盘点调整
   ]

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -106,6 +106,8 @@ import * as ProductrepairRequestMainApi from '@/api/wms/productrepairRequestMain
 import * as ProductrepairRequestDetailApi from '@/api/wms/productrepairRequestDetaila'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
+import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
+import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
 
 
 // 制品返修申请
@@ -135,6 +137,8 @@ const buttondataTable = ref([{
 const DialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
 const tableListBom = ref()
+const lsBomSave = ref()
+const rowId = ref()
 const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
   getListApi: BomDismantleApi.getBomDismantlePage
 })
@@ -150,12 +154,17 @@ const buttonBaseClickBom = (val) => {
   if (val == 'save') {
     // 根据 填写的数量 为基准 不填写数量的忽略
     tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
-    tableData.value.forEach((item, index) => {
-      if(tableListBom.value[0].rowId == index) {
-        item.childList = tableListBom.value
-      }
-    })
-    console.log(157, tableData.value)
+    if(lsBomSave.value){
+      tableData.value.forEach((item, index) => {
+        if(tableListBom.value[0].rowId == index) {
+          item.childList = tableListBom.value
+        }
+      })
+    }else {
+      // 详情下的 bom编辑功能 调用接口 保存数据
+      ProductrepairRequestMainApi.updateProductscrapDetailRequestBom(rowId.value, tableListBom.value)
+      message.success(t('common.updateSuccess'))
+    }
     bomModelVisible.value = false
   }
   // 关闭
@@ -209,6 +218,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['workStationCode'] = val[0]['code']
       } else if(formField == 'formField'){
         row['workStationCode'] = val[0]['code']
+      } else if(formField == 'bomVersion'){
+        row['bomVersion'] = val[0]['version']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -224,13 +235,23 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    setV['containerNumber'] = val[0]['containerNumber']
-    setV['itemCode'] = val[0]['itemCode']
-    setV['packingNumber'] = val[0]['packingNumber']
-    setV['batch'] = val[0]['batch']
-    setV['uom'] = val[0]['uom']
-    setV['inventoryStatus'] = val[0]['inventoryStatus']
-    setV['fromLocationCode'] = val[0]['locationCode']
+    if(formField == 'packingNumber'){
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['batch'] = val[0]['batch']
+      setV['uom'] = val[0]['uom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+    } else if(formField == 'productionLineCode'){
+      setV['productionLineCode'] = val[0]['code']
+    } else if(formField == 'workStationCode'){
+      setV['workStationCode'] = val[0]['code']
+    } else if(formField == 'formField'){
+      setV['workStationCode'] = val[0]['code']
+    } else if(formField == 'bomVersion'){
+      setV['bomVersion'] = val[0]['version']
+    }
     formRef.setValues(setV)
   })
 }
@@ -390,12 +411,14 @@ const handleHandle = async (id: number) => {
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  lsBomSave.value = true
   formRef.value.open(type, row)
 }
 
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  lsBomSave.value = false
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
@@ -501,6 +524,7 @@ const tableFormButton = async (val , row) => {
        bomVersion: row.bomVersion,
        masterId: row.id
     }
+    rowId.value =  row.id
     await getDetailListBom()
   }
 }

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -187,7 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (item.field == 'remark') {
               item.tableForm.disabled = false
             }
-            if (item.field == 'failedReason') {
+            if (item.field == 'reason') {
               item.tableForm.disabled = false
             }
             if (item.field == 'itemCode') {
@@ -432,15 +432,12 @@ const handleAddTable = () => {
     if (item.field == 'remark') {
       item.tableForm.disabled = false
     }
-    if (item.field == 'failedReason') {
+    if (item.field == 'reason') {
       item.tableForm.disabled = false
     }
     if (item.field == 'qty') {
       item.tableForm.disabled = false
     }
-    if (item.field == 'reason') {
-      item.tableForm.disabled = false
-    }
     if (item.field == 'itemCode') {
               item.tableForm.isInpuFocusShow = true
             }