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

.gitignore

@@ -11,3 +11,4 @@ auto-*.d.ts
 .idea
 .history
 /sfms3.0
+/sfms3.0-ui

src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@@ -253,10 +253,31 @@ const handleExport = async () => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+const labelType = ref('') // 标签类别 采购还是制造等
-// 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&asn_number='+row.relateNumber)
+  console.log(row.packingNumber,445555555555555);
+  PackageApi.getBalanceToPackage(row.relateNumber).then(res => {
+    console.log(777,res);
+    if (res.productionLineCode != null) {
+      labelType.value = 'zz'
+    } else {
+      labelType.value = 'cg'
+    }
+    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+      console.log(159,resLable )
+      // 判断是采购还是制造
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        console.log(159,resLable )
+        window.open(src.value+'&asn_number='+resLable)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+resLable)
+      }
+    })
+  }).catch(err => {
+    console.log(err)
+  })
 }
 
 // form表单提交