提交新增货单增加的字段

performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -12,39 +13,54 @@ import java.util.List;
 @Setter
 public class OrderGoodsChildParams {
 
-    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    @ApiModelProperty(value = "用车方式 1：平台车辆配货 2：自有车辆配货", required = true)
     private String vehicleUsage;
 
 
     @MoneyInConvert
-    @ApiModelProperty("挂单运费")
+    @ApiModelProperty(value = "挂单运费", required = true)
     private BigDecimal pendingOrderFreight;
 
-    @ApiModelProperty("提取方式 1提取全部 2提取部分")
+    @ApiModelProperty(value = "提取方式 1提取全部 2提取部分", required = true)
     private Integer extractWay;
 
-    @ApiModelProperty("提取吨数")
+    @ApiModelProperty(value = "提取吨数", required = true)
     private BigDecimal extractWeight;
 
 
-    @ApiModelProperty("需要车辆/辆")
+    @ApiModelProperty(value = "需要车辆/辆", required = true)
     private Integer needTruckNum;
 
 
-    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
+    @ApiModelProperty(value = "挂单方式  1公开派单  2定向派单" , required = true)
     private Integer pendingOrderWay;
 
-    @ApiModelProperty(value = "最晚到达货源地时间/运单的最晚装货时间", example = "2023-09-09 12:00:01", required = true)
+    @NotBlank(message = "最晚接单时间不能为空")
+    @ApiModelProperty(value = "最晚接单时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastOrderTime;
+
+    @NotBlank(message = "最晚到达货源地时间不能为空")
+    @ApiModelProperty(value = "最晚到达货源地时间", example = "2023-09-09 12:00:01", required = true)
     private String lastArriveSendTime;
 
+    @NotBlank(message = "最晚装货时间不能为空")
+    @ApiModelProperty(value = "最晚装货时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastLoadTime;
+
+    @NotBlank(message = "最晚到达目的地时间不能为空")
+    @ApiModelProperty(value = "最晚到达目的地时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastArriveReceiveTime;
+
+
+
     @ApiModelProperty(value = "挂单时间", example = "2023-09-09 12:00:01", required = true)
     private String pendingOrderTime;
 
 
-    @ApiModelProperty("高级物流经理id")
+    @ApiModelProperty(value = "高级物流经理id" , required = true)
     private Integer seniorLogisticsManagerId;
 
-    @ApiModelProperty("高级物流经理姓名")
+    @ApiModelProperty(value = "高级物流经理姓名" , required = true)
     private String seniorLogisticsManagerName;
 
 

performance-api/src/main/java/com/clx/order/params/UpdateEditOrderGoodsParam.java

+package com.clx.order.params;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName UpdateEditOrderGoodsParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/25 16:41
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class UpdateEditOrderGoodsParam {
+//    @ApiModelProperty("货单id")
+//    private Integer id;
+//
+//    @ApiModelProperty("提取方式 1提取全部 2提取部分")
+//    private Integer extractWay;
+//
+//    @ApiModelProperty("提取吨数")
+//    private BigDecimal extractWeight;
+//
+//    @ApiModelProperty("需要车辆/辆")
+//    private Integer needTruckNum;
+//
+//
+//    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
+//    private Integer pendingOrderWay;
+//
+//
+//    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+//    private String vehicleUsage;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//    @ApiModelProperty(value = "最晚到达货源地时间/运单的最晚装货时间", example = "2023-09-09 12:00:01", required = true)
+//    private String lastArriveSendTime;
+//
+//
+//
+//
+//    @ApiModelProperty("高级物流经理id")
+//    private Integer seniorLogisticsManagerId;
+//
+//    @ApiModelProperty("高级物流经理姓名")
+//    private String seniorLogisticsManagerName;
+//
+//
+//    @ApiModelProperty(value = "挂单时间", example = "2023-09-09 12:00:01", required = true)
+//    private String pendingOrderTime;
+//
+//
+//    @MoneyInConvert
+//    @ApiModelProperty("挂单运费")
+//    private BigDecimal pendingOrderFreight;
+//
+//
+//
+//
+//    @ApiModelProperty("车辆列表")
+//    private List<String> truckList;
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.order.params.UpdateEditOrderGoodsParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
-import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -23,8 +23,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -127,4 +125,12 @@ public class GoodsOrderController {
         IPage<OrderGoodsVO> page = orderGoodsService.pageOrderGoodsList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+    @ApiOperation(value = "货单编辑", notes = "<br>By:刘海泉")
+    @PostMapping("/updateEditOrderGoods")
+    public Result updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {
+        orderGoodsService.updateEditOrderGoods(param);
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

 package com.clx.performance.model;
 
+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.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
@@ -8,9 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 
 /**
@@ -111,10 +112,27 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("定向运单失效时间")
     private LocalDateTime directionalExpireTime;
 
+
+    @TableField("last_order_time")
+    @ApiModelProperty("'最晚接单时间'")
+    private LocalDateTime lastOrderTime;
+
+
     @TableField("last_arrive_send_time")
-    @ApiModelProperty("最晚到达货源地时间/运单的最晚装货时间")
+    @ApiModelProperty("最晚到达货源地时间")
     private LocalDateTime lastArriveSendTime;
 
+
+    @TableField("last_load_time")
+    @ApiModelProperty("最晚装货时间")
+    private LocalDateTime lastLoadTime;
+
+
+    @TableField("last_arrive_receive_time")
+    @ApiModelProperty("'最晚到达目的地时间'")
+    private LocalDateTime lastArriveReceiveTime;
+
+
     @TableField("pending_order_time")
     @ApiModelProperty("挂单时间")
     private LocalDateTime pendingOrderTime;

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -3,6 +3,7 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.order.params.UpdateEditOrderGoodsParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -35,4 +36,6 @@ public interface OrderGoodsService {
     List<OrderGoods> getOrderGoodsList(String orderNo, LocalDateTime lastArriveSendTime);
 
     String orderCancel();
+
+    void updateEditOrderGoods(UpdateEditOrderGoodsParam param);
 }

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

@@ -148,6 +148,11 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
+            //设置新加的三个最晚时间
+            orderGoods.setLastOrderTime(DateUtils.parseDateTime(child.getLastOrderTime()).get());
+            orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
+            orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
+
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -151,6 +151,12 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
+
+            //设置新加的三个最晚时间
+            orderGoods.setLastOrderTime(DateUtils.parseDateTime(child.getLastOrderTime()).get());
+            orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
+            orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
+
             List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
             if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "全部自由车辆列表数据为空");

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -155,6 +155,12 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
+
+            //设置新加的三个最晚时间
+            orderGoods.setLastOrderTime(DateUtils.parseDateTime(child.getLastOrderTime()).get());
+            orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
+            orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
+
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());