采购收货

src/api/wms/package/index.ts

@@ -100,7 +100,10 @@ export const createPackageLabel = async (data: PackageVO) => {
 export const batchPrintingLable = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLable`, data })
 }
-
+// 获取标签信息
+export const getPrintingLableId = async (data: any) => {
+  return await request.put({ url: `/wms/package/getLablesByPackingNumber`, data })
+}
 // 批量打印标签
 export const batchPrintingLableGet = async (params: any) => {
   return await request.get({ url: `/wms/package/batchPrintingBalanceLable`, params })

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -168,7 +168,8 @@ import {
   PurchasereceiptRequestDetail,
   PurchasereceiptRequestDetailRules,
   PurchasereceiptRequestDetailLabel,
-  PurchasereceiptRequestDetailPackingNumber
+  PurchasereceiptRequestDetailPackingNumber,
+  PurchasereceiptRequestPackage
  } from './purchasereceiptRequestMain.data'
  import {
   SupplierdeliverRequestPackage
@@ -559,7 +560,7 @@ const labelPrint = async (row) => {
   const { getList:getListPrint } = tableMethods
   await getListPrint()
   tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width
   })
@@ -580,7 +581,29 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
+  let array = []
+  let array1 = []
+    let packingNumbers = []
+  val.forEach(item => {
+    packingNumbers.push(item.number)
+    if (item.itemType == '可采购') {
+      array.push(item)
+    } else if(item.itemType == '可制造') {
+      array1.push(item)
+    }
+  })
+  if (array.length>0) {
+      // window.open('http://www.baidu.com')
+    // window.open('https://docs.pingcode.com/baike/3720496')
+    await PackageApi.getPrintingLableId({packingNumbers:packingNumbers}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  if (array1.length > 0) {
     await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
       window.open(src.value + '&asn_number=' + res)
@@ -590,6 +613,8 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     })
   }
   
+}
+
 const updateTableData = (tableList)=>{
   let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
   if(itemCodes.length>0){

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2555,3 +2555,72 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYYMMDD',
+      valueFormat: 'YYYYMMDD',
+    }
+  },
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+
+]))

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1824,18 +1824,18 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       valueFormat: 'YYYYMMDD',
     }
   },
-  {
-    label: '打印数量',
-    field: 'printQty',
-    sort: 'custom',
-    table: {
-    },
-    tableForm: {
-      type: 'InputNumber',
-      precision: 6,
-      min:0
-    }
-  },
+  // {
+  //   label: '打印数量',
+  //   field: 'printQty',
+  //   sort: 'custom',
+  //   table: {
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     precision: 6,
+  //     min:0
+  //   }
+  // },
   {
     label: '包装规格',
     field: 'packUnit',