复核详情修改，复核确认，批量复核、取消BUG修改

mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/factorys/DeliveTaskServiceFactory.java

@@ -41,7 +41,7 @@ public class DeliveTaskServiceFactory {
                 deliveTaskType = "stockOutTaskOrderImpl";
                 break;
             case 4:
-                deliveTaskType = "stockOutOrderImpl";
+                deliveTaskType = "reviewOrderImpl";
                 break;
             case 5:
                 deliveTaskType = "shiftManageImpl";

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java

@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.reviewOrder.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mhd.common.core.web.domain.BaseVOEntity;
@@ -65,12 +66,16 @@ public class ReviewMaterialDetail extends BaseVOEntity {
 
     private String boxPalletNo;
 
+    @TableField("ext_attr_1")
     private String extAttr1;
 
+    @TableField("ext_attr_2")
     private String extAttr2;
 
+    @TableField("ext_attr_3")
     private Date extAttr3;
 
+    @TableField("ext_attr_4")
     private Date extAttr4;
 
     private BigDecimal reviewQtyEa;

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/persistence/ReviewOrderImpl.java

@@ -0,0 +1,38 @@
+package com.mhd.wms.domain.reviewOrder.repository.persistence;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskTypeService;
+import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
+import com.mhd.wms.domain.reviewOrder.entity.ReviewOrder;
+import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 复核单任务接收回写（delive_task taskType=4）
+ */
+@Service
+public class ReviewOrderImpl implements IDeliveTaskTypeService {
+
+    @Autowired
+    private ReviewOrderMapper reviewOrderMapper;
+
+    /**
+     * PDA 接收复核任务后，按复核单号回写复核单接收时间
+     */
+    @Override
+    public Boolean handleDeliveTask(DeliveTaskDO deliveTaskDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        return reviewOrderMapper.update(null, new UpdateWrapper<ReviewOrder>().lambda()
+                .set(ReviewOrder::getReceiveTime, new Date())
+                .set(loginUser != null, ReviewOrder::getUpdateBy, loginUser != null ? loginUser.getUserid() : null)
+                .set(loginUser != null, ReviewOrder::getUpdateByName, loginUser != null ? loginUser.getUsername() : null)
+                .set(ReviewOrder::getUpdateTime, new Date())
+                .eq(ReviewOrder::getReviewOrderNumber, deliveTaskDO.getTrackingNumber())
+                .eq(ReviewOrder::getDelFlag, 1)) > 0;
+    }
+}

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java

@@ -69,7 +69,7 @@ public class ReviewOrderPO extends BaseVOEntity {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("任务接收时间")
+    @ApiModelProperty("下发确认时间（PDA 点击确定/接收的时间）")
     private Date receiveTime;
 
     @ApiModelProperty("备注")

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/todo/ReviewOrderDO.java

@@ -46,15 +46,21 @@ public class ReviewOrderDO extends BaseVOEntity {
     @ApiModelProperty("创建时间止")
     private String createTimeEnd;
 
-    @ApiModelProperty("接收时间起")
+    @ApiModelProperty("下发确认时间起（PDA 点击确定/接收的时间）")
     private String receiveTimeStart;
 
-    @ApiModelProperty("接收时间止")
+    @ApiModelProperty("下发确认时间止（PDA 点击确定/接收的时间）")
     private String receiveTimeEnd;
 
     @ApiModelProperty("复核单ID集合")
     private List<Long> reviewOrderIds;
 
+    @ApiModelProperty("复核作业人用户ID（复核下发）")
+    private Long checkOperatorsBy;
+
+    @ApiModelProperty("复核作业人姓名")
+    private String checkOperatorsName;
+
     @ApiModelProperty("复核明细列表（用于批量复核/取消复核）")
     private List<ReviewMaterialDetailPO> details;
 }