From e765bcfaccab0f48aab7eb078a2f33d0d6d527fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 20 Dec 2024 16:31:46 +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=E9=80=80?= =?UTF-8?q?=E6=96=99=E5=BC=80=E5=A7=8B=E5=93=81=E8=B4=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=8D=95=E7=94=9F=E6=88=90=E9=80=80=E6=8D=A2=E8=B4=A7?= =?UTF-8?q?=E8=AF=A6=E6=83=85service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=93=81=E8=B4=A8=E4=B8=8D=E5=90=88=E6=A0=BC=E6=95=B0?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QualityOrderReportServiceImpl.java | 14 +++++++++----- .../returnQualityOrder/returnStartingQuality.html | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) 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 26a3c8a4..c90b9829 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 @@ -945,7 +945,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService throw new BusinessException("新增退换货入库单失败"); } //生成退换货详情 - QualityRefundsExchangesDetail refundsExchangesDetail = generateRefundsExchangesDetail(refundsCodes,qualityOrderDetail,refundStorageOrder.getWarehouseStorageCode()); + QualityRefundsExchangesDetail refundsExchangesDetail = generateRefundsExchangesDetail(refundsCodes,qualityOrderDetail,unQualifiedNum,refundStorageOrder.getWarehouseStorageCode()); //生成退换货单报告 QualityRefundsExchangesOrder refundsExchangesOrder = generateQualityRefundsExchangesOrder(refundsExchanges.getRefundsExchangesCode(),qualityOrderReportVO,qualityOrderDetail); @@ -1014,7 +1014,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService } //根据品质单详情生成退换货详情 - public QualityRefundsExchangesDetail generateRefundsExchangesDetail(String refundsExchangesCode,QualityOrderDetail detail,String storageCode){ + public QualityRefundsExchangesDetail generateRefundsExchangesDetail(String refundsExchangesCode,QualityOrderDetail detail,int unQualifiedNum,String storageCode){ QualityRefundsExchangesDetail exchangesDetail = new QualityRefundsExchangesDetail(); exchangesDetail.setRefundsExchangesCode(refundsExchangesCode); exchangesDetail.setRefundsExchangesStatus("0");//待结案 @@ -1034,8 +1034,8 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService exchangesDetail.setMaterialBrand(detail.getMaterialBrand()); exchangesDetail.setMaterialProcessMethod(detail.getMaterialProcessMethod()); exchangesDetail.setMaterialUnit(detail.getMaterialUnit()); - exchangesDetail.setRefundsExchangesNum(detail.getQualityUnqualifiedNum()); - exchangesDetail.setQualityUnqualifiedNum(detail.getQualityUnqualifiedNum()); + exchangesDetail.setRefundsExchangesNum(unQualifiedNum); + exchangesDetail.setQualityUnqualifiedNum(unQualifiedNum); exchangesDetail.setSupplierCode(detail.getSupplierCode()); exchangesDetail.setSupplierName(detail.getSupplierName()); exchangesDetail.setSupplierAddress(detail.getSupplierAddress()); @@ -1198,6 +1198,8 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService storageOrderDetail.setWarehouseStorageStatus("2");//待入库 storageOrderDetail.setWarehouseQualityStatus("2");//全部品质 storageOrderDetail.setWarehouseDeptType("0");//入库部门：仓库 + storageOrderDetail.setActualHasArrivedNum(qualifiedNum); + storageOrderDetail.setActualArriveNum(qualifiedNum); storageOrderDetail.setRefundsExchangesNum(unQualifiedNum); if(qualityOrder.getQualityOrderType().equals("6")){//生产退料 storageOrderDetail.setWarehouseOrderType("6");//生产退料单 @@ -1228,6 +1230,8 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService if(unQualifiedNum > 0){ String refundsCodes = redisCache.generateBillNo("THH"); QualityRefundsExchanges refundsExchanges = generateQualityRefundsExchange(qualityOrderReportVO,refundsCodes); + refundsExchanges.setWarehouseStorageType("8");//入库类型 生产退料 + refundsExchanges.setQualityReturnNode("1");//入库后退货 //生成退换货入库单和退换货入库详情 WarehouseStorageOrder refundStorageOrder = generateWarehouseStorageOrder(refundsCodes,qualityOrderReportVO); @@ -1246,7 +1250,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService throw new BusinessException("新增退换货入库单失败"); } //生成退换货详情 - QualityRefundsExchangesDetail refundsExchangesDetail = generateRefundsExchangesDetail(refundsCodes,qualityOrderDetail,refundStorageOrder.getWarehouseStorageCode()); + QualityRefundsExchangesDetail refundsExchangesDetail = generateRefundsExchangesDetail(refundsCodes,qualityOrderDetail,unQualifiedNum,refundStorageOrder.getWarehouseStorageCode()); //生成退换货单报告 QualityRefundsExchangesOrder refundsExchangesOrder = generateQualityRefundsExchangesOrder(refundsExchanges.getRefundsExchangesCode(),qualityOrderReportVO,qualityOrderDetail); diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html index 24fe9798..0820eed2 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html @@ -506,9 +506,9 @@ }else if(qualityOrderType === "4"){//开发退料 qualityReport.qualityOrderReportType = "5";//开发退料品质 }else if(qualityOrderType === "5"){//生产退料 - qualityReport.qualityOrderReportType = "6";//员工退料品质 + qualityReport.qualityOrderReportType = "6";//生产退料品质 }else if(qualityOrderType === "6"){//委外退料 - qualityReport.qualityOrderReportType = "7";//员工退料品质 + qualityReport.qualityOrderReportType = "7";//委外退料品质 } qualityReport.unqualifiedDataList = unqualifyList; console.log(qualityReport);