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

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -53,7 +53,6 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { addDay } from '@/utils/formatTime'
 import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
 import { formatDate } from '@/utils/formatTime'
-import * as SupplieritemApi from '@/api/wms/supplieritem'
 
 const emit = defineEmits(['getList'])
 const getList = () =>{
@@ -236,39 +235,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow.expireDate =  item['expireTime']?addDay(newRow['produceDate'],item['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
 
         // if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
-        // 供应商发货申请时，如果物料不允许超发，那么发货数量等于计划数量，且不可以编辑
+        // 可以允许超发
-        console.log(777, newRow['allowOverShipment'])
+        console.log(888,newRow['allowOverShipment'])
-        SupplieritemApi.getSupplierItemListByCodes({ supplierCode: item['supplierCode'], itemCodes: item['itemCode'] }).then((result) => {
+        if (newRow['allowOverShipment'] == 'TRUE') {
-          if (result.length > 0) {
+          newRow['qty'] =0
-            const res1 = result[0]
+          newRow['disabled_qty'] = false
-            if (res1['allowOverShipment'] == 'TRUE') {
+        } else {
-              newRow['qty'] =0
+          newRow['qty'] = newRow['planQty']
-              newRow['disabled_qty'] = false
+          newRow['disabled_qty'] = true
-            } else {
+        }
-              newRow['qty'] = newRow['planQty']
+        itemCodes.push(item['itemCode'])
-              newRow['disabled_qty'] = true
+        tableData.value.push(newRow)
-            }
-          }
-         
-          tableData.value.push(newRow)
-          itemCodes.push(item['itemCode'])
-          if(itemCodes.length>0){
-            //有效期
-            ItembasicApi.getItembasicPage({
-              code:itemCodes.join(',')
-            }).then((res)=>{
-              res.list.forEach((item,index)=>{
-                const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-                findItem['expireTime'] = item['expireTime']
-              })
-            })
-          }
-        }).catch((err) => {
-          
-        });
-       
       })
-      
+      if(itemCodes.length>0){
+        //有效期
+        ItembasicApi.getItembasicPage({
+          code:itemCodes.join(',')
+        }).then((res)=>{
+          res.list.forEach((item,index)=>{
+            const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+            findItem['expireTime'] = item['expireTime']
+          })
+        })
+      }
       
     } else {
       const setV = {}
@@ -348,8 +337,9 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{
       newRow['disabled_qty'] = true
     }
     tableData.value.push(newRow)
+    itemCodes.push(row['itemCode'])
   })
-  itemCodes.push(row['itemCode'])
+
   //有效期
   ItembasicApi.getItembasicPage({
     code:itemCodes.join(',')

src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts

@@ -1809,7 +1809,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     field: 'reverseInvoiceJournal',
     form: {
       componentProps: {
-        value:'APINVCOR',
+        value:'VDCOR',
         disabled: true,
       }
     },
@@ -1819,7 +1819,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     field: 'adjustmentJournal',
     form: {
       componentProps: {
-        value:'APADJ',
+        value:'VDADJ',
         disabled: true,
       }
     },

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@@ -310,8 +310,8 @@ const buttonTableClick = async (val, row) => {
 
 //发票回转
 const submitForm = async (formType, data) => {
-  data.reverseInvoiceJournal = 'APINVCOR'
+  data.reverseInvoiceJournal = 'VDCOR'
-  data.adjustmentJournal = 'APADJ'
+  data.adjustmentJournal = 'VDADJ'
   console.log('发票回转',formType, data)
   loadStart()
   try{

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

@@ -1917,7 +1917,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     field: 'reverseInvoiceJournal',
     form: {
       componentProps: {
-        value:'APINVCOR',
+        value:'VDCOR',
         disabled: true,
       }
     },
@@ -1927,7 +1927,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     field: 'adjustmentJournal',
     form: {
       componentProps: {
-        value:'APADJ',
+        value:'VDADJ',
         disabled: true,
       }
     },