提交申请时补充完整原单审批信息，避免前端漏传或错误传递原单参数信息

Signed-off-by: zhengyi <landuo321@aliyun.com>

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -489,6 +489,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             // 进行中的审批直接返回
             return;
         }
+        OrderDO orderDO = orderService.getById(applyVO.getOrderId());
         if (result == 3 || result == 4) {
             // TODO  审批取消、审批拒绝,待补充业务日志及其他细节
             if (orderApprovalDO.getType() == 61) {
@@ -522,9 +523,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             if (orderApprovalDO.getType() == 61) {
                 // 修改放货限制
                 Integer newLockConsigneeDay = applyVO.getNewIsLimitUpdateConsignee() ? applyVO.getNewLockConsigneeDay() : null;
-                OrderDO orderDO = orderService.getById(applyVO.getOrderId());
                 Date newLockConsigneeTime = Objects.isNull(orderDO.getUnloadTime()) || Objects.isNull(newLockConsigneeDay) ? null : DateUtil.endOfDay(DateUtil.offsetDay(orderDO.getUnloadTime(), newLockConsigneeDay));
-                ;
                 orderService.update(new LambdaUpdateWrapper<OrderDO>()
                         .set(OrderDO::getIsLimitUpdateConsignee, applyVO.getNewIsLimitUpdateConsignee())
                         .set(OrderDO::getLockConsigneeDay, newLockConsigneeDay)
@@ -604,7 +603,24 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
         }
         Date now = new Date();
         OrderDO orderDO = orderService.getById(orderCargoControlApplyVO.getOrderId());
-        orderCargoControlApplyVO.setOrderNo(orderDO.getOrderNo());
+        OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderCargoControlApplyVO.getOrderId());
+        orderCargoControlApplyVO.setOrderNo(releaseInfoDto.getOrderNo());
+        orderCargoControlApplyVO.setPickQuantity(releaseInfoDto.getPickQuantity());
+        orderCargoControlApplyVO.setPickVolume(releaseInfoDto.getPickVolume());
+        orderCargoControlApplyVO.setPickWeight(releaseInfoDto.getPickWeight());
+        orderCargoControlApplyVO.setSumNum(releaseInfoDto.getSumNum());
+        orderCargoControlApplyVO.setSumVolume(releaseInfoDto.getSumVolume());
+        orderCargoControlApplyVO.setSumWeight(releaseInfoDto.getSumWeight());
+        orderCargoControlApplyVO.setSumQuantity(releaseInfoDto.getSumQuantity());
+        orderCargoControlApplyVO.setReleaseNum(releaseInfoDto.getReleaseNum());
+        orderCargoControlApplyVO.setIsCargoControl(releaseInfoDto.getIsCargoControl());
+        orderCargoControlApplyVO.setTidanNo(releaseInfoDto.getTidanNo());
+        orderCargoControlApplyVO.setCargoControlStatus(releaseInfoDto.getCargoControlStatus());
+        orderCargoControlApplyVO.setIsLimitUpdateConsignee(releaseInfoDto.getIsLimitUpdateConsignee());
+        orderCargoControlApplyVO.setLockConsigneeDay(releaseInfoDto.getLockConsigneeDay());
+        orderCargoControlApplyVO.setLockConsigneeTime(releaseInfoDto.getLockConsigneeTime());
+        orderCargoControlApplyVO.setUnloadTime(releaseInfoDto.getUnloadTime());
+
         OrderApprovalDO orderApprovalDO = new OrderApprovalDO();
         orderApprovalDO.setFollowUpSalesmanId(String.valueOf(orderDO.getSalesmanId()));//跟进业务员为订单的跟进业务员
         orderApprovalDO.setDetails(JSONObject.toJSONString(orderCargoControlApplyVO));

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderCargoControl/OrderCargoControlApplyVO.java

@@ -54,13 +54,6 @@ public class OrderCargoControlApplyVO {
     @ApiModelProperty(value = "已放货箱数")
     private Integer releaseNum = 0;
 
-
-    @ApiModelProperty(value = "原放货箱数")
-    private Integer pickNum = 0;
-
-    @ApiModelProperty(value = "现在放货箱数")
-    private Integer currentPickNum = 0;
-
     @ApiModelProperty(value = "放货数量")
     private Integer pickQuantity = 0;
 
@@ -81,6 +74,11 @@ public class OrderCargoControlApplyVO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date lockConsigneeTime;
 
+    @ApiModelProperty(value = "卸柜/到仓时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date unloadTime;
+
 
     @ApiModelProperty(value = "新的是否限制修改收货人")
     private Boolean newIsLimitUpdateConsignee;