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

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;
+
 
 }

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;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java

@@ -103,6 +103,8 @@ public class HandoverTaskOrderImpl extends ServiceImpl<HandoverTaskOrderMapper,
         HandoverTaskOrder handoverTaskOrder = new HandoverTaskOrder();
         handoverTaskOrder.setTaskDistribution(1);
         handoverTaskOrder.setTaskDistributionTime(new Date());
+        handoverTaskOrder.setOperatorsBy(handoverTaskOrderDO.getOperatorsBy());
+        handoverTaskOrder.setOperatorsName(handoverTaskOrderDO.getOperatorsName());
         handoverTaskOrder.setUpdateBy(loginUser.getUserid());
         handoverTaskOrder.setUpdateByName(loginUser.getUsername());
         handoverTaskOrder.setUpdateTime(new Date());

mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recheckQuantity"    column="recheckQuantity"    />
         <result property="displacementQuantity"    column="displacementQuantity"    />
         <result property="stockQuantity"    column="stockQuantity"    />
+        <result property="handoverQuantity"    column="handoverQuantity"    />
     </resultMap>
 
 
@@ -274,7 +275,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND audit_status = 3
         AND investigation_status &lt; 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
 
     </select>
     <select id="querySum" parameterType="com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO" resultMap="DeliveTaskResultTabSum">