From 37dc2136052186b93b54f1f2c6f4a0813ba04619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 13 Apr 2026 16:23:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E6=9D=A1=E7=BA=BF=E7=BB=9F=E8=AE=A1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B9=B6=E6=89=A9=E5=B1=95=E5=90=88=E5=90=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加分条线专用的统计组件SplitSummary，用于展示分条处理的产出与消耗对比数据 在多个报表模板中集成该组件并添加钢卷高亮功能 扩展CrmOrder相关类的合同信息字段 --- .../java/com/klp/crm/domain/CrmOrder.java | 105 +++++++++++++++ .../com/klp/crm/domain/bo/CrmOrderBo.java | 105 +++++++++++++++ .../com/klp/crm/domain/vo/CrmOrderVo.java | 126 ++++++++++++++++++ klp-ui/src/views/micro/zinc/index.vue | 5 + .../components/summary/splitSummary.vue | 53 ++++++++ klp-ui/src/views/wms/report/js/calc.js | 67 ++++++++++ .../wms/report/template/comprehensive.vue | 32 ++++- klp-ui/src/views/wms/report/template/day.vue | 5 + .../src/views/wms/report/template/month.vue | 32 ++++- klp-ui/src/views/wms/report/template/team.vue | 32 ++++- klp-ui/src/views/wms/report/template/year.vue | 36 ++++- 11 files changed, 582 insertions(+), 16 deletions(-) create mode 100644 klp-ui/src/views/micro/zinc/index.vue create mode 100644 klp-ui/src/views/wms/report/components/summary/splitSummary.vue diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java index aab3c578..c9484cee 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java @@ -85,6 +85,111 @@ public class CrmOrder extends BaseEntity { */ private String contractCode; + /** + * 合同名称 + */ + private String contractName; + + /** + * 供方 + */ + private String supplier; + + /** + * 需方 + */ + private String customer; + + /** + * 签订时间 + */ + private Date signTime; + + /** + * 签订地点 + */ + private String signLocation; + + /** + * 产品内容 + */ + private String productContent; + + /** + * 合同内容 + */ + private String contractContent; + + /** + * 供方地址 + */ + private String supplierAddress; + + /** + * 供方电话 + */ + private String supplierPhone; + + /** + * 供方开户行 + */ + private String supplierBank; + + /** + * 供方账号 + */ + private String supplierAccount; + + /** + * 供方税号 + */ + private String supplierTaxNo; + + /** + * 需方地址 + */ + private String customerAddress; + + /** + * 需方电话 + */ + private String customerPhone; + + /** + * 需方开户行 + */ + private String customerBank; + + /** + * 需方账号 + */ + private String customerAccount; + + /** + * 需方税号 + */ + private String customerTaxNo; + + /** + * 技术附件 + */ + private String techAnnex; + + /** + * 商务附件 + */ + private String businessAnnex; + + /** + * 排产函 + */ + private String productionSchedule; + + /** + * 合同状态 0=草稿 1=生效 2=作废 3=已完成 + */ + private Long status; + /** * 关联合同ID（wms_contract.contract_id） */ diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java index 98311cc9..36ef9668 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java @@ -95,6 +95,111 @@ public class CrmOrderBo extends BaseEntity { */ private String contractCode; + /** + * 合同名称 + */ + private String contractName; + + /** + * 供方 + */ + private String supplier; + + /** + * 需方 + */ + private String customer; + + /** + * 签订时间 + */ + private Date signTime; + + /** + * 签订地点 + */ + private String signLocation; + + /** + * 产品内容 + */ + private String productContent; + + /** + * 合同内容 + */ + private String contractContent; + + /** + * 供方地址 + */ + private String supplierAddress; + + /** + * 供方电话 + */ + private String supplierPhone; + + /** + * 供方开户行 + */ + private String supplierBank; + + /** + * 供方账号 + */ + private String supplierAccount; + + /** + * 供方税号 + */ + private String supplierTaxNo; + + /** + * 需方地址 + */ + private String customerAddress; + + /** + * 需方电话 + */ + private String customerPhone; + + /** + * 需方开户行 + */ + private String customerBank; + + /** + * 需方账号 + */ + private String customerAccount; + + /** + * 需方税号 + */ + private String customerTaxNo; + + /** + * 技术附件 + */ + private String techAnnex; + + /** + * 商务附件 + */ + private String businessAnnex; + + /** + * 排产函 + */ + private String productionSchedule; + + /** + * 合同状态 0=草稿 1=生效 2=作废 3=已完成 + */ + private Long status; + /** * 关联合同ID（wms_contract.contract_id） */ diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java index 6904667e..3502e00b 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java @@ -114,6 +114,132 @@ public class CrmOrderVo extends BaseEntity { @ExcelProperty(value = "合同号") private String contractCode; + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 供方 + */ + @ExcelProperty(value = "供方") + private String supplier; + + /** + * 需方 + */ + @ExcelProperty(value = "需方") + private String customer; + + /** + * 签订时间 + */ + @ExcelProperty(value = "签订时间") + private Date signTime; + + /** + * 签订地点 + */ + @ExcelProperty(value = "签订地点") + private String signLocation; + + /** + * 产品内容 + */ + @ExcelProperty(value = "产品内容") + private String productContent; + + /** + * 合同内容 + */ + @ExcelProperty(value = "合同内容") + private String contractContent; + + /** + * 供方地址 + */ + @ExcelProperty(value = "供方地址") + private String supplierAddress; + + /** + * 供方电话 + */ + @ExcelProperty(value = "供方电话") + private String supplierPhone; + + /** + * 供方开户行 + */ + @ExcelProperty(value = "供方开户行") + private String supplierBank; + + /** + * 供方账号 + */ + @ExcelProperty(value = "供方账号") + private String supplierAccount; + + /** + * 供方税号 + */ + @ExcelProperty(value = "供方税号") + private String supplierTaxNo; + + /** + * 需方地址 + */ + @ExcelProperty(value = "需方地址") + private String customerAddress; + + /** + * 需方电话 + */ + @ExcelProperty(value = "需方电话") + private String customerPhone; + + /** + * 需方开户行 + */ + @ExcelProperty(value = "需方开户行") + private String customerBank; + + /** + * 需方账号 + */ + @ExcelProperty(value = "需方账号") + private String customerAccount; + + /** + * 需方税号 + */ + @ExcelProperty(value = "需方税号") + private String customerTaxNo; + + /** + * 技术附件 + */ + @ExcelProperty(value = "技术附件") + private String techAnnex; + + /** + * 商务附件 + */ + @ExcelProperty(value = "商务附件") + private String businessAnnex; + + /** + * 排产函 + */ + @ExcelProperty(value = "排产函") + private String productionSchedule; + + /** + * 合同状态 0=草稿 1=生效 2=作废 3=已完成 + */ + @ExcelProperty(value = "合同状态") + private Long status; + /** * 关联合同ID（wms_contract.contract_id） */ diff --git a/klp-ui/src/views/micro/zinc/index.vue b/klp-ui/src/views/micro/zinc/index.vue new file mode 100644 index 00000000..4d79ddc0 --- /dev/null +++ b/klp-ui/src/views/micro/zinc/index.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/klp-ui/src/views/wms/report/components/summary/splitSummary.vue b/klp-ui/src/views/wms/report/components/summary/splitSummary.vue new file mode 100644 index 00000000..36630242 --- /dev/null +++ b/klp-ui/src/views/wms/report/components/summary/splitSummary.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/report/js/calc.js b/klp-ui/src/views/wms/report/js/calc.js index 44805707..acef5176 100644 --- a/klp-ui/src/views/wms/report/js/calc.js +++ b/klp-ui/src/views/wms/report/js/calc.js @@ -229,9 +229,76 @@ const calcMSummary = (list, lossList) => { } } +// 处理分条信息的统计信息 +const calcSplitSummary = (originOutputlist, originLossList, commonCoilIds) => { + // 1. 将commonCoilIds中的coilId的卷从originOutputlist和originLossList中剔除 + const list = originOutputlist.filter(item => !commonCoilIds.includes(item.coilId)) + const lossList = originLossList.filter(item => !commonCoilIds.includes(item.coilId)) + // 总钢卷数量、总重、均重 + const outCount = list.length + const outTotalWeight = list.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0) // 增加容错 + const outAvgWeight = outCount > 0 ? (outTotalWeight / outCount)?.toFixed(2) : 0 + + // 损失钢卷数量、总重、均重 + const lossCount = lossList.length + const lossTotalWeight = lossList.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0) // 增加容错 + const lossAvgWeight = lossCount > 0 ? (lossTotalWeight / lossCount)?.toFixed(2) : 0 + // 合计数量、总重、均重 + const totalCount = outCount + lossCount + const totalWeight = parseFloat((outTotalWeight + lossTotalWeight).toFixed(2)) + const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0 + + // 计算数量、总重、均重的插值 + const countDiff = Math.abs(outCount - lossCount) + const weightDiff = Math.abs(parseFloat((outTotalWeight - lossTotalWeight).toFixed(2))) + const avgWeightDiff = Math.abs(parseFloat((outAvgWeight - lossAvgWeight).toFixed(2))) + + // 成品比率 + const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0 + // 损失比率 + const lossRate = totalCount > 0 ? (1 - passRate) : 0 + // 异常率,成品在warehouseId在'2019583656787259393', + // '2019583325311414274', + // '2019583429955104769', + // '2019583137616310273',这四个库中的占比 + const abStatus = ['O', 'C-', 'C+', 'C', 'D-', 'D+', 'D'] + const abRate = totalCount != 0 ? list.filter(item => { + // 质量状态为O, C- , C+, C, D-, D+, D的钢卷也属于异常 + return (item.warehouseId == '2019583656787259393' + || item.warehouseId == '2019583325311414274' + || item.warehouseId == '2019583429955104769' + || item.warehouseId == '2019583137616310273' + || abStatus.includes(item.qualityStatus) + ) + }).length / outCount : 0 + + // 正品率（1-异常率） + const passRate2 = totalCount != 0 ? (1 - abRate) : 0 + + return { + outCount, + outTotalWeight: outTotalWeight.toFixed(2), + outAvgWeight, + lossCount, + lossTotalWeight: lossTotalWeight.toFixed(2), + lossAvgWeight, + totalCount, + totalWeight: totalWeight.toFixed(2), + totalAvgWeight, + countDiff, + weightDiff, + avgWeightDiff, + passRate: (passRate * 100)?.toFixed(2) + '%', + lossRate: (lossRate * 100)?.toFixed(2) + '%', + abRate: (abRate * 100)?.toFixed(2) + '%' || 0, + passRate2: (passRate2 * 100)?.toFixed(2) + '%' || 0, + } +} + export { calcSummary, calcAbSummary, calcTeamSummary, calcMSummary, + calcSplitSummary } \ No newline at end of file diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue index a1f9cc86..7b2f1aa4 100644 --- a/klp-ui/src/views/wms/report/template/comprehensive.vue +++ b/klp-ui/src/views/wms/report/template/comprehensive.vue @@ -100,14 +100,17 @@ }} + + + - + - + @@ -135,6 +138,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc"; import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue"; import CoilTable from "@/views/wms/report/components/coilTable/index.vue"; +import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue"; import { saveReportFile } from "@/views/wms/report/js/reportFile"; export default { @@ -148,6 +152,7 @@ export default { WarehouseSelect, ColumnsSetting, CoilTable, + SplitSummary, }, props: { actionTypes: { @@ -279,7 +284,28 @@ export default { }, mSummary() { return calcMSummary(this.list, this.lossList) - } + }, + // 找出list和lossList中id相同的卷 + commonCoilIds() { + if (this.productionLine !== '分条线') { + return [] + } + + // 获取list中的coilId集合 + const outputCoilIds = new Set(this.list.map(item => item.coilId)) + // 获取lossList中的coilId集合 + const lossCoilIds = new Set(this.lossList.map(item => item.coilId)) + + // 找出两个集合中相同的coilId + const commonIds = [] + outputCoilIds.forEach(id => { + if (lossCoilIds.has(id)) { + commonIds.push(id) + } + }) + + return commonIds + }, }, methods: { // 加载列设置 diff --git a/klp-ui/src/views/wms/report/template/day.vue b/klp-ui/src/views/wms/report/template/day.vue index 93815bf3..167453a4 100644 --- a/klp-ui/src/views/wms/report/template/day.vue +++ b/klp-ui/src/views/wms/report/template/day.vue @@ -97,6 +97,9 @@ }} + + + @@ -128,6 +131,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc"; import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue"; import CoilTable from "@/views/wms/report/components/coilTable/index.vue"; +import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue"; import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch"; import { saveReportFile } from "@/views/wms/report/js/reportFile"; @@ -143,6 +147,7 @@ export default { WarehouseSelect, ColumnsSetting, CoilTable, + SplitSummary, }, props: { actionTypes: { diff --git a/klp-ui/src/views/wms/report/template/month.vue b/klp-ui/src/views/wms/report/template/month.vue index 39ae5730..d50cfd32 100644 --- a/klp-ui/src/views/wms/report/template/month.vue +++ b/klp-ui/src/views/wms/report/template/month.vue @@ -97,14 +97,17 @@ }} + + + - + - + @@ -132,6 +135,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc"; import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue"; import CoilTable from "@/views/wms/report/components/coilTable/index.vue"; +import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue"; import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch"; import { saveReportFile } from "@/views/wms/report/js/reportFile"; @@ -146,6 +150,7 @@ export default { WarehouseSelect, ColumnsSetting, CoilTable, + SplitSummary, }, props: { actionTypes: { @@ -276,7 +281,28 @@ export default { }, mSummary() { return calcMSummary(this.list, this.lossList) - } + }, + // 找出list和lossList中id相同的卷 + commonCoilIds() { + if (this.productionLine !== '分条线') { + return [] + } + + // 获取list中的coilId集合 + const outputCoilIds = new Set(this.list.map(item => item.coilId)) + // 获取lossList中的coilId集合 + const lossCoilIds = new Set(this.lossList.map(item => item.coilId)) + + // 找出两个集合中相同的coilId + const commonIds = [] + outputCoilIds.forEach(id => { + if (lossCoilIds.has(id)) { + commonIds.push(id) + } + }) + + return commonIds + }, }, methods: { // 加载列设置 diff --git a/klp-ui/src/views/wms/report/template/team.vue b/klp-ui/src/views/wms/report/template/team.vue index a442b11c..b93ae699 100644 --- a/klp-ui/src/views/wms/report/template/team.vue +++ b/klp-ui/src/views/wms/report/template/team.vue @@ -106,6 +106,9 @@ }} + + + @@ -118,10 +121,10 @@ - + - + @@ -145,6 +148,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { calcSummary, calcAbSummary, calcTeamSummary, calcMSummary } from "@/views/wms/report/js/calc"; import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue"; import CoilTable from "@/views/wms/report/components/coilTable/index.vue"; +import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue"; import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch"; import { saveReportFile } from "@/views/wms/report/js/reportFile"; @@ -159,6 +163,7 @@ export default { WarehouseSelect, ColumnsSetting, CoilTable, + SplitSummary, }, props: { actionTypes: { @@ -273,7 +278,28 @@ export default { outWeight: formatWeight(outData.weight) }; }); - } + }, + // 找出list和lossList中id相同的卷 + commonCoilIds() { + if (this.productionLine !== '分条线') { + return []; + } + + // 获取list中的coilId集合 + const outputCoilIds = new Set(this.list.map(item => item.coilId)); + // 获取lossList中的coilId集合 + const lossCoilIds = new Set(this.lossList.map(item => item.coilId)); + + // 找出两个集合中相同的coilId + const commonIds = []; + outputCoilIds.forEach(id => { + if (lossCoilIds.has(id)) { + commonIds.push(id); + } + }); + + return commonIds; + }, }, methods: { // 加载列设置 diff --git a/klp-ui/src/views/wms/report/template/year.vue b/klp-ui/src/views/wms/report/template/year.vue index d23e35af..1f9c24f2 100644 --- a/klp-ui/src/views/wms/report/template/year.vue +++ b/klp-ui/src/views/wms/report/template/year.vue @@ -96,14 +96,17 @@ }} + + + - + - + @@ -118,10 +121,6 @@