From 71e8eb1e37b50d5eb34c1212858cd45428834382 Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Mon, 1 Jun 2026 01:02:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=9B=B8=E5=85=B3=E9=93=BE=E8=B7=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/inventory/execution/index.vue | 507 ++++++++++-------- .../src/views/inventory/inner/index.vue | 8 +- .../outer/components/GenerateDeliveryForm.vue | 10 +- .../components/PurchaseOrderDetail.vue | 62 +++ .../components/PurchaseOrderSelectDialog.vue | 8 +- .../oms_vue/src/views/purchaseorder/index.vue | 2 +- .../ruoyi/sip/domain/OmsPurchaseOrder.java | 16 +- .../sip/domain/OmsPurchaseOrderHistory.java | 2 + .../sip/dto/OrderProductMatchBindDto.java | 5 + .../ruoyi/sip/dto/OrderProductMatchDto.java | 9 + .../ruoyi/sip/mapper/InventoryInfoMapper.java | 2 + .../sip/service/IOmsPurchaseOrderService.java | 2 + .../sip/service/IProjectOrderInfoService.java | 2 + .../impl/ExecutionTrackServiceImpl.java | 6 + .../impl/InventoryDeliveryServiceImpl.java | 103 +++- .../impl/OmsInventoryInnerServiceImpl.java | 30 ++ .../impl/OmsPurchaseOrderServiceImpl.java | 48 +- .../impl/ProjectOrderInfoServiceImpl.java | 30 +- .../mapper/inventory/InventoryInfoMapper.xml | 34 +- .../sip/OmsPurchaseOrderHistoryMapper.xml | 3 + .../mapper/sip/OmsPurchaseOrderMapper.xml | 7 +- .../mapper/sip/ProjectOrderInfoMapper.xml | 35 +- 22 files changed, 623 insertions(+), 308 deletions(-) diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue index 0f06b574..7fcd448a 100644 --- a/oms_web/oms_vue/src/views/inventory/execution/index.vue +++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue @@ -243,6 +243,15 @@
产品型号： {{ item.model || '-' }} + 生成虚拟采购单
@@ -250,32 +259,38 @@ {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum : '-' }}
- 已配货: - {{ item.phNum !== undefined && item.phNum !== null ? item.phNum : '-' }} - 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-(item.phNum||0): '-'}} + 已配额: + {{ calculateCurrentTotalPhNum(item) }} + 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-calculateCurrentTotalPhNum(item): '-'}}
已备货: {{ item.bhNum !== undefined && item.bhNum !== null ? item.bhNum : '-' }} 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-(item.bhNum||0): '-'}} + 备货完成
- - - - + + - + + + + + + + - - - - + + @@ -321,7 +331,7 @@
关 闭 - + 保存修改
@@ -337,8 +347,8 @@
本次将保存 {{ stockingSaveChangedList.length }} 条配额量变更，是否继续？
- - + +
@@ -356,7 +366,7 @@ >
- 分配出库 SN 码 + 已出库 SN 码
@@ -406,22 +416,17 @@
- - 全选 - 当前仓库SN码总数：{{ getWarehouseSnCount(outerSnActiveWarehouse) }} - - 清空已选 - +
- {{ sn.productSn }}
- 取消 - - 确认分配 {{ outerSnSelectedCount }} - + 关闭
+ + + + + + +
@@ -464,13 +471,15 @@ import { getToken } from "@/utils/auth"; import OrderDetailDrawer from '../../project/order/OrderDetailDrawer.vue'; import ProjectDetailDrawer from '../../project/info/ProjectDetailDrawer.vue'; import Edit from './edit.vue'; +import PurchaseOrderDetail from '../../purchaseorder/components/PurchaseOrderDetail.vue'; export default { name: "Execution", components: { ProjectDetailDrawer, OrderDetailDrawer, - Edit // Register the Edit component + Edit, + PurchaseOrderDetail }, dicts: ['execution_outer_status', 'execution_delivery_status', 'execution_sign_status', 'purchase_status'], data() { @@ -518,6 +527,16 @@ export default { outerSnSelectedList: [], outerSnSelectAll: false, outerSnSelectIndeterminate: false, + outerSnPagination: { + pageNum: 1, + pageSize: 100, + total: 0 + }, + // --- 采购单弹窗 --- + purchaseOpen: false, + purchaseTitle: '', + currentPurchaseOrderData: null, + virtualPurchaseProductInfo: null, // 查询参数 queryParams: { pageNum: 1, @@ -550,6 +569,23 @@ export default { created() { this.getList(); }, + watch: { + purchaseOpen(val) { + if (!val) { + this.currentPurchaseOrderData = null; + this.virtualPurchaseProductInfo = null; + this.$refs.purchaseOrderDetail?.resetForm(); + } else { + this.$nextTick(() => { + if (this.virtualPurchaseProductInfo) { + this.$refs.purchaseOrderDetail?.initVirtualPurchase(this.virtualPurchaseProductInfo); + } else { + this.$refs.purchaseOrderDetail?.resetForm(); + } + }); + } + } + }, computed: { outerSnSelectedCount() { return this.outerSnSelectedList.length; @@ -559,7 +595,24 @@ export default { return Number.isNaN(quotaQuantity) ? 0 : quotaQuantity; }, stockingTotalCost() { - return (this.stockingDetailList || []).reduce((total, item) => total + (Number(item.sumCost) || 0), 0); + return (this.stockingDetailList || []).reduce((total, item) => { + const baseCost = Number(item.sumCost) || 0; + + let additionalCost = 0; + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); + const currentPhNum = this.stockingBindDraftMap[bindItem.purchaseId] !== undefined + ? Number(this.stockingBindDraftMap[bindItem.purchaseId]) + : (bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum)); + const price = Number(bindItem.price) || 0; + const diff = currentPhNum - originalPhNum; + additionalCost += diff * price; + }); + } + + return total + baseCost + additionalCost; + }, 0); }, filteredSnList() { let list = this.outerSnDetail.snList || []; @@ -570,7 +623,10 @@ export default { const keyword = this.outerSnSearchKeyword.toLowerCase(); list = list.filter(sn => (sn.productSn || '').toLowerCase().includes(keyword)); } - return list; + this.outerSnPagination.total = list.length; + const start = (this.outerSnPagination.pageNum - 1) * this.outerSnPagination.pageSize; + const end = start + this.outerSnPagination.pageSize; + return list.slice(start, end); } }, methods: { @@ -689,13 +745,22 @@ export default { this.stockingDetailLoading = true; productMatchList(row.orderCode).then(response => { const list = response.data || []; - return Promise.all(list.map(item => this.loadBindPageData(row.orderCode, { - ...item, - originalTotalPhNum: item.phNum, - bindList: [], - bindTotal: 0, - bindPageNum: 1, - bindPageSize: this.stockingBindPageSize + return Promise.all(list.map(item => this.loadAllBindData(row.orderCode, item).then(allBindList => { + const bindPageNum = 1; + const bindPageSize = this.stockingBindPageSize; + const startIndex = (bindPageNum - 1) * bindPageSize; + const endIndex = startIndex + bindPageSize; + const bindList = allBindList.slice(startIndex, endIndex); + + return { + ...item, + originalTotalPhNum: item.phNum, + allBindList: allBindList, + bindList: bindList, + bindTotal: allBindList.length, + bindPageNum: bindPageNum, + bindPageSize: bindPageSize + }; }))); }).then(list => { this.stockingDetailList = list; @@ -720,6 +785,7 @@ export default { row.phNum = validValue; this.$set(this.stockingBindDraftMap, row.purchaseId, validValue); + this.updateItemTotalPhNum(item); }, calculateMaxPhNum(row, item) { const originalPhNum = row.originalPhNum === '' || row.originalPhNum === null || row.originalPhNum === undefined ? 0 : Number(row.originalPhNum); @@ -728,58 +794,45 @@ export default { const maxPhysical = originalPhNum + originalKyNum; - let otherRowsPhNumSum = 0; - if (item && item.bindList) { - item.bindList.forEach(b => { - if (b.purchaseId !== row.purchaseId) { - const p = Number(b.phNum) || 0; - otherRowsPhNumSum += p; - } - }); - } + const currentTotalPhNum = this.calculateCurrentTotalPhNum(item); + const currentRowPhNum = this.stockingBindDraftMap[row.purchaseId] !== undefined + ? Number(this.stockingBindDraftMap[row.purchaseId]) + : (row.phNum === '' || row.phNum === null || row.phNum === undefined ? 0 : Number(row.phNum)); - const maxAllowedByOrder = orderNum - otherRowsPhNumSum; + const maxAllowedByOrder = orderNum - currentTotalPhNum + currentRowPhNum; return Math.min(maxPhysical, maxAllowedByOrder); }, - loadBindPageData(orderCode, item) { + loadAllBindData(orderCode, item) { return productMatchBindList(orderCode, item.productCode, { - pageNum: item.bindPageNum, - pageSize: item.bindPageSize, + pageNum: 1, + pageSize: 9999, orderByColumn: 't6.createTime', isAsc: 'desc' }).then(bindResponse => { - const bindList = (bindResponse.rows || []).map(bindItem => ({ + return (bindResponse.rows || []).map(bindItem => ({ ...bindItem, phNum: this.getDraftBindNum(bindItem.purchaseId, bindItem.phNum), originalPhNum: bindItem.originalPhNum !== undefined ? bindItem.originalPhNum : bindItem.phNum, originalKyNum: bindItem.originalKyNum !== undefined ? bindItem.originalKyNum : bindItem.kyNum })); - return { - ...item, - originalTotalPhNum: item.originalTotalPhNum !== undefined ? item.originalTotalPhNum : item.phNum, - bindList, - bindTotal: bindResponse.total || 0 - }; }).catch(() => { - return { - ...item, - bindList: [], - bindTotal: 0 - }; + return []; }); }, handleBindPageChange(item) { - this.stockingDetailLoading = true; - this.loadBindPageData(this.stockingDetailRow.orderCode, item).then(updatedItem => { - this.stockingDetailList = this.stockingDetailList.map(currentItem => { - if (currentItem.productCode === updatedItem.productCode) { - return updatedItem; - } - return currentItem; - }); - }).finally(() => { - this.stockingDetailLoading = false; + const startIndex = (item.bindPageNum - 1) * item.bindPageSize; + const endIndex = startIndex + item.bindPageSize; + const bindList = (item.allBindList || []).slice(startIndex, endIndex); + + this.stockingDetailList = this.stockingDetailList.map(currentItem => { + if (currentItem.productCode === item.productCode) { + return { + ...currentItem, + bindList: bindList + }; + } + return currentItem; }); }, handleBindNumChange(row, item) { @@ -797,24 +850,56 @@ export default { row.kyNum = originalKyNum - diff; this.$set(this.stockingBindDraftMap, row.purchaseId, nextValue); + + this.updateItemTotalPhNum(item); + }, + calculateCurrentTotalPhNum(item) { + if (!item || !item.productCode || !item.allBindList) return 0; + + let total = 0; + item.allBindList.forEach(bindItem => { + const purchaseId = bindItem.purchaseId; + if (this.stockingBindDraftMap && this.stockingBindDraftMap[purchaseId] !== undefined) { + total += Number(this.stockingBindDraftMap[purchaseId]); + } else { + const phNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); + total += phNum; + } + }); + + return total; + }, + findBindItemByPurchaseId(productCode, purchaseId) { + const product = this.stockingDetailList.find(item => item.productCode === productCode); + if (!product) return null; + + return product.allBindList?.find(b => String(b.purchaseId) === String(purchaseId)); + }, + updateItemTotalPhNum(item) { + if (item) { + this.$set(item, 'phNum', this.calculateCurrentTotalPhNum(item)); + } }, handleSaveStockingBind() { const changedList = []; this.stockingDetailList.forEach(item => { - (item.bindList || []).forEach(bindItem => { - this.handleBindNumChange(bindItem, item); - const currentPhNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); - const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); - if (currentPhNum !== originalPhNum) { - changedList.push({ - orderId: this.stockingDetailRow.id, - purchaseId: bindItem.purchaseId, - purchaseNo: bindItem.purchaseNo, - originalBindNum: originalPhNum, - bindNum: currentPhNum - }); - } - }); + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + const currentPhNum = this.stockingBindDraftMap[bindItem.purchaseId] !== undefined + ? Number(this.stockingBindDraftMap[bindItem.purchaseId]) + : (bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum)); + const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); + if (currentPhNum !== originalPhNum) { + changedList.push({ + orderId: this.stockingDetailRow.id, + purchaseId: bindItem.purchaseId, + purchaseNo: bindItem.purchaseNo, + originalBindNum: originalPhNum, + bindNum: currentPhNum + }); + } + }); + } }); if (!changedList.length) { this.$message.warning('暂无变更数据'); @@ -832,13 +917,33 @@ export default { }))).then(() => { this.$message.success('保存成功'); this.stockingDetailList.forEach(item => { - item.originalTotalPhNum = item.phNum; - (item.bindList || []).forEach(bindItem => { - bindItem.originalPhNum = bindItem.phNum; - bindItem.originalKyNum = bindItem.kyNum; - this.$delete(this.stockingBindDraftMap, bindItem.purchaseId); - }); + item.originalTotalPhNum = this.calculateCurrentTotalPhNum(item); + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + if (this.stockingBindDraftMap[bindItem.purchaseId] !== undefined) { + bindItem.phNum = this.stockingBindDraftMap[bindItem.purchaseId]; + bindItem.originalPhNum = bindItem.phNum; + const originalKyNum = bindItem.originalKyNum === '' || bindItem.originalKyNum === null || bindItem.originalKyNum === undefined ? 0 : Number(bindItem.originalKyNum); + const diff = bindItem.phNum - (bindItem.originalPhNum || 0); + bindItem.kyNum = originalKyNum - diff; + bindItem.originalKyNum = bindItem.kyNum; + } + }); + } + if (item.bindList) { + item.bindList.forEach(bindItem => { + if (this.stockingBindDraftMap[bindItem.purchaseId] !== undefined) { + bindItem.phNum = this.stockingBindDraftMap[bindItem.purchaseId]; + bindItem.originalPhNum = bindItem.phNum; + const originalKyNum = bindItem.originalKyNum === '' || bindItem.originalKyNum === null || bindItem.originalKyNum === undefined ? 0 : Number(bindItem.originalKyNum); + const diff = bindItem.phNum - (bindItem.originalPhNum || 0); + bindItem.kyNum = originalKyNum - diff; + bindItem.originalKyNum = bindItem.kyNum; + } + }); + } }); + this.stockingBindDraftMap = {}; this.stockingSaveConfirmVisible = false; this.stockingDetailVisible = false; this.stockingSaveChangedList = []; @@ -861,6 +966,7 @@ export default { this.outerSnSelectedList = []; this.outerSnSelectAll = false; this.outerSnSelectIndeterminate = false; + this.outerSnPagination = { pageNum: 1, pageSize: 100, total: 0 }; if (!row || !row.purchaseNo) { this.$message.warning('采购单号为空，无法查询SN码'); return; @@ -882,18 +988,8 @@ export default { const alreadyBoundSns = this.outerSnDetail.snList .filter(sn => sn.orderCode && sn.orderCode === this.stockingDetailRow.orderCode) .map(sn => sn.productSn); - const availableSns = this.outerSnDetail.snList - .filter(sn => !this.isSnDisabled(sn)) - .map(sn => sn.productSn); - let initialSelected = [...alreadyBoundSns]; - if (initialSelected.length < this.outerSnQuotaQuantity) { - const needCount = this.outerSnQuotaQuantity - initialSelected.length; - const remainingToSelect = availableSns.filter(sn => !initialSelected.includes(sn)).slice(0, needCount); - initialSelected = initialSelected.concat(remainingToSelect); - } - - this.outerSnSelectedList = initialSelected.slice(0, this.outerSnQuotaQuantity); + this.outerSnSelectedList = alreadyBoundSns; this.updateSelectAllState(); }).finally(() => { this.outerSnLoading = false; @@ -907,6 +1003,9 @@ export default { return this.outerSnSelectedList.includes(productSn); }, isSnDisabled(sn) { + if (sn.orderCode && sn.orderCode === (this.stockingDetailRow && this.stockingDetailRow.orderCode)) { + return false; + } return !!(sn.outerCode || (sn.orderCode && sn.orderCode !== (this.stockingDetailRow && this.stockingDetailRow.orderCode))); }, handleSnCardClick(sn) { @@ -934,36 +1033,6 @@ export default { } this.updateSelectAllState(); }, - handleOuterSnSelectAll(checked) { - const quotaQuantity = this.outerSnQuotaQuantity; - const availableSns = this.filteredSnList.filter(sn => !this.isSnDisabled(sn)).map(sn => sn.productSn); - if (checked) { - if (quotaQuantity <= 0) { - this.$message.warning('当前配额数量为0，不能选择SN码'); - this.outerSnSelectAll = false; - this.outerSnSelectIndeterminate = false; - return; - } - const normalizedSelectedList = this.outerSnSelectedList.slice(0, quotaQuantity); - const unselectedSns = availableSns.filter(sn => !normalizedSelectedList.includes(sn)); - const remainCount = quotaQuantity - normalizedSelectedList.length; - this.outerSnSelectedList = normalizedSelectedList.concat(unselectedSns.slice(0, Math.max(remainCount, 0))); - if (availableSns.length > this.outerSnSelectedList.filter(sn => availableSns.includes(sn)).length) { - this.$message.warning(`最多只能选择 ${quotaQuantity} 个SN码`); - } - } else { - this.outerSnSelectedList = this.outerSnSelectedList.filter(sn => !availableSns.includes(sn)).slice(0, quotaQuantity); - } - this.updateSelectAllState(); - }, - handleOuterSnClearSelected() { - const quotaQuantity = this.outerSnQuotaQuantity; - if (this.outerSnSelectedList.length > quotaQuantity) { - this.$message.warning(`已选SN码数量超过配额 ${quotaQuantity}，已清空选择`); - } - this.outerSnSelectedList = []; - this.updateSelectAllState(); - }, canSelectMoreSn(showMessage = true) { if (this.outerSnSelectedList.length < this.outerSnQuotaQuantity) { return true; @@ -984,72 +1053,6 @@ export default { this.outerSnSelectAll = selectedInCurrent === availableSns.length; this.outerSnSelectIndeterminate = selectedInCurrent > 0 && selectedInCurrent < availableSns.length; }, - handleConfirmSnSelection() { - if (this.outerSnSelectedList.length > this.outerSnQuotaQuantity) { - this.$message.warning(`最多只能选择 ${this.outerSnQuotaQuantity} 个SN码`); - return; - } - this.$confirm(`确认将选中的 ${this.outerSnSelectedList.length} 个SN码分配给当前订单？`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const loading = this.$loading({ - lock: true, - text: '正在处理中...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); - - // 收集所有变更的配额信息 - const changedList = []; - this.stockingDetailList.forEach(item => { - (item.bindList || []).forEach(bindItem => { - const currentPhNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); - const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); - if (currentPhNum !== originalPhNum) { - changedList.push({ - orderId: this.stockingDetailRow.id, - purchaseId: bindItem.purchaseId, - purchaseNo: bindItem.purchaseNo, - originalBindNum: originalPhNum, - bindNum: currentPhNum, - bindItem: bindItem - }); - } - }); - }); - - let saveQuotaPromise = Promise.resolve(); - if (changedList.length > 0) { - saveQuotaPromise = Promise.all(changedList.map(item => savePurchaseOrderMap({ - orderId: item.orderId, - purchaseId: item.purchaseId, - bindNum: item.bindNum - }))); - } - - saveQuotaPromise.then(() => { - return bindOrderSnCodes(this.stockingDetailRow.orderCode, this.outerSnProductRow.productCode, this.outerSnBindRow.purchaseNo, this.stockingDetailRow.id, this.outerSnBindRow.purchaseId, this.outerSnSelectedList); - }).then(response => { - loading.close(); - this.$message.success(`成功分配 ${this.outerSnSelectedList.length} 个SN码` + (changedList.length > 0 ? '，并同步保存了配额修改' : '')); - this.outerSnDialogVisible = false; - - if (changedList.length > 0) { - changedList.forEach(item => { - item.bindItem.originalPhNum = item.bindNum; - this.$delete(this.stockingBindDraftMap, item.purchaseId); - }); - } - - this.handleShowStockingDetail(this.stockingDetailRow); - this.getList(); - }).catch(() => { - loading.close(); - }); - }).catch(() => {}); - }, /** 格式化备货状态 */ formatOrderStockingStatus(value) { const statusMap = { @@ -1069,6 +1072,64 @@ export default { BHWC: 'stocking-status--green' }; return classMap[value] || 'stocking-status--yellow'; + }, + handleGenerateVirtualPurchase(item) { + this.currentPurchaseOrderData = null; + this.virtualPurchaseProductInfo = { + productCode: item.productCode, + model: item.model, + productType: item.productType, + vendorName: item.vendorName, + vendorCode: item.vendorCode, + orderNum: item.orderNum, + orderCode: this.stockingDetailRow.orderCode, + projectName: this.stockingDetailRow.projectName, + projectCode: this.stockingDetailRow.projectCode + }; + this.purchaseOpen = true; + this.purchaseTitle = `生成虚拟采购单 - ${item.model || item.productCode}`; + }, + submitPurchaseForm() { + this.$refs.purchaseOrderDetail.submitForm(); + }, + cancelPurchase() { + this.purchaseOpen = false; + }, + handleOuterSnPageChange() { + }, + handlePurchaseSuccess() { + this.purchaseOpen = false; + this.$message.success('采购单创建成功'); + this.getList(); + if (this.virtualPurchaseProductInfo && this.stockingDetailVisible) { + this.refreshCurrentProductBindList(this.virtualPurchaseProductInfo.productCode); + } + }, + refreshCurrentProductBindList(productCode) { + const targetItem = this.stockingDetailList.find(item => item.productCode === productCode); + if (!targetItem) { + return; + } + this.loadAllBindData(this.stockingDetailRow.orderCode, targetItem).then(allBindList => { + const bindPageNum = targetItem.bindPageNum || 1; + const bindPageSize = targetItem.bindPageSize || this.stockingBindPageSize; + const startIndex = (bindPageNum - 1) * bindPageSize; + const endIndex = startIndex + bindPageSize; + const bindList = allBindList.slice(startIndex, endIndex); + this.stockingDetailList = this.stockingDetailList.map(item => { + if (item.productCode === productCode) { + return { + ...item, + allBindList: allBindList, + bindList: bindList, + bindTotal: allBindList.length + }; + } + return item; + }); + }).catch(() => { + this.$message.error('刷新采购列表失败'); + }); } } }; @@ -1374,6 +1435,12 @@ export default { border-bottom: 1px solid #e4e7ed; } +.outer-sn-grid-header .pagination-container { + margin: 0; + padding: 0; + background: transparent; +} + .outer-sn-current-count { flex: 1; margin-left: 16px; diff --git a/oms_web/oms_vue/src/views/inventory/inner/index.vue b/oms_web/oms_vue/src/views/inventory/inner/index.vue index 8747ed68..6cd1d18b 100644 --- a/oms_web/oms_vue/src/views/inventory/inner/index.vue +++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue @@ -548,10 +548,10 @@ export default { this.$modal.msgWarning("请至少添加一条产品信息"); return; } - if (this.form.quantity!==this.form.inventoryInfoList.length && !this.isServiceIn){ - this.$modal.msgWarning("采购数量与入库数量不一致"); - return; - } + // if (this.form.quantity!==this.form.inventoryInfoList.length && !this.isServiceIn){ + // this.$modal.msgWarning("采购数量与入库数量不一致"); + // return; + // } if (this.form.id != null) { updateInner(this.form).then(response => { this.$modal.msgSuccess("修改成功"); diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue index a1f54058..183ccadb 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue @@ -227,12 +227,11 @@ export default { }); }, handleSelectPurchaseBeforeImport() { - if (((this.productData.orderType || '1') === '1' ) && !this.outerData.vendorName.startsWith('新华三') ) { + // if (((this.productData.orderType || '1') === '1' ) && !this.outerData.vendorName.startsWith('新华三') ) { this.purchaseOrderSelectVisible = true; - }else{ - this.handleImport() - } - + // }else{ + // this.handleImport() + // } }, handlePurchaseOrderSelect(order) { this.warehouseId = order.warehouseId; @@ -304,6 +303,7 @@ export default { outerCode: this.outerData.outerCode, detailId: this.productData.id, productSnDataList: this.isImported ? this.snList : [], + orderCode: this.queryParams.orderCode, }; addDelivery(data).then(() => { diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue index dc238982..d348a38c 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue @@ -205,6 +205,7 @@ import SelectProduct from "@/views/system/product/selectProduct"; import FileUpload from "@/components/FileUpload"; import { getDicts } from "@/api/system/dict/data"; import TaxRateInput from "@/components/TaxRateInput/TaxInput.vue"; +import { listProduct } from "@/api/project/product"; import request from '@/utils/request' @@ -260,6 +261,7 @@ export default { approveStatus: 0, approveNode: null, confirmStatus: null, + isVirtual: false, omsPurchaseOrderItemList: [ { productType: null, @@ -488,6 +490,65 @@ export default { } }); }, + initVirtualPurchase(item) { + this.resetForm(); + this.form.isVirtual = true; + + const applyDefaults = () => { + if (item.vendorCode && this.vendorOptions.length > 0) { + const vendor = this.vendorOptions.find(v => v.vendorCode === item.vendorCode); + if (vendor) { + this.form.vendorId = vendor.vendorId; + this.$nextTick(() => { + this.handleVendorChange(vendor.vendorId); + }); + } + } + + if (item.productType && this.form.omsPurchaseOrderItemList.length > 0) { + this.$set(this.form.omsPurchaseOrderItemList[0], 'productType', item.productType); + + if (item.productCode && item.vendorCode) { + listProduct({ + productCode: item.productCode, + vendorCode: item.vendorCode, + type: item.productType, + pageNum: 1, + pageSize: 1 + }).then(response => { + if (response.rows && response.rows.length > 0) { + const product = response.rows[0]; + const firstItem = this.form.omsPurchaseOrderItemList[0]; + this.$set(firstItem, 'productCode', product.productCode); + this.$set(firstItem, 'productModel', product.model); + this.$set(firstItem, 'productDescription', product.description); + this.$set(firstItem, 'quantity', item.orderNum || 1); + this.calculateRowTotal(firstItem); + } + }).catch(() => { + }); + } + } + + if (item.projectCode && item.projectName) { + this.form.remark = `${item.projectCode} ${item.projectName}`; + } + }; + + const vendorReady = this.vendorOptions.length > 0 + ? Promise.resolve() + : this.getVendorList(); + + const productTypeReady = this.productTypeOptions.length > 0 + ? Promise.resolve() + : getDicts('product_type').then(response => { + this.productTypeOptions = response.data; + }); + + Promise.all([vendorReady, productTypeReady]).then(() => { + this.$nextTick(applyDefaults); + }); + }, resetForm() { this.form = { id: null, @@ -511,6 +572,7 @@ export default { approveStatus: 0, approveNode: null, confirmStatus: null, + isVirtual: false, omsPurchaseOrderItemList: [ { productType: null, diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue index 831f3e88..a7373986 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderSelectDialog.vue @@ -155,10 +155,10 @@ export default { this.handleQuery(); }, handleSelect(row) { - if (this.quantity && this.quantity!==row.quantity){ - this.$message.error("请选择数量为"+this.quantity+"的采购单"); - return - } + // if (this.quantity && this.quantity!==row.quantity){ + // this.$message.error("请选择数量为"+this.quantity+"的采购单"); + // return + // } this.$emit("select", row); this.handleClose(); }, diff --git a/oms_web/oms_vue/src/views/purchaseorder/index.vue b/oms_web/oms_vue/src/views/purchaseorder/index.vue index 3f9e3767..8301d70c 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/index.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/index.vue @@ -189,7 +189,7 @@ >修改 productSnList, @Param("orderCode") String orderCode); int countByOrderCodeAndPurchaseNo(@Param("orderCode") String orderCode, @Param("purchaseNo") String purchaseNo); + + void clearOrderCodeByIds(@Param("idList") List idList); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java index 60755fae..07d659b6 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java @@ -101,5 +101,7 @@ public interface IOmsPurchaseOrderService OmsPurchaseOrder selectOmsPurchaseOrderByNo(String purchaseNo); + List listByItemId(Long itemId); + AddToNexRes addToNex(AddToNexReq addToNexReq); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java index 40739d3b..359416b2 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java @@ -122,4 +122,6 @@ public interface IProjectOrderInfoService int bindOrderSnCodes(BindOrderSnCodesDto params); + void refreshOrderStockingStatus(String orderCode); + } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java index 6f80fd2d..cd5315a6 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java @@ -67,6 +67,8 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { private IProjectOrderInfoRecallService projectOrderInfoRecallService; @Autowired private OmsPurchaseOrderMapMapper omsPurchaseOrderMapMapper; + @Autowired + private IInventoryOuterDetailService inventoryOuterDetailService; @Override public ExecutionOrderVo selectInfo(Long id) { ExecutionOrderVo vo = new ExecutionOrderVo(); @@ -310,6 +312,10 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode()); List inventoryOuters = outerService.selectInventoryOuterList(inventoryOuter); if (CollUtil.isNotEmpty(inventoryOuters)) { + List outerCodeList = inventoryOuters.stream() + .map(InventoryOuter::getOuterCode) + .collect(Collectors.toList()); + inventoryOuterDetailService.deleteByOuterCode(outerCodeList); outerService.deleteInventoryOuterByIds(inventoryOuters.stream().map(item -> item.getId().toString()).collect(Collectors.joining(","))); } Map outerSumMap = inventoryOuters.stream().collect(Collectors.toMap(InventoryOuter::getProductCode, InventoryOuter::getQuantity, Long::sum)); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java index 12720c41..7e6777d4 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java @@ -14,8 +14,10 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.sip.domain.*; import com.ruoyi.sip.dto.ApiDataQueryDto; import com.ruoyi.sip.dto.inventory.InventoryDeliveryDetailExcelDto; +import com.ruoyi.sip.mapper.InventoryInfoMapper; import com.ruoyi.sip.mapper.InventoryOuterDetailMapper; import com.ruoyi.sip.mapper.InventoryOuterMapper; +import com.ruoyi.sip.mapper.OmsPurchaseOrderMapMapper; import com.ruoyi.sip.service.*; import com.ruoyi.sip.vo.DeliveryApproveVo; import com.ruoyi.sip.vo.DeliveryInfoVo; @@ -69,6 +71,12 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { private IOmsPayableBillService payableBillService; @Autowired private IOmsReceivableBillService billService; + @Autowired + private IOmsPurchaseOrderService omsPurchaseOrderService; + @Resource + private OmsPurchaseOrderMapMapper omsPurchaseOrderMapMapper; + @Resource + private InventoryInfoMapper inventoryInfoMapper; @Value("${oms.inventory.innerTax:0.13}") private String defaultTax; @@ -104,6 +112,81 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { @Override public int insertInventoryDelivery(InventoryDelivery inventoryDelivery) { + List productSnList = inventoryDelivery.getProductSnList(); + List productSnDataList = inventoryDelivery.getProductSnDataList(); + if (CollUtil.isEmpty(productSnList) && CollUtil.isEmpty(productSnDataList)) { + throw new ServiceException("发货清单为空,保存失败"); + } + + if (StringUtils.isNotEmpty(inventoryDelivery.getOrderCode())) { + ProjectOrderInfo orderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(inventoryDelivery.getOrderCode()); + if (orderInfo == null) { + throw new ServiceException("订单信息不存在"); + } + + if (StringUtils.isNotEmpty(inventoryDelivery.getPurchaseNo())) { + int newSnCount = CollUtil.isEmpty(productSnList) ? productSnDataList.size() : productSnList.size(); + OmsPurchaseOrder purchaseOrder = omsPurchaseOrderService.selectOmsPurchaseOrderByNo(inventoryDelivery.getPurchaseNo()); + if (purchaseOrder == null) { + throw new ServiceException("采购单信息不存在"); + } + OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId()); + if (purchaseOrderMap == null || purchaseOrderMap.getBindNum() == null || purchaseOrderMap.getBindNum() <= 0) { + throw new ServiceException("当前订单与采购单未建立绑定关系或绑定数量为0"); + } + int totalBindNum = purchaseOrderMap.getBindNum(); + int alreadyBindNum = inventoryInfoMapper.countByOrderCodeAndPurchaseNo(inventoryDelivery.getOrderCode(), inventoryDelivery.getPurchaseNo()); + int remainingNum = totalBindNum - alreadyBindNum; + if (newSnCount > remainingNum) { + throw new ServiceException(String.format("新增SN码数量(%d)超过剩余可新增数量(%d)，总绑定数(%d)，已绑定数(%d)", newSnCount, remainingNum, totalBindNum, alreadyBindNum)); + } + } else if (CollUtil.isNotEmpty(productSnList)) { + List inventoryInfoList = inventoryInfoMapper.listByProductSnList(productSnList); + if (CollUtil.isEmpty(inventoryInfoList)) { + throw new ServiceException("未找到SN码对应的库存信息"); + } + Map> innerCodeMap = inventoryInfoList.stream() + .filter(info -> StringUtils.isNotEmpty(info.getInnerCode())) + .collect(Collectors.groupingBy(InventoryInfo::getInnerCode)); + + Map purchaseNoCountMap = new HashMap<>(); + for (Map.Entry> entry : innerCodeMap.entrySet()) { + String innerCode = entry.getKey(); + OmsInventoryInner queryInner = new OmsInventoryInner(); + queryInner.setInnerCode(innerCode); + List innerList = omsInventoryInnerService.selectOmsInventoryInnerList(queryInner); + if (CollUtil.isNotEmpty(innerList) && StringUtils.isNotEmpty(innerList.get(0).getPurchaseNo())) { + String purchaseNo = innerList.get(0).getPurchaseNo(); + purchaseNoCountMap.put(purchaseNo, purchaseNoCountMap.getOrDefault(purchaseNo, 0L) + entry.getValue().size()); + } + } + + for (Map.Entry entry : purchaseNoCountMap.entrySet()) { + String purchaseNo = entry.getKey(); + long newSnCount = entry.getValue(); + + OmsPurchaseOrder purchaseOrder = omsPurchaseOrderService.selectOmsPurchaseOrderByNo(purchaseNo); + if (purchaseOrder == null) { + throw new ServiceException(String.format("采购单[%s]信息不存在", purchaseNo)); + } + + OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId()); + if (purchaseOrderMap == null || purchaseOrderMap.getBindNum() == null || purchaseOrderMap.getBindNum() <= 0) { + throw new ServiceException(String.format("订单与采购单[%s]未建立绑定关系或绑定数量为0", purchaseNo)); + } + + int totalBindNum = purchaseOrderMap.getBindNum(); + int alreadyBindNum = inventoryInfoMapper.countByOrderCodeAndPurchaseNo(inventoryDelivery.getOrderCode(), purchaseNo); + int remainingNum = totalBindNum - alreadyBindNum; + + if (newSnCount > remainingNum) { + throw new ServiceException(String.format("采购单[%s]新增SN码数量(%d)超过剩余可新增数量(%d)，总绑定数(%d)，已绑定数(%d)", + purchaseNo, newSnCount, remainingNum, totalBindNum, alreadyBindNum)); + } + } + } + } + Date nowDate = DateUtils.getNowDate(); inventoryDelivery.setCreateTime(nowDate); String currentUserId = ShiroUtils.getUserId().toString(); @@ -112,12 +195,6 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { inventoryDelivery.setUpdateBy(currentUserId); inventoryDelivery.setUpdateTime(nowDate); inventoryDelivery.setDeliveryStatus(InventoryDelivery.DeliveryStatusEnum.WAIT_DELIVERY.getCode()); - //处理库存 - List productSnList = inventoryDelivery.getProductSnList(); - List productSnDataList = inventoryDelivery.getProductSnDataList(); - if (CollUtil.isEmpty(productSnList) && CollUtil.isEmpty(productSnDataList)) { - throw new ServiceException("发货清单为空,保存失败"); - } //修改数据的时候同步修改出库价 BigDecimal bigDecimal = inventoryOuterMapper.selectOutPriceByCode(inventoryDelivery.getOuterCode()); @@ -131,6 +208,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { info.setUpdateBy(currentUserId); info.setUpdateTime(nowDate); info.setOuterPrice(bigDecimal); + info.setOrderCode(inventoryDelivery.getOrderCode()); OmsInventoryDeliveryDetail detail = new OmsInventoryDeliveryDetail(); detail.setProductSn(item); detailList.add(detail); @@ -149,6 +227,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { inventoryInfo.setUpdateBy(currentUserId); inventoryInfo.setUpdateTime(nowDate); inventoryInfo.setOuterPrice(bigDecimal); + inventoryInfo.setOrderCode(inventoryDelivery.getOrderCode()); OmsInventoryDeliveryDetail detail = new OmsInventoryDeliveryDetail(); detail.setProductSn(inventoryInfo.getProductSn()); detailList.add(detail); @@ -168,6 +247,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { } deliveryDetailService.saveBatch(detailList); } + projectOrderInfoService.refreshOrderStockingStatus(inventoryDelivery.getOrderCode()); return i; } @@ -417,7 +497,12 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { if (realDelete) { // 原逻辑，删除库存表以及sn码的关联 deliveryDetailService.deleteOmsInventoryDeliveryDetailByDeliveryId(id); - return inventoryDeliveryMapper.deleteInventoryDeliveryById(id); + if (CollUtil.isNotEmpty(inventoryInfos)) { + inventoryInfoMapper.clearOrderCodeByIds(inventoryInfos.stream().map(InventoryInfo::getId).collect(Collectors.toList())); + } + int result = inventoryDeliveryMapper.deleteInventoryDeliveryById(id); + projectOrderInfoService.refreshOrderStockingStatus(inventoryDelivery.getOrderCode()); + return result; } else { // 2026-03-19：新逻辑，仅修改发货单状态为撤回，不删除库存表 InventoryDelivery updateDelivery = new InventoryDelivery(); @@ -425,6 +510,10 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { updateDelivery.setDeliveryStatus(InventoryDelivery.DeliveryStatusEnum.RECALL_DELIVERY.getCode()); updateDelivery.setUpdateTime(DateUtils.getNowDate()); int rows = inventoryDeliveryMapper.updateInventoryDelivery(updateDelivery); + if (CollUtil.isNotEmpty(inventoryInfos)) { + inventoryInfoMapper.clearOrderCodeByIds(inventoryInfos.stream().map(InventoryInfo::getId).collect(Collectors.toList())); + } + projectOrderInfoService.refreshOrderStockingStatus(inventoryDelivery.getOrderCode()); return rows; } } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java index 8273744f..e75cce3b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java @@ -144,6 +144,36 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService { } omsInventoryInner.setWarehouseId(warehouseIdList.get(0)); + if (omsInventoryInner.getItemId() != null) { + List purchaseOrderItems = purchaseOrderService.listByItemId(omsInventoryInner.getItemId()); + if (CollUtil.isNotEmpty(purchaseOrderItems)) { + OmsPurchaseOrderItem purchaseOrderItem = purchaseOrderItems.stream() + .filter(item -> item.getId().equals(omsInventoryInner.getItemId())) + .findFirst() + .orElse(null); + + if (purchaseOrderItem != null) { + int purchaseQuantity = purchaseOrderItem.getQuantity() != null ? purchaseOrderItem.getQuantity().intValue() : 0; + int alreadyInnerQuantity = purchaseOrderItem.getInnerQuantity() != null ? purchaseOrderItem.getInnerQuantity().intValue() : 0; + int remainingQuantity = purchaseQuantity - alreadyInnerQuantity; + + int currentInnerQuantity = omsInventoryInner.getQuantity() != null ? omsInventoryInner.getQuantity().intValue() : inventoryInfoList.size(); + if (currentInnerQuantity > remainingQuantity) { + throw new ServiceException(StrUtil.format("入库数量[{}]超过采购单剩余可入库数量[{}]", currentInnerQuantity, remainingQuantity)); + } + + BigDecimal purchasePrice = purchaseOrderItem.getPrice(); + if (purchasePrice != null) { + for (InventoryInfo inventoryInfo : inventoryInfoList) { + if (inventoryInfo.getInnerPrice() != null && inventoryInfo.getInnerPrice().compareTo(purchasePrice) != 0) { + throw new ServiceException(StrUtil.format("入库价[{}]必须等于采购单单价[{}]", inventoryInfo.getInnerPrice(), purchasePrice)); + } + } + } + } + } + } + OmsPayableBill payableBill = new OmsPayableBill(); VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorCode(vendorCode); if ((vendorInfo != null && VendorInfo.PayTypeEnum.INNER_PAY.getCode().equals(vendorInfo.getPayType())) || !Arrays.asList("1", "2").contains(omsInventoryInner.getProductType())) { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java index daa12e6f..724cff5b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -160,7 +160,13 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName()); } omsPurchaseOrder.setCreateTime(DateUtils.getNowDate()); - omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId())); + String purchaseNo = generatePurchaseNo(omsPurchaseOrder.getVendorId(), Boolean.TRUE.equals(omsPurchaseOrder.getIsVirtual())); + if (Boolean.TRUE.equals(omsPurchaseOrder.getIsVirtual())) { + omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_COMPLETE.getCode()); + omsPurchaseOrder.setConfirmStatus(OmsPurchaseOrder.ConfirmStatusEnum.CONFIRM.getCode()); + omsPurchaseOrder.setFlowType(OmsPurchaseOrder.FlowTypeEnum.ONLINE.getCode()); + } + omsPurchaseOrder.setPurchaseNo(purchaseNo); // 设置初始版本号为 1 omsPurchaseOrder.setVersion(1); int rows = omsPurchaseOrderMapper.insertOmsPurchaseOrder(omsPurchaseOrder); @@ -172,10 +178,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To * 生成订单编号 * * @param vendorId 制造商ID + * @param isVirtual 是否为虚拟采购单 * @return 订单编号 */ - private String generatePurchaseNo(Long vendorId) { + private String generatePurchaseNo(Long vendorId, boolean isVirtual) { VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorId(vendorId); if (vendorInfo==null || StringUtils.isEmpty(vendorInfo.getProvince())) { throw new ServiceException("制造商所属省为空,无法生成订单编号"); @@ -191,6 +198,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To } String shortCode = cnareas.get(0).getShortCode(); StringBuilder result = new StringBuilder(); + if (isVirtual) { + result.append("XN-"); + } result.append("ZGCV-").append(currentDate).append(shortCode); // 查询当天已有的订单数量，用于生成顺序编码 int count = omsPurchaseOrderMapper.selectMaxOrderCode(result.toString()); @@ -222,6 +232,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To omsPurchaseOrder.setUpdateTime(DateUtils.getNowDate()); // 版本号 +1 omsPurchaseOrder.setVersion(oldOrder.getVersion() + 1); + if (Boolean.TRUE.equals(omsPurchaseOrder.getIsVirtual())) { + omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_COMPLETE.getCode()); + omsPurchaseOrder.setConfirmStatus(OmsPurchaseOrder.ConfirmStatusEnum.CONFIRM.getCode()); + omsPurchaseOrder.setFlowType(OmsPurchaseOrder.FlowTypeEnum.ONLINE.getCode()); + } omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseId(omsPurchaseOrder.getId()); insertOmsPurchaseOrderItem(omsPurchaseOrder); return omsPurchaseOrderMapper.updateOmsPurchaseOrder(omsPurchaseOrder); @@ -419,6 +434,11 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To return omsPurchaseOrder; } + @Override + public List listByItemId(Long itemId) { + return omsPurchaseOrderMapper.listByItemId(itemId); + } + /** * 新增采购单明细表信息 @@ -497,17 +517,27 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To if (omsPurchaseOrder == null) { throw new ServiceException("采购订单不存在"); } - // 只有审批状态为“已通过”(2) 且 供应商确认状态为空或 null 时才能撤回 - if (ApproveStatusEnum.APPROVE_COMPLETE.getCode().equals(omsPurchaseOrder.getApproveStatus()) && - (StringUtils.isEmpty(omsPurchaseOrder.getConfirmStatus()) || "".equals(omsPurchaseOrder.getConfirmStatus())|| OmsPurchaseOrder.ConfirmStatusEnum.REJECT.getCode().equals(omsPurchaseOrder.getConfirmStatus()))) { + // 只有审批状态为"已通过"(2) 时才能撤回，虚拟采购单不校验供应商确认状态 + boolean isVirtual = Boolean.TRUE.equals(omsPurchaseOrder.getIsVirtual()); + boolean canRecall = false; + if (ApproveStatusEnum.APPROVE_COMPLETE.getCode().equals(omsPurchaseOrder.getApproveStatus())) { + if (isVirtual) { + canRecall = true; + } else { + canRecall = StringUtils.isEmpty(omsPurchaseOrder.getConfirmStatus()) || + "".equals(omsPurchaseOrder.getConfirmStatus()) || + OmsPurchaseOrder.ConfirmStatusEnum.REJECT.getCode().equals(omsPurchaseOrder.getConfirmStatus()); + } + } + if (canRecall) { // 保存历史记录 saveOrderHistory(omsPurchaseOrder); - omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 设置为待审批（草稿） - omsPurchaseOrder.setApproveTime(null); // 清空审批时间 - omsPurchaseOrder.setConfirmStatus(null); // 清空审批时间 + omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); + omsPurchaseOrder.setApproveTime(null); + omsPurchaseOrder.setConfirmStatus(null); omsPurchaseOrder.setUpdateTime(DateUtils.getNowDate()); - omsPurchaseOrder.setVersion(omsPurchaseOrder.getVersion() + 1); // 版本号 +1 + omsPurchaseOrder.setVersion(omsPurchaseOrder.getVersion() + 1); return omsPurchaseOrderMapper.recallPurchaseOrder(omsPurchaseOrder); } else { throw new ServiceException("当前订单状态不允许撤回"); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index e8ce6fa3..278130ef 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -2879,17 +2879,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To @Override public List selectProductMatchList(String orderCode) { - List orderProductMatchDtos = projectOrderInfoMapper.selectProductMatchList(orderCode); - List orderProductMatchBindDtos = projectOrderInfoMapper.selectProductMatchBindList(orderCode, null); - Map kyNumMap = orderProductMatchBindDtos.stream().filter( - item -> !item.getStatus().equals("0")) - .collect(Collectors.toMap(OrderProductMatchBindDto::getProductCode, item -> item.getKyNum() != null ? item.getKyNum() : 0, Integer::sum)); - - for (OrderProductMatchDto orderProductMatchDto : orderProductMatchDtos) { - orderProductMatchDto.setPhNum(orderProductMatchDto.getPhNum()+ - (kyNumMap.get(orderProductMatchDto.getProductCode())==null?0:kyNumMap.get(orderProductMatchDto.getProductCode()))); - } - return orderProductMatchDtos; + return projectOrderInfoMapper.selectProductMatchList(orderCode); } @Override @@ -2944,21 +2934,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To if (CollUtil.isNotEmpty(params.getProductSnList())) { result = inventoryInfoMapper.updateOrderCodeByProductSnList(params.getProductSnList(), params.getOrderCode()); } - //根据实际绑定的sn码修改订单与采购单的绑定数 - if (params.getOrderId() != null && params.getPurchaseId() != null && StringUtils.isNotEmpty(params.getPurchaseNo())) { - int actualBindNum = inventoryInfoMapper.countByOrderCodeAndPurchaseNo(params.getOrderCode(), params.getPurchaseNo()); - OmsPurchaseOrderMap map = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(params.getOrderId(), params.getPurchaseId()); - if (map == null) { - map = new OmsPurchaseOrderMap(); - map.setOrderId(params.getOrderId()); - map.setPurchaseId(params.getPurchaseId()); - map.setBindNum(actualBindNum); - omsPurchaseOrderMapMapper.insertOmsPurchaseOrderMap(map); - } else { - map.setBindNum(actualBindNum); - omsPurchaseOrderMapMapper.updateOmsPurchaseOrderMap(map); - } - } //更新订单的备货状态 this.refreshOrderStockingStatus(params.getOrderCode()); return result; @@ -2969,7 +2944,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To * * @param orderCode */ - private void refreshOrderStockingStatus(String orderCode) { + @Override + public void refreshOrderStockingStatus(String orderCode) { if (StringUtils.isEmpty(orderCode)) { return; } diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml index aaed3aee..38fd460e 100644 --- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml @@ -32,7 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update oms_inventory_info + set order_code = null, + update_time = now() + where id in + + #{id} + + + delete from oms_inventory_info where id = #{id} diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderHistoryMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderHistoryMapper.xml index 5cf32ad8..1ff0e937 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderHistoryMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderHistoryMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" approve_time, approve_node, confirm_status, + is_virtual, del_flag, version, create_by, @@ -103,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{approveTime}, #{approveNode}, #{confirmStatus}, + #{isVirtual}, #{delFlag}, #{version}, #{createBy}, diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml index 08cd74c2..e05f7064 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.purchase_no, t1.buyer_name, t1.buyer_address, t1.vendor_id, t1.currency, t1.purchaser_id, t1.purchaser_name , t1.purchaser_mobile, t1.purchaser_email, t1.warehouse_id, t1.pay_method, t1.owner_id, t1.owner_name, t1.remark, t1.total_amount - , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version,t1.flow_type + , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.is_virtual, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version,t1.flow_type , t1.file_id from oms_purchase_order t1 @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.purchase_no, t1.buyer_name, t1.buyer_address, t1.vendor_id, t1.currency, t1.purchaser_id, t1.purchaser_name , t1.purchaser_mobile, t1.purchaser_email, t1.warehouse_id, t1.pay_method, t1.owner_id, t1.owner_name, t1.remark, t1.total_amount,t1.flow_type - , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version + , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.is_virtual, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version , t1.file_id ,t2.vendor_address,t2.vendor_name,t2.vendor_user,t2.vendor_code,t2.vendor_phone,t2.vendor_email,t3.warehouse_name,t1.remark, (select max(tax_rate) from oms_purchase_order_item as it where it.purchase_id = t1.id) as tax_rate @@ -301,6 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" approve_time, approve_node, confirm_status, + is_virtual, purchase_date, create_time, update_time, @@ -330,6 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{approveTime}, #{approveNode}, #{confirmStatus}, + #{isVirtual}, #{purchaseDate}, #{createTime}, #{updateTime}, @@ -363,6 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" approve_time = #{approveTime}, approve_node = #{approveNode}, confirm_status = #{confirmStatus}, + is_virtual = #{isVirtual}, purchase_date = #{purchaseDate}, create_time = #{createTime}, update_time = #{updateTime}, diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index b246fe66..db2f9b5c 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -931,25 +931,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t3.product_code as product_code, t3.model, + t3.type as product_type, + t7.vendor_code, + t7.vendor_name, t1.quantity as order_num, sum(ifnull(t5.bind_num, 0)) as ph_num, - ifnull(t6.bh_num,0) as bh_num,ifnull(t6.sum_cost,0) as sum_cost + ifnull(t6.bh_num,0) as bh_num, + sum(ifnull(t5.bind_num, 0) * t4.price) as sum_cost from project_product_info as t1 - inner join project_order_info as t2 - on t1.project_id = t2.project_id - inner join product_info as t3 - on t1.product_bom_code = t3.product_code - left join oms_purchase_order_item as t4 - on t3.product_code = t4.product_code - left join oms_purchase_order_map as t5 - on t2.id = t5.order_id and t4.purchase_id = t5.purchase_id - left join (select count(1) bh_num, sum(inner_price) sum_cost, product_code - from oms_inventory_info - where order_code = #{orderCode} - group by product_code) t6 on t3.product_code = t6.product_code + inner join project_order_info as t2 on t1.project_id = t2.project_id + inner join product_info as t3 on t1.product_bom_code = t3.product_code + left join oms_purchase_order_item as t4 on t3.product_code = t4.product_code + left join oms_purchase_order_map as t5 on t2.id = t5.order_id and t4.purchase_id = t5.purchase_id + left join ( + select count(1) bh_num, product_code + from oms_inventory_info + where order_code = #{orderCode} + group by product_code + ) t6 on t3.product_code = t6.product_code + left join oms_vendor_info as t7 on t3.vendor_code = t7.vendor_code where t2.order_code = #{orderCode} and t3.type in (1, 2) - group by t3.product_code, t3.model, t1.quantity + group by t3.product_code, t3.model + order by t3.type, t3.product_code