From 39769feeda35ad1cc57fd24598c8ffaa6a08d598 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 11 Jul 2025 14:04:51 +0800 Subject: [PATCH] =?UTF-8?q?YT-2797=E9=A1=BA=E5=BC=95=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E3=80=90=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=97=A5=E6=9C=9F=E3=80=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/itembasic/index.ts | 9 +++ src/api/wms/maintenanceBillDate/index.ts | 8 ++ .../deliverRecordMain.data.ts | 18 ++--- .../deliverRecordMain/index.vue | 78 +++++++++++++++++-- 4 files changed, 99 insertions(+), 14 deletions(-) diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 8291744c2..7a43c3f3f 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -50,6 +50,15 @@ export const getItembasicPage = async (params) => { return await request.get({ url: `/wms/itembasic/page`, params }) } } +export const getBackNumberPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/itembasic/backNumberSenior', data }) + } else { + return await request.get({ url: `/wms/itembasic/backNumberPage`, params }) + } +} // 查询物料基本信息列表 export const getItembasicList = async (params) => { return await request.get({ url: `/wms/itembasic/list`, params }) diff --git a/src/api/wms/maintenanceBillDate/index.ts b/src/api/wms/maintenanceBillDate/index.ts index 47ebf1cd8..038b138f3 100644 --- a/src/api/wms/maintenanceBillDate/index.ts +++ b/src/api/wms/maintenanceBillDate/index.ts @@ -19,6 +19,14 @@ export const comPuteReconciliationDate = async (data: MaintenanceBillDateMainVO) return await request.post({ url: `/wms/leadership-incorporation-doc-request/comPuteReconciliationDate`, data }) } +// 点击更新对账日期判断是否重复 +export const judgmentReconciliationDateRepeat = async (data: MaintenanceBillDateMainVO) => { + return await request.post({ url: `/wms/leadership-incorporation-doc-request/judgmentReconciliationDateRepeat`, data }) +} +// 更新对账日期 +export const updateReconciliationDate = async (data: MaintenanceBillDateMainVO) => { + return await request.post({ url: `/wms/leadership-incorporation-doc-request/updateReconciliationDate`, data }) +} diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 008b4a6d2..49cd11b81 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -1410,20 +1410,20 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive([ searchField: 'backNumber', searchTitle: '物料基础信息', searchAllSchemas: Itembasic.allSchemas, - searchPage: ItemBasicApi.getItembasicPage, + searchPage: ItemBasicApi.getBackNumberPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 4e3a4130c..786c03186 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -120,7 +120,7 @@ > @@ -520,6 +520,7 @@ const tableSelectionDelete = (selection) => { const maintenanceBillDateRef = ref() const tableDataBillDate = ref([]) const tableFormKeysBillDate = {} +const allNumber = ref('') const footButttondata = ref([ { label: '计算发货数量', @@ -569,10 +570,20 @@ const tableSelectionDeleteBillDate = (selection) => { const footButtonClick = async (val) => { if (val == 'sendGoodsNum') { sendGoodsNum() + }else if (val == 'updateBillDate') { + updateBillDate() } else if (val == 'close') { - formLabelRef.value.dialogVisible = false + maintenanceBillDateRef.value.dialogVisible = false } } +watch( + () => maintenanceBillDateRef.value?.formRef?.formModel, + (val) => { + allNumber.value = '' + },{ + deep: true + } +) // 计算发货数量 const sendGoodsNum = async () => { const elForm = unref(maintenanceBillDateRef.value.formRef)?.getElFormRef() @@ -590,10 +601,50 @@ const sendGoodsNum = async () => { message.warning('顺引开始日期不能大于顺引结束日期！') return } - if (maintenanceBillDateRef.value.formRef.formModel.startSerialNo >= maintenanceBillDateRef.value.formRef.formModel.endSerialNo) { - message.warning('开始序号不能大于结束序号！') + // if (maintenanceBillDateRef.value.formRef.formModel.startSerialNo >= maintenanceBillDateRef.value.formRef.formModel.endSerialNo) { + // message.warning('开始序号不能大于结束序号！') + // return + // } + const data = { ...maintenanceBillDateRef.value.formRef.formModel } + tableDataBillDate.value.forEach(item => { + item.serialNo = item.serialNoShow.split(',') + }) + data.notIncludedList = tableDataBillDate.value&&tableDataBillDate.value.length>0 ? tableDataBillDate.value : [] + data.customerOrderNumber='' + data.customerCode='' + data.incorporationNumber='' + console.log(data) + try { + maintenanceBillDateRef.value.formLoading = true + const res = await MaintenanceBillDateApi.comPuteReconciliationDate(data) + maintenanceBillDateRef.value.formLoading = false + console.log(res) + allNumber.value = res.zs + } finally { + maintenanceBillDateRef.value.formLoading = false + } +} +// 更新对账日期 +const updateBillDate = async () => { + const elForm = unref(maintenanceBillDateRef.value.formRef)?.getElFormRef() + // 校验表单 + if (!elForm) return + const valid = await elForm.validate() + if (!valid) return + if (tableDataBillDate.value.length > 0) { + const validateForm = await maintenanceBillDateRef.value.tableFormRef.validateForm() + if (!validateForm) { + return + } + } + if (maintenanceBillDateRef.value.formRef.formModel.startDueTime >= maintenanceBillDateRef.value.formRef.formModel.endDueTime) { + message.warning('顺引开始日期不能大于顺引结束日期！') return } + // if (maintenanceBillDateRef.value.formRef.formModel.startSerialNo >= maintenanceBillDateRef.value.formRef.formModel.endSerialNo) { + // message.warning('开始序号不能大于结束序号！') + // return + // } const data = { ...maintenanceBillDateRef.value.formRef.formModel } tableDataBillDate.value.forEach(item => { item.serialNo = item.serialNoShow.split(',') @@ -603,8 +654,25 @@ const sendGoodsNum = async () => { data.customerCode='' data.incorporationNumber='' console.log(data) - await MaintenanceBillDateApi.comPuteReconciliationDate(data) + if (!allNumber.value) { + message.warning('请先计算发货数量！') + return + } + try { + maintenanceBillDateRef.value.formLoading = true + const statusData = await MaintenanceBillDateApi.judgmentReconciliationDateRepeat(data) + if (statusData.status == 1) { + message.error(statusData.message) + return + } + const res = await MaintenanceBillDateApi.updateReconciliationDate(data) + maintenanceBillDateRef.value.formLoading = false + message.success(t('common.updateSuccess')) + } finally { + maintenanceBillDateRef.value.formLoading = false + } } + const searchTableAddSuccessBillDate = (formField, searchField, val, formRef, type, row) => { const setV = {} setV[formField] = val[0][searchField]