From 84bce030fd2ec4c70e6401818ccf6b7daa16949f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 17:05:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?HL-5249=20=E4=BF=AE=E6=94=B9=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E3=80=82?= =?UTF-8?q?=E5=92=8C=E8=BE=BE=E6=98=8E=E7=A1=AE=E8=AE=A4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E9=87=8C=E7=9A=84=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=83=BD=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRequestMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 84ef721ef..428350a3a 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -564,11 +564,13 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive Date: Tue, 20 Aug 2024 17:22:41 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/package/index.vue | 94 +++++++++++-------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 4de07add2..e1d8a88f4 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -193,26 +193,26 @@ const handleSelectionPoint = async ()=>{ text: 'loading...', background: 'rgba(0, 0, 0, 0.7)' }) - // InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => { - // console.log('批量打印res',res); - // getLoading?.close() - // 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) - // } - // if(!res.cgLabel&&!res.zzLabel){ - // message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!') - // } - // }).catch(err => { - // console.log(err) - // getLoading?.close() - // }) + PackageApi.batchPrintingLable(rows.join(",")).then(res => { + console.log('批量打印res',res); + getLoading?.close() + 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) + } + if(!res.cgLabel&&!res.zzLabel){ + message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!') + } + }).catch(err => { + console.log(err) + getLoading?.close() + }) } @@ -359,28 +359,46 @@ const formsSuccess = async (formType,data) => { const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { console.log(row.packingNumber,445555555555555); - PackageApi.getBalanceToPackage(row.number).then(res => { - console.log(777,res); - if (res.productionLineCode != null) { - labelType.value = 'zz' - } else { - labelType.value = 'cg' + PackageApi.batchPrintingLable(row.number).then(res => { + 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) + } + if(!res.cgLabel&&!res.zzLabel){ + message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!') } - 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) }) + // PackageApi.getBalanceToPackage(row.number).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) + // }) } /** 导入 */ From e1f19fae439a603d28994b584ba04ac3ba73332d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 17:31:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=95=B0=E7=BB=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index e1d8a88f4..aee66956f 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -71,7 +71,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain"; import { formatDate } from '@/utils/formatTime' - +// 包装信息 defineOptions({ name: 'package' }) const message = useMessage() // 消息弹窗 @@ -193,7 +193,7 @@ const handleSelectionPoint = async ()=>{ text: 'loading...', background: 'rgba(0, 0, 0, 0.7)' }) - PackageApi.batchPrintingLable(rows.join(",")).then(res => { + PackageApi.batchPrintingLable(rows).then(res => { console.log('批量打印res',res); getLoading?.close() if(res.zzLabel){ @@ -359,7 +359,7 @@ const formsSuccess = async (formType,data) => { const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { console.log(row.packingNumber,445555555555555); - PackageApi.batchPrintingLable(row.number).then(res => { + PackageApi.batchPrintingLable([row.number]).then(res => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 From 0800e83cbe39fdbbd4dae4b9ef11616e44fdfa89 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 17:35:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?HL-5458=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 32c7b00bf..b67ca0711 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -115,6 +115,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( table: { width: 180 }, + isSearch: true, form: { component: 'DatePicker', componentProps: { From 10297e9f63cb9f428f315f6ecafc0447737717d2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 17:50:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?HL-5462=E9=9A=94=E7=A6=BB=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain/index.vue | 31 ++++++++++++++++++- .../productreceiptscrapRequestMain.data.ts | 3 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 4b9ad9fd4..45fd2b9d4 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -59,7 +59,21 @@ @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - /> + > + + 0){ + row['expireTime'] = res[0]['expireTime'] + } + }else if(formField == 'workStationCode'){ //添加明细 val.forEach(item=>{ @@ -595,7 +618,13 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + data.subList = tableData.value // 拼接子表数据参数 + tableData.value.forEach((row, index) => { + row['expireDate'] = row['expireTime'] + ? addDay(row['produceDate'], row['expireTime']).valueOf() + : dayjs('2099-12-31').valueOf() + }) if(data.subList.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') return diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 929e92008..7e2174154 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -1238,7 +1238,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 180 }, tableForm: { - type: 'FormDate', + type: 'slot', + disabled: true, valueFormat: 'x', }, form: { From c9d94899139702cc4c0be26a38a5049470f7e719 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 20 Aug 2024 18:31:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?HL-5484scp=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E6=95=B0=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/labelForm.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index b9e0a96d8..cea9e2c05 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -510,15 +510,15 @@ const blurOne = (oneRow, twoRow) => { if (!twoRow.xNumber) { twoRow.qtyOne = '' } - // if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) { - // message.warning('每托箱个数最多' + oneRow.otherNumber + '箱') - // twoRow.xNumber = oneRow.otherNumber - // twoRow.children = [] - // twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty) - // } + if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) { + message.warning('每托箱个数最多' + oneRow.otherNumber + '箱') + twoRow.xNumber = oneRow.otherNumber + twoRow.children = [] + twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty) + } twoRow.qtyOne = parseFloat(twoRow.xNumber) ? accuracyFun.multiply(parseFloat(twoRow.xNumber), parseFloat(oneRow.packQty)) - : '' + : '' // let num = 0 // oneRow.packageList.forEach((item) => { // num += parseFloat(item.xNumber) || 0 From 9e1c9054a39b4e75431704ea83c01c1920de273a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 20 Aug 2024 19:55:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-4903=20=E5=AD=90?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index a30a1db82..bbedb984b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -895,24 +895,24 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ } } }, - { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '运输方式', - field: 'transferMode', - sort: 'custom', - dictType: DICT_TYPE.TRANSFER_MODE, - dictClass: 'string', - table: { - width: 150 - }, - }, + // { + // label: '承运商', + // field: 'carrierCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '运输方式', + // field: 'transferMode', + // sort: 'custom', + // dictType: DICT_TYPE.TRANSFER_MODE, + // dictClass: 'string', + // table: { + // width: 150 + // }, + // }, { label: '库存状态', field: 'inventoryStatus', @@ -997,41 +997,41 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '计划数量', - field: 'planQty', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - tableForm: { - disabled: true - }, - isForm: false, - }, - { - label: '已收货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - tableForm: { - disabled: true - }, - isForm: false, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, + // { + // label: '计划数量', + // field: 'planQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // tableForm: { + // disabled: true + // }, + // isForm: false, + // }, + // { + // label: '已收货数量', + // field: 'shippedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // tableForm: { + // disabled: true + // }, + // isForm: false, + // }, { label: '创建时间', field: 'createTime',