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

src/api/wms/productionMain/index.ts

@@ -179,11 +179,15 @@ export const resetting = (id) => {
   return request.put({ url: '/wms/production-main/resetting?id=' + id })
 }
 
-// 创建备料计划/制品收货申请
-export const generateRequest = (number) => {
-  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+// 创建备料计划
+export const generatePreparetoissue = (number) => {
+  return request.post({ url: '/wms/production-main/generatePreparetoissue?number=' + number })
 }
 
+// 创建制品收货申请
+export const generateProductreceiptRequest = (number) => {
+  return request.post({ url: '/wms/production-main/generateProductreceiptRequest?number=' + number })
+}
 
 
 

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -136,10 +136,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 入库存包装规格
         row[formField] = val[0][searchField]
         row['balancePackUnit'] = val[0]['packUnit']
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
-      
+
       setV[formField] = val[0][searchField]
       //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -253,7 +253,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -262,6 +262,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -364,9 +374,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
@@ -374,7 +396,8 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if (val == 'edit') { // 编辑
+  }
+  if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -558,7 +558,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -557,7 +557,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts

@@ -549,7 +549,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

@@ -550,7 +550,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }

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

@@ -235,6 +235,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
       }
       
     } else {