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 116fd85c..ecc990ab 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 @@ -126,7 +126,8 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService } //更新品质报告详情中的品质合格数的数据 qualityOrderDetail.setQualityQualifiedNum(qualityQualifiedNum); - + //更新品质已合格数 + qualityOrderDetail.setQualityHasqualifiedNum(qualityQualifiedNum); //获得品质报告中的不合格数模块数据 List unqualifiedDataList = qualityOrderReport.getUnqualifiedDataList(); 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 8ccc4731..c842a8ae 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 @@ -364,6 +364,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS //更新入库单详情的数据 warehouseStorageOrderDetail.setUpdateBy(loginName); warehouseStorageOrderDetail.setUpdateTime(new Date()); + //更新已入库数 + warehouseStorageOrderDetail.setHasStorageNum(warehouseStorageOrderDetail.getStorageNum()); int updateWarehouseStorageOrderDetailResult = storageOrderDetailMapper.updateWarehouseStorageOrderDetail(warehouseStorageOrderDetail); if (updateWarehouseStorageOrderDetailResult <= 0){ throw new BusinessException("更新仓库入库单详情失败,未影响任何行"); @@ -401,6 +403,10 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS detail.setWarehouseStorageCode(warehouseStorageOrder.getWarehouseStorageCode()); Integer actualArriveNum = detail.getActualArriveNum(); Integer temporaryQualifiedNum = detail.getTemporaryQualifiedNum(); + //添加实际已到货数 + detail.setActualHasArrivedNum(actualArriveNum); + //添加暂收已合格数 + detail.setTemporaryHasQualifiedNum(temporaryQualifiedNum); if (actualArriveNum < temporaryQualifiedNum){ throw new BusinessException("暂收合格数要小于等于实际到货数"); }