Merge remote-tracking branch 'origin/dev' into dev

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

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());
         //设置品质合格数