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

src/api/wms/package/index.ts

@@ -126,12 +126,19 @@ export const getLabelDetailPageByRecordId = async (params) => {
 export const getProductreceiptLabelDetailPage = async (params) => {
   return await request.get({ url: `/wms/package/getProductreceiptLabelDetailPage`,params})
 }
-
 // 根据库存余额获取包装信息进行打印标签
 export const getBalanceToPackage = async (packingNumber: String) => {
   return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber})
 }
 
+// 根据库存余额获取包装信息进行打印标签(英泰)
+export const getBalanceToPackageByIntex = async (itemCode: String) => {
+  const data = {
+    itemCode: itemCode
+  }
+  return await request.put({ url: `/wms/package/getBalanceToPackageByIntex`, data: data})
+}
+
 // 根据库存余额获取包装信息进行打印标签--批量打印
 export const getBalanceToPackageSelection = async (data: any) => {
   return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})

src/views/wms/inventoryManage/balance/index.vue

@@ -271,8 +271,8 @@ const BASE_URL = getJmreportBaseUrl()
 const labelType = ref('') // 标签类别 采购还是制造等
 // 标签打印
 const handlePoint = async (row) => {
-  console.log(row.packingNumber,445555555555555);
+  const itemCode = row.itemCode
-  PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
+  PackageApi.getBalanceToPackageByIntex(itemCode).then(res => {
     console.log(777,res);
       if (res.productionLineCode != null) {
         labelType.value = 'zz'