Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -52,7 +52,7 @@
     :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
-    :isBusiness="true"
+    :isBusiness="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductionreturnRequestMainRules"
     :formAllSchemas="ProductionreturnRequestMain.allSchemas"
@@ -209,8 +211,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
         }
       } else if(formField == 'workStationCode') {
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       } else if(formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -491,6 +491,9 @@ export const ProductionreturnRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
 })
 
 /**

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

@@ -341,6 +341,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromInventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
+          newRow['qty'] = item['packQty']
           if(routeName.value == 'OktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
           }else if ( routeName.value == 'HoldtookRequestMain') {

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

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){

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

@@ -635,6 +635,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple: true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本

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

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){

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

@@ -627,6 +627,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本

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

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){

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

@@ -628,6 +628,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductputawayRequestMainRules"
     :formAllSchemas="ProductputawayRequestMain.allSchemas"
@@ -87,7 +89,7 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 制品上架申请
+// 制品上架申请 装配上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -108,14 +110,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['poLine'] = val[0]['itemCode']
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['uom'] = val[0]['uom']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['locationCode']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['poLine'] = item['itemCode']
+        newRow['packingNumber'] = item['packingNumber']
+        newRow['containerNumber'] = item['containerNumber']
+        newRow['batch'] = item['batch']
+        newRow['uom'] = item['uom']
+        newRow['inventoryStatus'] = item['inventoryStatus']
+        newRow['fromLocationCode'] = item['locationCode']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

@@ -447,6 +447,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本

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

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -201,15 +203,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if(formField == 'packUnit'){
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
+        row[formField] = val[0][searchField]
+      }else if (formField == 'workStationCode') {
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -615,6 +615,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',

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

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -202,15 +204,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if(formField == 'packUnit'){
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
+        row[formField] = val[0][searchField]
+      }else if (formField == 'workStationCode') {
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -616,6 +616,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="productionLineCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -140,6 +142,7 @@ import {
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 
 // 制品收货申请
+// 隔离报工申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -187,21 +190,31 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = async (formField, searchField, val, formRef, type, row ) => {
+  console.log(formField, searchField, val, formRef, type, row)
   nextTick(async () => {
     if (type == 'tableForm') {
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
-      }else if(formField == 'itemCode'){
+        row[formField] = val[0][searchField]
 
+      }else if(formField == 'itemCode'){
         let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')})
         if(res.length>0){
           row['uom'] = res[0]['uom']
         }
+        row[formField] = val[0][searchField]
+
         console.log('获取计量单位',res)
+      }else{
+        //添加明细
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@@ -523,6 +523,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -83,6 +85,7 @@
  <!-- BOM弹窗列表 -->
  <BasicForm
     ref="detailBomRef"
+    
     @success="getList"
     :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
     :tableFormRules="ProdcutscrapBomScrapRules"
@@ -118,7 +121,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 
-// 制品报废申请
+// 制品报废申请 制品子件报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -300,8 +303,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
+       
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -551,6 +551,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段