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

src/api/wms/deliverRecordDetail/index.ts

@@ -77,5 +77,5 @@ export const importTemplate = () => {
 
 // 查询发货记录子列表
 export const getDeliverRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/deliver-record-detail/listToRepeatDeliverReceipt`, params })
 }

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -101,7 +101,7 @@ export const getPurchasereceiptRecordDetailList = async (params) => {
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeatPurchaseReceipt`, params })
 }
 
 // 查询采购收货记录子详情

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

@@ -256,7 +256,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }
 
 // form表单提交

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

@@ -256,7 +256,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }
 
 // form表单提交

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

@@ -240,7 +240,7 @@ const BASE_URL = 'http://dev.ccwin-in.com:25110'
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }
 
 /** 导入 */

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

@@ -187,10 +187,10 @@ const handlePoint = async (row) => {
      // 判断是采购还是制造
   if (res.asnNumber !== null && res.asnNumber !== '') {
     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&id='+res.id)
+    window.open(src.value+'&asn_number='+res.id)
   } else {
     const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&id='+res.id)
+    window.open(src.value+'&asn_number='+res.id)
   }
   })
 }

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

@@ -260,10 +260,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (row.asnNumber !== null && row.asnNumber !== '') {
     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&id='+row.id)
+    window.open(src.value+'&asn_number='+row.id)
   } else {
     const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&id='+row.id)
+    window.open(src.value+'&asn_number='+row.id)
   }
 }
 

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@@ -74,6 +74,8 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/packageover-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" 
   :updateIsDisable="true" :coverIsDisable="true" :mode="2"/>
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
 
 <script setup lang="ts">
@@ -83,6 +85,8 @@ import { PackageoverRequestMain,PackageoverRequestMainRules, PackageoverRequestD
 import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain'
 import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
 
 defineOptions({ name: 'PackageoverRequestMain' })
 
@@ -93,7 +97,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PackageoverRequestMain.allSchemas.tableColumns,...PackageoverRequestDetail.allSchemas.tableMainColumns])
-
+const isCreateLabel = ref(false)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -188,6 +192,8 @@ const HeadButttondata = [
   // },
 ]
 
+const labelType = ref('') // 标签类别 采购还是制造等 
+
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -311,6 +317,8 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  }else if (val == 'point') { // 标签打印
+    handlePoint(row)
   }
 }
 
@@ -321,6 +329,34 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 批量打印--生产退料
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        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/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -410,6 +446,55 @@ const submitForm = async (formType, data) => {
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    labelPrint(row)
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreturn_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = PackageoverRequestMain.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@@ -109,10 +109,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (labelType == 'cg') {
     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+row.number)
   } else {
     const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+row.number)
   }
 }
 // 头部按钮事件

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -630,10 +630,10 @@ const handlePoint = async (row) => {
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
+      window.open(src.value+'&asn_number='+row.number)
     } else {
       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
+      window.open(src.value+'&asn_number='+row.number)
     }
   } else {
     message.warning('请先创建标签')

src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue

@@ -241,7 +241,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
-  window.open(src.value+'&id='+id)
+  window.open(src.value+'&asn_number='+id)
 }
 
 /** 导入 */