[feat]

品质管理 品质单
修改退料开始品质页面；
修改品质报告单生成退换货详情service方法，添加品质不合格数传参；

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);
 

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);