From 0e4b4ff389ad35e4b2428864d020ba141b7adb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 13 Feb 2025 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95service=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=93=81=E8=B4=A8=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E8=B5=8B=E5=80=BC=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A5=E6=96=99?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=9F=E4=BA=A7=E3=80=81=E6=9F=A5=E8=AF=A2=E9=80=80?= =?UTF-8?q?=E6=96=99=E5=88=97=E8=A1=A8service=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=93=81=E8=B4=A8=E7=8A=B6=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=80=BC=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E4=B8=8D=E5=90=8C=E6=96=B9=E6=B3=95=EF=BC=9B=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9C=AA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=AE=8C=E6=88=90=E6=9D=A5=E6=96=99=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95=E3=80=81=E7=94=9F=E4=BA=A7=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E5=8D=95=E3=80=81=E9=80=80=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95?= =?UTF-8?q?mapper=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReturnQualityOrderController.java | 4 +- .../quality/mapper/QualityOrderMapper.java | 13 +++++ .../quality/service/IQualityOrderService.java | 3 +- .../impl/QualityOrderReportServiceImpl.java | 1 + .../service/impl/QualityOrderServiceImpl.java | 12 +++++ .../mapper/quality/QualityOrderMapper.xml | 54 +++++++++++++++++++ 6 files changed, 84 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java index 379a1018..ff3716e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java @@ -42,11 +42,11 @@ public class ReturnQualityOrderController extends BaseController { } /** - * 查询来料品质管理品质单列表 + * 查询退料品质管理品质单列表 */ @PostMapping("/qualityOrderList") @ResponseBody - public TableDataInfo iqcOrderList(QualityOrder qualityOrder) + public TableDataInfo returnOrderList(QualityOrder qualityOrder) { startPage();// List list = qualityOrderService.selectReturnQualityOrderList(qualityOrder); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java index 049e9806..98194d11 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java @@ -99,11 +99,24 @@ public interface QualityOrderMapper * 查询来料品质单*/ public List selectIqcQualityOrderList(QualityOrder qualityOrder); + /* + * 查询未完成来料品质单*/ + public List selectIqcQualityOrderListUndo(QualityOrder qualityOrder); + /* * 查询生产品质单*/ public List selectMakeQualityOrderList(QualityOrder qualityOrder); + /* + * 查询未完成生产品质单*/ + public List selectMakeQualityOrderListUndo(QualityOrder qualityOrder); + /* * 查询退料品质单*/ public List selectReturnQualityOrderList(QualityOrder qualityOrder); + + /* + * 查询未完成退料品质单*/ + public List selectReturnQualityOrderListUndo(QualityOrder qualityOrder); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java index 51883aa3..53c81b4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java @@ -118,9 +118,10 @@ public interface IQualityOrderService */ int updateMakeStartingQuality(QualityOrder qualityOrder); + //查询来料品质单列表 List selectIqcQualityOrderList(QualityOrder qualityOrder); - //查询来料品质单列表 + //查询生产品质单列表 List selectMakeQualityOrderList(QualityOrder qualityOrder); /* diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java index e2029f73..62a456a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java @@ -998,6 +998,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService refundsExchanges.setRelatedOrderCode(qualityReportVO.getQualityOrderCode()); refundsExchanges.setInStorageCode(qualityReportVO.getInStorageCode()); refundsExchanges.setQualityTime(qualityReportVO.getCheckoutCompletionTime()); + refundsExchanges.setQualityRemark(qualityReportVO.getRemark()); refundsExchanges.setMaterialTotal(1); refundsExchanges.setNumTotal(qualityReportVO.getProcessBadNum()); refundsExchanges.setDeliveryInspectionTime(qualityReportVO.getDeliveryInspectionTime()); 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 287c74b1..371dd893 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 @@ -114,6 +114,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService public List selectIqcQualityOrderList(QualityOrder qualityOrder) { List qualityOrders = qualityOrderMapper.selectIqcQualityOrderList(qualityOrder); + /*品质状态为空查询时，默认查询部分品质和待品质*/ + if(qualityOrder.getQualityStatus().isEmpty()){ + qualityOrders = qualityOrderMapper.selectIqcQualityOrderListUndo(qualityOrder); + } return qualityOrders; } @@ -122,6 +126,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService public List selectMakeQualityOrderList(QualityOrder qualityOrder) { List qualityOrders = qualityOrderMapper.selectMakeQualityOrderList(qualityOrder); + /*品质状态为空查询时，默认查询部分品质和待品质*/ + if(qualityOrder.getQualityStatus().isEmpty()){ + qualityOrders = qualityOrderMapper.selectMakeQualityOrderListUndo(qualityOrder); + } return qualityOrders; } @@ -130,6 +138,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService @Override public List selectReturnQualityOrderList(QualityOrder qualityOrder){ List qualityOrders = qualityOrderMapper.selectReturnQualityOrderList(qualityOrder); + /*品质状态为空查询时，默认查询部分品质和待品质*/ + if(qualityOrder.getQualityStatus().isEmpty()){ + qualityOrders = qualityOrderMapper.selectReturnQualityOrderListUndo(qualityOrder); + } return qualityOrders; } diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml index 2a48969d..b8701b5f 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml @@ -114,6 +114,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc + + + + + +