From c656aef162e8d0788de316db49d8f9b6f2022151 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 17:34:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=92=8C=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E5=92=8C=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysMakeorderPick.java | 26 ++++++++++++++++++- .../system/domain/SysMakeorderPickVo.java | 5 ---- .../impl/SysMakeorderPickServiceImpl.java | 12 ++++++++- .../mapper/system/SysMakeorderPickMapper.xml | 8 ++++-- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java index f45a51e8..8209a79a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java @@ -50,6 +50,11 @@ public class SysMakeorderPick extends BaseEntity @Excel(name = "领料员") private String pickUser; + /*物料合计*/ + private Integer materialSum; + /*数量合计*/ + private Integer enterpriseSum; + /** 审核状态 0-待审核 1-审核通过 2-审核拒绝 */ @Excel(name = "审核状态 0-待审核 1-审核通过 2-审核拒绝") private String auditStatus; @@ -161,7 +166,24 @@ public class SysMakeorderPick extends BaseEntity { return pickUser; } - public void setAuditStatus(String auditStatus) + + public Integer getMaterialSum() { + return materialSum; + } + + public void setMaterialSum(Integer materialSum) { + this.materialSum = materialSum; + } + + public Integer getEnterpriseSum() { + return enterpriseSum; + } + + public void setEnterpriseSum(Integer enterpriseSum) { + this.enterpriseSum = enterpriseSum; + } + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } @@ -267,6 +289,8 @@ public class SysMakeorderPick extends BaseEntity .append("outOrderCode", getOutOrderCode()) .append("pickStatus", getPickStatus()) .append("pickUser", getPickUser()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) .append("auditStatus", getAuditStatus()) .append("instanceId", getInstanceId()) .append("instanceType", getInstanceType()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java index f722abd9..05ddc621 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java @@ -32,11 +32,6 @@ public class SysMakeorderPickVo extends SysMakeorderPick { /** 流程实例类型名称 */ private String instanceTypeName; - /*物料合计*/ - private Integer materialSum; - /*数量合计*/ - private Integer enterpriseSum; - /** * 关键词 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java index 048b9fd0..792e1e38 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java @@ -174,10 +174,20 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService // 生成编号，年月日规则 String billNo = redisCache.generateBillNo("SCLL"); sysMakeorderPick.setPickNo(billNo); - int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick); + //保留领料单数不为空的数据 List filterPickDetails = pickDetails.stream().filter(details -> details.getPickNum() != null).collect(Collectors.toList()); + Integer enterpriseSum = (int) filterPickDetails.stream() + .mapToLong(SysMakeorderPickDetail::getPickNum) + .sum(); + + sysMakeorderPick.setEnterpriseSum(enterpriseSum); + sysMakeorderPick.setMaterialSum(filterPickDetails.size()); + + int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick); + + // 插入子表 for (int i = 0; i < filterPickDetails.size(); i++) { //获取过滤后的领料单详情 diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml index 89fa3a13..6703c1fa 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml @@ -36,8 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark , a.make_no, a.sale_no, a.pick_no, a.out_order_code, a.pick_status, a.pick_user, a.audit_status , a.instance_id, a.instance_type, a.submit_instance_id, a.cancel_instance_id, a.restore_instance_id, a.apply_title, a.apply_user, a.apply_time - ,b.material_sum - ,b.enterprise_sum + ,a.material_sum + ,a.enterprise_sum from sys_makeorder_pick a left join sys_sales_order b on a.sale_no = b.sales_order_code @@ -90,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" out_order_code, pick_status, pick_user, + material_sum, + enterprise_sum, audit_status, instance_id, instance_type, @@ -113,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outOrderCode}, #{pickStatus}, #{pickUser}, + #{materialSum}, + #{enterpriseSum}, #{auditStatus}, #{instanceId}, #{instanceType}, From 8936cdb068edfcd4c93e4600691503a964429cae Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 18:44:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E6=9A=82?= =?UTF-8?q?=E6=94=B6=E8=BD=AC=E5=93=81=E8=B4=A8=E5=8D=95=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E8=AF=A6=E6=83=85=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E5=88=99?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E6=8A=A5=E5=91=8A=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E5=88=99?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E4=B8=8D=E5=90=88=E6=A0=BC=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=A0=E4=B8=8A=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=99=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityOrderServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java index f4f42119..8f24fe9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java @@ -601,7 +601,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderReportUnqualified.setMaterialName(warehouseStorageOrderDetail.getMaterialName()); qualityOrderReportUnqualified.setCreateTime(new Date()); qualityOrderReportUnqualified.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified); + int insertQualityOrderReportUnqualifiedResult = orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified); + if (insertQualityOrderReportUnqualifiedResult <= 0){ + throw new BusinessException("插入品质单不合格分类表失败"); + } } @@ -619,7 +622,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderReport.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum()); qualityOrderReport.setCreateTime(new Date()); qualityOrderReport.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderReportMapper.insertQualityOrderReport(qualityOrderReport); + int insertResult = orderReportMapper.insertQualityOrderReport(qualityOrderReport); + if (insertResult <= 0){ + throw new BusinessException("插入品质单报告失败"); + } } //品质单详情表 @@ -653,7 +659,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderDetail.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum()); qualityOrderDetail.setCreateTime(new Date()); qualityOrderDetail.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail); + int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail); + if (insertResult <= 0){ + throw new BusinessException("插入品质单详情失败"); + } }