From 4a2756d766318c0b755e96191d007763ad703ed2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 08:43:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?YT-1352=E6=B2=A1=E6=9C=89=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E8=B5=8B=E5=80=BC,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 6b4fb2ca1..20f9a7e04 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -350,8 +350,9 @@ const labelType = ref('') // 标签类别 采购还是制造等 const labelPointFormRef = ref() const detatableData1 = ref([]) const handlePoint = async (row) => { - await getLabelDetailPage(row,false) - labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 + const row1 = cloneDeep(row) + await getLabelDetailPage(row1,false) + labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } const searchTableRef = ref() From 9e8c31299df414bb5014da5af67a0fb161f0ccee Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 09:15:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?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 --- .../inventoryManage/balance/balance.data.ts | 12 ++--- .../wms/inventoryManage/balance/index.vue | 48 ++++++++++--------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 0966dc3d6..bbdfff2e7 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -839,12 +839,12 @@ export const BalancePackageRules = reactive({ { required: true, message: '请输入打印数量', trigger: ['change', 'blur'] }, { validator: validatePositiveNumber, message: '必须是一个正数', trigger: ['change','blur'] } ], - supplierItemCode: [ - { required: true, message: '请输入标签供应商代码', trigger: 'blur' } - ], - productionLineCodePackage: [ - { required: true, message: '请输入标签生产线代码', trigger: 'blur' } - ], + // supplierItemCode: [ + // { required: true, message: '请输入标签供应商代码', trigger: 'blur' } + // ], + // productionLineCodePackage: [ + // { required: true, message: '请输入标签生产线代码', trigger: 'blur' } + // ], }) export const BalancePackage = useCrudSchemas(reactive([ { diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 20f9a7e04..d4b4d477c 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -351,7 +351,8 @@ const labelPointFormRef = ref() const detatableData1 = ref([]) const handlePoint = async (row) => { const row1 = cloneDeep(row) - await getLabelDetailPage(row1,false) + await getLabelDetailPage(row1, false) + console.log(row1) labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } @@ -386,7 +387,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { code: row.itemCode, sort: '', by: 'ASC', - }).then(res => { + }).then(async res => { if (res.list.length > 0) { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules) @@ -394,38 +395,39 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { if (res.list[0].enableBuy == "TRUE") { detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') delete detailListTableColumnsRules.value.productionLineCodePackage - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns.map(itemColumns => { + // 修改 tableform 属性 + await SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { if(itemColumns.field == 'supplierItemCode') { - SupplieritemApi.getSupplieritemPage({ - pageSize: 10, - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - row.supplierItemCode = response.list[0].supplierCode - }) + row.supplierItemCode = response?.list[0]?.supplierCode } }) + + }) } // 判断物料 可制造 if (res.list[0].enableMake == "TRUE") { // 修改 tableform 属性 - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode') - delete detailListTableColumnsRules.value.supplierItemCode + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + delete detailListTableColumnsRules.value.supplierItemCode + await ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { detailListTableColumns.tableFormColumns.map(itemColumns => { if(itemColumns.field == 'productionLineCodePackage') { - ProductionlineitemApi.getProductionlineitemPage({ - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - row.productionLineCodePackage = response.list[0].productionLineCode - }) + row.productionLineCodePackage = response?.list[0]?.productionLineCode } }) + }) } } else { message.warning('没有查询到物料代码：【' + row.itemCode + '】') From 542fc97c5c7c95c3d7d3ce5e1347bd14eb4a7b5a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 29 Nov 2024 09:37:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?YT-1361WMS=20=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=20=E6=96=B0=E5=A2=9E=E5=92=8C?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/scrapRequestDetail/index.ts | 9 ++++++++- .../scrap/scrapRequestMain/index.vue | 8 ++++++++ .../scrapRequestMain/scrapRequestMain.data.ts | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/api/wms/scrapRequestDetail/index.ts b/src/api/wms/scrapRequestDetail/index.ts index 99a15ec2a..2c752eafd 100644 --- a/src/api/wms/scrapRequestDetail/index.ts +++ b/src/api/wms/scrapRequestDetail/index.ts @@ -17,12 +17,15 @@ export interface ScrapRequestDetailVO { itemDesc1: string itemDesc2: string projectCode: string + inventoryQty: number qty: number uom: string updateTime: Date updater: string } +const message = useMessage() // 消息弹窗 + // 查询报废出库申请子列表 export const getScrapRequestDetailPage = async (params) => { if (params.isSearch) { @@ -46,6 +49,10 @@ export const createScrapRequestDetail = async (data: ScrapRequestDetailVO) => { // 修改报废出库申请子 export const updateScrapRequestDetail = async (data: ScrapRequestDetailVO) => { + if(parseFloat(data.inventoryQty) < parseFloat(data.qty)){ + message.warning("数量不能大于库存数量") + return + } return await request.put({ url: `/wms/scrap-request-detail/update`, data }) } @@ -62,4 +69,4 @@ export const exportScrapRequestDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/scrap-request-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index a72f3a5cd..01f7a54c2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -222,6 +222,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['uom'] = item['uom'] newRow['singlePrice'] = itemCode ? itemCode['price'] : '' newRow['amount'] = newRow['qty'] * newRow['singlePrice'] + newRow['inventoryQty'] = item['qty'] tableData.value.push(newRow) }) // row['singlePrice'] = res.price @@ -725,6 +726,13 @@ const submitForm = async (formType, submitData) => { item.amount = Number(item.amount).toFixed(2) }) try { + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) < parseFloat(filter.qty) + ); + if(cmdExists){ + message.warning("数量不能大于库存数量") + return + } if (formType === 'create') { console.log('【报废出库子列表】', data.subList) if (data.subList.length == 0) { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 01acdc417..df71709a2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -1144,6 +1144,21 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ // disabled: true // } // }, + { + label: '库存数量 ', + field: 'inventoryQty', + sort: 'custom', + isSearch: false, + isTable: false, + tableForm: { + disabled: true + }, + form:{ + componentProps:{ + disabled:true + } + } + }, { label: '数量', field: 'qty', From dd4599f0ee856dccbf18d0eb30884badc32678b9 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 29 Nov 2024 11:05:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?YT-1370=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E9=80=80=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/zh-CN.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 839dcf9d8..9e748c598 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1317,6 +1317,7 @@ export default { 是否确认分摊金额: '是否确认分摊金额？', 创建开票申请: '创建开票申请', 作废成功:'作废成功', + 退回: '退回', }, } From 8cde2c0e5b2ec13c7ded6cfb045d18a21d161ce1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 11:17:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?YT-1355=E6=96=B0=E5=A2=9E=EF=BC=8C=E9=A1=BA?= =?UTF-8?q?=E5=BC=95=E5=8D=95=E6=8D=AE=E5=8F=B7=E3=80=81=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E5=BA=94=E6=9C=89=E8=BE=93=E5=85=A5=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 6 ++++-- .../inducedProduct/deliverRecordMain/index.vue | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 8f0e4322d..5da600857 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -526,7 +526,8 @@ export const DeliverRecordMainRules = reactive({ { required: true, message: '请选择发运时间', trigger: 'blur' } ], billNo: [ - { required: true, message: '请输入顺引单据号', trigger: 'blur' } + { required: true, message: '请输入顺引单据号', trigger: 'blur' }, + { max: 18, message: '字符不得超过18位', trigger: 'blur' }, ] }) @@ -1015,7 +1016,8 @@ export const DeliverRecordDetailRules = reactive({ { required: true, message: '请输入数量', trigger: 'blur' } ], serialNo: [ - { required: true, message: '请输入顺序号', trigger: 'blur' } + { required: true, message: '请输入顺序号', trigger: 'blur' }, + { max: 64, message: '字符不得超过64位', trigger: 'blur' }, ], classes: [ { required: true, message: '请选择班次', trigger: 'blur' } diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 7f7ccf528..3d481bad0 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -394,6 +394,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) => { + console.log(type) if (type == 'tableForm') { if(formField == 'itemCode') { const tableFormKeys = {} @@ -413,10 +414,14 @@ const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) newRow['id'] = item['id'] tableData.value.push(newRow) }) - }else{ + } else { row[formField] = val[0][searchField] } - } + }else if(formField == 'customerCode'){ + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } } From 96c8f0c2a8201b41c4ef082ca28674c20f5270f3 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 29 Nov 2024 11:17:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?YT-1362=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BC=BA=E5=B0=91=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseClaimRecordMain/index.ts | 9 +++++++-- .../purchaseClaim/purchaseClaimRecord/index.vue | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchaseClaimRecordMain/index.ts b/src/api/wms/purchaseClaimRecordMain/index.ts index 257144e5c..d291715ad 100644 --- a/src/api/wms/purchaseClaimRecordMain/index.ts +++ b/src/api/wms/purchaseClaimRecordMain/index.ts @@ -60,10 +60,15 @@ export const rejectPurchaseClaimRecordMain = async (id: number) => { // 导出采购索赔主 Excel export const exportPurchaseClaimRecordMain = async (params) => { - return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchaseClaim-record-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchaseClaim-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue index 9da9ec473..6b1f47fce 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue @@ -181,7 +181,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: `wms:purchaseClaimRecord:create` }), // 新增 defaultButtons.defaultImportBtn({ hasPermi: `wms:purchaseClaimRecord:import` }), // 导入 - defaultButtons.defaultExportBtn({ hasPermi: `wms:purchaseClaimRecord:export` }), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 From 9ecace4d5344c501faf497db2b2087e8743c7057 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 29 Nov 2024 11:58:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?YT-1376=EF=BC=9A=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=BA=94=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRequestMain/index.vue | 4 ++++ .../productreceiptAssembleRequestMain/index.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index b298c5ab3..a4f881979 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -688,6 +688,10 @@ const openForm = async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = false itemColumns.componentProps.disabled = true } + if (itemColumns.field == 'productionLineCode' || itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } }) } else { // 修改 tableform 属性 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 76245e6a2..4a4966bca 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -567,6 +567,10 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = false itemColumns.componentProps.disabled = true } + if (itemColumns.field == 'productionLineCode' || itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } }) } else { // 修改 tableform 属性