From 541c086c8afb97c4a50e879238e68ec59ccbe2d3 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 2 Jul 2024 18:40:03 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=AE=8C=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E5=93=81=E8=B4=A8=E4=B8=8D=E5=90=88=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=93=81=E8=B4=A8=E5=AE=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/quality/service/impl/QualityOrderServiceImpl.java | 6 +++---
 .../service/impl/WarehouseStorageOrderServiceImpl.java      | 2 ++
 2 files changed, 5 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 309ba508..11dc615e 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
@@ -202,9 +202,9 @@ public class QualityOrderServiceImpl implements IQualityOrderService
 
         //如果品质时修改交检时间
         tempQualityOrder.setDeliveryInspectionTime(qualityOrder.getDeliveryInspectionTime());
-        tempQualityOrder.setQualityQualifiedNum(thisArrivedNumSum);
-        tempQualityOrder.setQualityUnqualifiedNum(qualityQualifiedNumSum);
-        tempQualityOrder.setThisArrivedNum(qualityUnqualifiedNumSum);
+        tempQualityOrder.setQualityQualifiedNum(qualityQualifiedNumSum);
+        tempQualityOrder.setQualityUnqualifiedNum(qualityUnqualifiedNumSum);
+        tempQualityOrder.setThisArrivedNum(thisArrivedNumSum);
 
         //采购订单,采购入库单品质完成后,数据生成到入库单中,后续进行入库操作
             int updateStorageOrderResult = warehouseStorageOrderService.updateWarehouseStorageOrderByQualityOrder(tempQualityOrder, qualityOrderDetailList);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
index c842a8ae..248267e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
@@ -199,6 +199,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         warehouseStorageOrder.setWarehouseStorageCode(qualityOrder.getInStorageCode());
         //入库状态 为待入库
         warehouseStorageOrder.setWarehouseStorageStatus("2");
+        //品质状态
+        warehouseStorageOrder.setWarehouseQualityStatus(qualityOrder.getQualityStatus());
         //设置品质时间
         warehouseStorageOrder.setQualityTime(qualityOrder.getDeliveryInspectionTime());
         //设置品质合格数