From b57a400ec555a4db4d0e412fbb15db731de45f13 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 15:40:25 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 57 ++++++++++++++----- .../productionreturnRequestMain.data.ts | 9 ++- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 1549da33a..56db1ed92 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -704,20 +704,51 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r 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('创建标签失败') + let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).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(array1.map(item1=>item1.number).join(',')).then(res => { + console.log(res) + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + window.open(src.value + '&asn_number=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + // 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('创建标签失败') + // }) } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 3e2a1d128..89ce5ec80 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1724,6 +1724,13 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive Date: Thu, 28 Nov 2024 15:46:48 +0800 Subject: [PATCH 02/13] =?UTF-8?q?YT-1341=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E8=BF=9B=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BBKHDZD20241128-0000000008=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E7=9C=8B=E6=98=8E=E7=BB=86=EF=BC=8C=E5=9C=88?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E6=98=AF=E7=A9=BA=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E9=A1=B5=E9=9D=A2=E7=9C=8B=E5=B0=B1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moldAllocation/customerStatement/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue index fb2dde87c..4f4f26c84 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue @@ -175,7 +175,7 @@ routeName.value = route.name const tableColumns = ref(CustomerStatementMain.allSchemas.tableColumns) const apiPage = ref(CustomerStatementDetailApi.getCustomerStatementDetailPage) -const DetailAllSchemas = ref(CustomerStatementShareReconciliation.allSchemas) +const DetailAllSchemas = ref(CustomerStatementDetail.allSchemas) const tabsExtend = ref(false) const tableObjectExtend = ref() From f5acd86afa39ec2a1dec5e07903cf63da0089467 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 15:55:28 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=8F=B7=E8=AF=95=E5=93=81=E5=8D=8F?= =?UTF-8?q?=E5=AE=9A=E5=93=81=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 54 ++++++++++++++----- .../toolPurchasereceiptRequestMain/index.vue | 51 ++++++++++++++---- 2 files changed, 83 insertions(+), 22 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue index 79e315e6a..adb90a59b 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue @@ -168,11 +168,11 @@ import { PurchasereceiptRequestDetail, PurchasereceiptRequestDetailRules, PurchasereceiptRequestDetailLabel, - PurchasereceiptRequestDetailPackingNumber - } from './purchasereceiptRequestMain.data' - import { - SupplierdeliverRequestPackage -} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' + PurchasereceiptRequestDetailPackingNumber, +} from './purchasereceiptRequestMain.data' + import { + PurchasereceiptRequestPackage + } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data' import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data' import * as PackageApi from '@/api/wms/package' import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain' @@ -559,7 +559,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,14 +580,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - - await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { +let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } + }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).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(array1.map(item1=>item1.number).join(',')).then(res => { console.log(res) window.open(src.value + '&asn_number=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + // await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + // console.log(res) + // window.open(src.value + '&asn_number=' + res) + // }).catch(err => { + // console.log(err) + // message.error('创建标签失败') + // }) } const updateTableData = (tableList)=>{ diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue index e7c898f97..f45d42b02 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue @@ -170,9 +170,9 @@ import { PurchasereceiptRequestDetailLabel, PurchasereceiptRequestDetailPackingNumber } from './purchasereceiptRequestMain.data' - import { - SupplierdeliverRequestPackage -} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' + import { + PurchasereceiptRequestPackage + } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data' import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data' import * as PackageApi from '@/api/wms/package' import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain' @@ -188,6 +188,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { getReportUrl } from '@/utils/systemParam' import { dateFormatter2 } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' + const { loadStart, loadDone } = usePageLoading() // 协定品收货申请 defineOptions({ name: 'ToolPurchasereceiptRequestMain' }) @@ -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,14 +581,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - - await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { +let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } + }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).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(array1.map(item1=>item1.number).join(',')).then(res => { console.log(res) window.open(src.value + '&asn_number=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + // await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + // console.log(res) + // window.open(src.value + '&asn_number=' + res) + // }).catch(err => { + // console.log(err) + // message.error('创建标签失败') + // }) } const updateTableData = (tableList)=>{ From 3e3472a0dd94a29224a3d2bf689767b5748fdcc0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 16:01:10 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain/index.vue | 52 +++++++++++++++---- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 038f9da7e..c5065f5ff 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -959,22 +959,52 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - - await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(',')) - .then((res) => { +let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } + }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).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/922734157577715712?token=' + getAccessToken()) - window.open(src.value + '&asn_number=' + res) - } + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') }) - .catch((err) => { + } + if (array1.length > 0) { + await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value + '&asn_number=' + res) + }).catch(err => { console.log(err) message.error('创建标签失败') }) + } + // 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/922734157577715712?token=' + getAccessToken()) + // window.open(src.value + '&asn_number=' + res) + // } + // }) + // .catch((err) => { + // console.log(err) + // message.error('创建标签失败') + // }) } const getDefaultWorkshopCode = async () => { const data = await ConfigApi.getConfigPage({ From 8eb942ce266b526852e6d6d4bd8845c2bce3f671 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 28 Nov 2024 16:03:25 +0800 Subject: [PATCH 05/13] =?UTF-8?q?YT-1337=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=B7=E5=85=88=E9=80=89=E6=8B=A9=E4=BB=8E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 4845b1325..1ce815ca7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -527,6 +527,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchTitle: '库存余额信息', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], }, form: { // labelMessage: '信息提示说明！！！', @@ -537,6 +547,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchTitle: '库存余额信息', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], } } }, From 6a589e1ad33525a1964a674f2972367211febdeb Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 28 Nov 2024 16:17:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 64e2c27e4..92c53e3cb 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -254,6 +254,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { if(item.field == 'itemCode') { if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ + { + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + }, { key: 'businessType', value: businessType.value , @@ -268,6 +274,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { ] } else if (fromInventoryStatus.value == null) { item.tableForm.searchCondition = [ + { + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + }, { key: 'businessType', value: businessType.value , From 898b42ba51affe8f392bbbc7dcb36556ba8b82b9 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 16:17:56 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E5=93=81=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain/index.vue | 15 +++++ .../productreceiptRequestMain.data.ts | 12 +++- .../index.vue | 56 ++++++++++++++----- 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index c5065f5ff..b298c5ab3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -195,6 +195,7 @@ import * as ConfigApi from '@/api/infra/config' import { usePageLoading } from '@/hooks/web/usePageLoading' import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain"; import * as ItemPackageApi from "@/api/wms/itempackage"; +import * as ruleApi from '@/api/wms/rule/index' const { loadStart, loadDone } = usePageLoading() // 制品收货申请 // 预生产收货申请 @@ -481,6 +482,7 @@ const butttondata = (row, $index) => { ] } +let toManagementPrecision = ref('') // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { @@ -622,6 +624,19 @@ const buttonTableClick = async (val, row) => { return } }) + ruleApi.getManagementPrecision({ + itemCodes: [item['itemCode']], + locationCode: item.toLocationCode + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if ( toManagementPrecision.value == 'BY_BATCH') { + // row['fromBatchFormItemType'] = 'FormDate' + row['disabled_batch'] = false + } else { + // row['fromBatchFormItemType'] = '' + row['disabled_batch'] = true + } }) } else if (val == 'mainHandle') { // 处理 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index d55e555f8..f9eb22309 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1727,8 +1727,11 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled: true - } + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, }, { label: '数量', @@ -2131,6 +2134,9 @@ export const ProductreceiptRequestLabelRules = reactive({ ], productionLineCodePackage: [ { required: true, message: '请选择生产线', trigger: 'change' } - ] + ], + batch: [ + { required: true, message: '请选择生产线', trigger: ['change','blur'] } + ], }) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 14b85858c..986198d9c 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -818,20 +818,50 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r 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/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+res) - } - }).catch(err => { - console.log(err) - message.error('创建标签失败') +let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).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(array1.map(item1=>item1.number).join(',')).then(res => { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value + '&asn_number=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + // 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/922734157577715712?token=' + getAccessToken()) + // window.open(src.value+'&asn_number='+res) + // } + // }).catch(err => { + // console.log(err) + // message.error('创建标签失败') + // }) } const getDefaultWorkshopCode = async () => { const data = await ConfigApi.getConfigPage({ From e49a7265dff29d68cd7fc4964e3243001ab70fd8 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 28 Nov 2024 16:24:16 +0800 Subject: [PATCH 08/13] =?UTF-8?q?YT-1337=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=B7=E5=85=88=E9=80=89=E6=8B=A9=E4=BB=8E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 6 +++--- .../inventorymoveRequestMain.data.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 92c53e3cb..cc6f1027c 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -257,10 +257,10 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { { key:'fromWarehouseCode', value:'fromWarehouseCode', - message: '请填写生产线代码！', + message: '请选择从仓库代码！', isMainValue: true }, - { + { key: 'businessType', value: businessType.value , isMainValue: false @@ -277,7 +277,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { { key:'fromWarehouseCode', value:'fromWarehouseCode', - message: '请填写生产线代码！', + message: '请选择从仓库代码！', isMainValue: true }, { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 1ce815ca7..ec54143ec 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -530,7 +530,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchCondition: [{ key:'fromWarehouseCode', value:'fromWarehouseCode', - message: '请填写生产线代码！', + message: '请选择从仓库代码！', isMainValue: true },{ key: 'available', @@ -550,7 +550,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchCondition: [{ key:'fromWarehouseCode', value:'fromWarehouseCode', - message: '请填写生产线代码！', + message: '请选择从仓库代码！', isMainValue: true },{ key: 'available', From fb70b898d14b044d7f4583b412854a29180ccd34 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 16:37:11 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain/index.vue | 12 ++++++------ .../productreceiptRequestMain.data.ts | 3 ++- .../productreceiptAssembleRequestMain/index.vue | 15 +++++++++++++++ .../productreceiptAssembleRequestMain.data.ts | 13 ++++++++++--- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index b298c5ab3..483e8fb4f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -624,19 +624,19 @@ const buttonTableClick = async (val, row) => { return } }) - ruleApi.getManagementPrecision({ + ruleApi.getManagementPrecision({ itemCodes: [item['itemCode']], locationCode: item.toLocationCode }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision - }) - if ( toManagementPrecision.value == 'BY_BATCH') { + if ( toManagementPrecision.value == 'BY_BATCH') { // row['fromBatchFormItemType'] = 'FormDate' - row['disabled_batch'] = false - } else { + item['disabled_batch'] = true + } else if(toManagementPrecision.value == 'BY_QUANTITY') { // row['fromBatchFormItemType'] = '' - row['disabled_batch'] = true + item['disabled_batch'] = false } + }) }) } else if (val == 'mainHandle') { // 处理 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index f9eb22309..4c5369f59 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1728,6 +1728,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( }, tableForm: { disabled: true, + type: 'FormDate', placeholder: '请选择从批次', valueFormat: 'YYYYMMDD', format: 'YYYYMMDD', @@ -2136,7 +2137,7 @@ export const ProductreceiptRequestLabelRules = reactive({ { required: true, message: '请选择生产线', trigger: 'change' } ], batch: [ - { required: true, message: '请选择生产线', trigger: ['change','blur'] } + { required: true, message: '请选择批次', trigger: ['change','blur'] } ], }) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 986198d9c..76245e6a2 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -155,6 +155,7 @@ import { formatDate } from '@/utils/formatTime' import * as WorkshopApi from '@/api/wms/workshop' import * as ConfigApi from '@/api/infra/config' import { usePageLoading } from '@/hooks/web/usePageLoading' +import * as ruleApi from '@/api/wms/rule/index' const { loadStart, loadDone } = usePageLoading() // 装配收货申请 // 号口品收货申请 @@ -381,6 +382,7 @@ const butttondata = (row,$index) => { // 列表-操作按钮事件 +const toManagementPrecision = ref('') const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 await message.confirm('确认要关闭吗？') @@ -505,6 +507,19 @@ const buttonTableClick = async (val, row) => { return } }) + ruleApi.getManagementPrecision({ + itemCodes: [item['itemCode']], + locationCode: item.toLocationCode + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + if ( toManagementPrecision.value == 'BY_BATCH') { + // row['fromBatchFormItemType'] = 'FormDate' + item['disabled_batch'] = true + } else if(toManagementPrecision.value == 'BY_QUANTITY') { + // row['fromBatchFormItemType'] = '' + item['disabled_batch'] = false + } + }) }) } else if (val == 'mainHandle') { // 处理 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 71beecd5b..9a7df4d64 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1732,8 +1732,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled:true - } + disabled: true, + type:'FormDate', + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, }, { label: '数量', @@ -2090,6 +2094,9 @@ export const ProductreceiptRequestLabelRules = reactive({ ], productionLineCodePackage: [ { required: true, message: '请选择生产线', trigger: 'change' } - ] + ], + batch: [ + { required: true, message: '请选择批次', trigger: ['change', 'blur'] } + ], }) From bc8e1dedc56e3879c764c87d8bd9dcf8defdaa95 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 28 Nov 2024 16:44:03 +0800 Subject: [PATCH 10/13] =?UTF-8?q?YT-1342=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=88=97=E8=A1=A8=E9=9A=90=E8=97=8F=E2=80=9C=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1=E2=80=9D=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/balance.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index c8586bf85..0966dc3d6 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -74,6 +74,7 @@ export const Balance = useCrudSchemas( label: '供应商批次', field: 'altBatch', sort: 'custom', + isTable: false, table: { width: 150 }, From 84a3a81aa6465dbdacfc8ad6a05a9e627681212c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 16:53:55 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 11 +++++++++-- .../productreceiptRequestMain/index.vue | 12 ++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index d0bc30b50..43f32ad4a 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -364,8 +364,15 @@ const handlePoint = async (row) => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+res.zzLabel) + PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => { + console.log(res) + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + // window.open(src.value+'&asn_number='+res.zzLabel) } if (res.cgLabel) { //采购标签 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 483e8fb4f..b298c5ab3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -624,19 +624,19 @@ const buttonTableClick = async (val, row) => { return } }) - ruleApi.getManagementPrecision({ + ruleApi.getManagementPrecision({ itemCodes: [item['itemCode']], locationCode: item.toLocationCode }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision - if ( toManagementPrecision.value == 'BY_BATCH') { + }) + if ( toManagementPrecision.value == 'BY_BATCH') { // row['fromBatchFormItemType'] = 'FormDate' - item['disabled_batch'] = true - } else if(toManagementPrecision.value == 'BY_QUANTITY') { + row['disabled_batch'] = false + } else { // row['fromBatchFormItemType'] = '' - item['disabled_batch'] = false + row['disabled_batch'] = true } - }) }) } else if (val == 'mainHandle') { // 处理 From e6fc6c10324fb23bfc0f6a4445f7b13f7ca69a15 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 16:57:42 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 43f32ad4a..4499c4263 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -364,6 +364,13 @@ const handlePoint = async (row) => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res.zzLabel) + } + if (res.cgLabel) { + //采购标签 + // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + // window.open(src.value+'&asn_number='+res.cgLabel) PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => { console.log(res) window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) @@ -371,13 +378,6 @@ const handlePoint = async (row) => { console.log(err) message.error('创建标签失败') }) - // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - // window.open(src.value+'&asn_number='+res.zzLabel) - } - if (res.cgLabel) { - //采购标签 - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+res.cgLabel) } if(!res.cgLabel&&!res.zzLabel){ message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!') From 15f18da91449a861e76fe9fa7af1857e1a6a1e5e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 17:28:15 +0800 Subject: [PATCH 13/13] =?UTF-8?q?YT-1318=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=83=BD=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 2 +- .../productionreturnRequestMain.data.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 56db1ed92..7ab6a4c2d 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -135,7 +135,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns //创建标签 const detailListTableColumns =cloneDeep(ProductionreturnRequestDetailLabel.allSchemas) -const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabel) +const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabelRules) const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 89ce5ec80..fed75d689 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1478,6 +1478,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive