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

src/views/wms/basicDataManage/documentSetting/switch/index.vue

@@ -134,7 +134,6 @@ const butttondata = (row, $index)=>{
   const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated',
     'CreateBackflushRecordAfterProductreceiptRecordCreated',
     'CreateProductputawayRequestAfterProductreceiptRecordCreated',
-    'ExecuteProductreceiptJobPredictIsCreatePutawayRequest',
     'CreatePurchasePlanAfterDiscretePurchaseOrderPublished',
     'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated',
     'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated'

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

@@ -453,17 +453,18 @@ const requestSwitch = ref(false)
 const getSwitch = async ()=>{
   let switch1  = await SwitchApi.getByCode('CreatePrepareToIssuePlanAfterProductionPlanPublished')
   planSwitch.value = switch1=='TRUE'
-  let switch2  = await SwitchApi.getByCode('CreateProductReciptRequestAfterProductionPlanPublished')
-  requestSwitch.value = switch2=='TRUE'
-  console.log('switch1',switch1)
-  console.log('switch2',switch2)
+  // 预生产计划创建收货申请 不走开关控制 
+  // let switch2  = await SwitchApi.getByCode('CreateProductReciptRequestAfterProductionPlanPublished')
+  // requestSwitch.value = switch2=='TRUE'
+  requestSwitch.value = true
+  // console.log('switch1',switch1)
+  // console.log('switch2',switch2)
 
 }
 // 自动提交
 const autoCreatePlanRequest = async (row)=>{
   // 生成备料计划
   try {
-    
     if(planSwitch.value) {
       // /generatePreparetoissue?number
       let PreparetoissueRes = await  ProductionMainApi.generatePreparetoissue(row.number)

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

@@ -331,6 +331,8 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainPlanSub') { // 提交审批
+    // 重新获取开关数据
+    await getSwitch()
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
@@ -384,6 +386,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
+        // 重新获取开关数据
+        await getSwitch()
         autoCreatePlanRequest(row)
       }
     })
@@ -541,10 +545,12 @@ const tableSelectionDelete = (selection) => {
 
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-    let data = {...submitData}
-    if(data.masterId){
-      data.id = data.masterId
-    }
+  // 重新获取开关数据
+  getSwitch()
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     return

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

@@ -329,7 +329,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
         const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
         window.open(src.value+'&asn_number='+res)
       } else {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        const src = ref(BASE_URL + '/jmreport/view/979553753876811776?token=' + getAccessToken())
         window.open(src.value+'&asn_number='+res)
       }
   }).catch(err => {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -16,6 +16,7 @@ const queryParams = {
   pageNo: 1,
   code: 'PurchaseInvoiceRequest'
 }
+console.log(34343)
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
 
@@ -784,7 +785,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'Select',
       api: () => procurementCreators.list,
-      value:procurementCreators?.list.length>0?procurementCreators.list[0].id:'',
       componentProps: {
         optionsAlias: {
           labelField: 'nickname',