diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskSumPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskSumPO.java index 14bc511eb..d5d2b8050 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskSumPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskSumPO.java @@ -33,5 +33,8 @@ public class DeliveTaskSumPO { @ApiModelProperty("待盘点数量") private Integer stockQuantity; + @ApiModelProperty("待交接数量") + private Integer handoverQuantity; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java index f9e2b4e5b..d1878b73b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java @@ -137,4 +137,10 @@ public class HandoverTaskOrder extends BaseVOEntity { @ApiModelProperty("app上传的图片") private String pictureApp; + @ApiModelProperty("作业人用户ID") + private Long operatorsBy; + + @ApiModelProperty("作业人姓名") + private String operatorsName; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java index 47d8b07b1..a81155c11 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java @@ -103,6 +103,8 @@ public class HandoverTaskOrderImpl extends ServiceImpl + @@ -274,7 +275,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND audit_status = 3 AND investigation_status < 4 and operators_by = #{operatorsBy} - ) stockQuantity + ) stockQuantity, + ( + SELECT + COUNT(1) + FROM + handover_task_order + WHERE + del_flag = 1 + AND task_distribution = 1 + AND status = 1 + AND operators_by = #{operatorsBy} + ) handoverQuantity