货单增加批次号

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

@@ -127,6 +127,12 @@ public class GoodsOrderController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @GetMapping("/orderCancelStyle")
+    public Result<OrderGoodsVO> findOrderGoodsByBatchNumber(@RequestParam(value = "batch_number") Long batchNumber){
+        OrderGoodsVO orderGoodsVO = orderGoodsService.findOrderGoodsByBatchNumber(batchNumber);
+        return Result.ok(orderGoodsVO);
+    }
+
     @ApiOperation(value = "货单编辑", notes = "<br>By:刘海泉")
     @PostMapping("/updateEditOrderGoods")
     public Result updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -63,4 +63,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
 
+    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -168,5 +168,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return baseMapper.updateOrderGoodsSetResidueWeight(residueWeight,id);
     }
 
+    @Override
+    public OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber) {
+        return baseMapper.findOrderGoodsByBatchNumber(batchNumber);
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -60,4 +60,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "id") Integer id);
 
+    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
 }

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

@@ -173,6 +173,9 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("是否暂停 0：否   1：是")
     private Integer stopFlag;
 
+    @TableField("batch_number")
+    @ApiModelProperty("批次号")
+    private Long batchNumber;
 
     @TableField("create_time")
     @ApiModelProperty("创建时间")

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

@@ -73,4 +73,11 @@ public interface OrderGoodsService {
     BigDecimal orderGoodsCancelResidueWeight(OrderGoodsCancelParam goodsCancelParam);
 
     List<String> getOrderChildTruckList(String orderGoodsNo);
+
+    /**
+     * 编辑货单查询
+     * @param batchNumber
+     * @return
+     */
+    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -439,4 +439,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         return null;
     }
+
+    @Override
+    public OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber) {
+        OrderGoodsVO orderGoodsVO = orderGoodsDao.findOrderGoodsByBatchNumber(batchNumber);
+        return orderGoodsVO;
+    }
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -149,7 +149,7 @@ public class OrderGoodsSqlProvider {
                 "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time," +
-                "user_name,user_no) VALUES ");
+                "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
@@ -163,7 +163,8 @@ public class OrderGoodsSqlProvider {
                     .append(o.getSendLongitude()).append("','").append(o.getSendLatitude()).append("','").append(o.getReceiveLatitude()).append("','").append(o.getReceiveLongitude()).append("','")
                     .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("','").append(o.getGoodsName()).append("','")
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
-                    .append(o.getUserNo())
+                    .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
+                    .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime())
                     .append("')");
 
             if (i < orderGoodsList.size() - 1) {

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

@@ -6,10 +6,7 @@ import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.performance.component.GoodsOrderStrategyContext;
-import com.clx.performance.component.GoodsOrderTruckRecordComponent;
-import com.clx.performance.component.OrderGoodsIdGenerate;
-import com.clx.performance.component.OrderGoodsStatusLazyComponent;
+import com.clx.performance.component.*;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -61,6 +58,8 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
     private final RabbitTemplate rabbitTemplate;
 
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+    
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
 
 
     @Override
@@ -81,6 +80,7 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
 
         Map<String, LocalDateTime> mqMap = new HashMap<>();
         List<OrderGoods> orderGoodsList = new LinkedList<>();
+        long batchNumber = idGenerateSnowFlake.nextId(5L);
         for (OrderGoodsChildParams child : childParamsList) {
             if (OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode().equals(child.getPendingOrderWay())) {
                 if (child.getNeedTruckNum() == null) {
@@ -110,6 +110,8 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             //挂单时间
             LocalDateTime postedTime = DateUtils.parseDateTime(child.getPendingOrderTime()).get();
 
+            //设置批次号
+            orderGoods.setBatchNumber(batchNumber);
             if (sendLazyTime == null) {
                 sendLazyTime = postedTime;
             } else if (sendLazyTime.isAfter(postedTime)) {

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

@@ -7,10 +7,7 @@ import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.feign.OrderOwnTruckVo;
-import com.clx.performance.component.GoodsOrderStrategyContext;
-import com.clx.performance.component.GoodsOrderTruckRecordComponent;
-import com.clx.performance.component.OrderGoodsIdGenerate;
-import com.clx.performance.component.OrderGoodsStatusLazyComponent;
+import com.clx.performance.component.*;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -66,6 +63,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
 
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -88,6 +86,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
 
         long beginOrderGoodsId = orderGoodsIdGenerate.getOrderGoodsId(childParamsList.size());
         List<OrderGoods> orderGoodsList = new LinkedList<>();
+        long batchNumber = idGenerateSnowFlake.nextId(5L);
 
         for (OrderGoodsChildParams child : childParamsList) {
 
@@ -113,7 +112,8 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             orderGoods.setPendingOrderWay(child.getPendingOrderWay());
             //挂单时间
             LocalDateTime postedTime = DateUtils.parseDateTime(child.getPendingOrderTime()).get();
-
+            //设置批次号
+            orderGoods.setBatchNumber(batchNumber);
             if (sendLazyTime == null) {
                 sendLazyTime = postedTime;
             } else if (sendLazyTime.isAfter(postedTime)) {

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

@@ -6,10 +6,7 @@ import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.performance.component.GoodsOrderStrategyContext;
-import com.clx.performance.component.GoodsOrderTruckRecordComponent;
-import com.clx.performance.component.OrderGoodsIdGenerate;
-import com.clx.performance.component.OrderGoodsStatusLazyComponent;
+import com.clx.performance.component.*;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -61,6 +58,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
 
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -84,6 +82,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
         }
         Map<String, LocalDateTime> mqMap = new HashMap<>();
         List<OrderGoods> orderGoodsList = new LinkedList<>();
+        long batchNumber = idGenerateSnowFlake.nextId(5L);
 
         long beginOrderGoodsId = orderGoodsIdGenerate.getOrderGoodsId(childParamsList.size());
         for (OrderGoodsChildParams child : childParamsList) {
@@ -116,7 +115,8 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setPendingOrderWay(child.getPendingOrderWay());
             //挂单时间
             LocalDateTime postedTime = DateUtils.parseDateTime(child.getPendingOrderTime()).get();
-
+            //设置批次号
+            orderGoods.setBatchNumber(batchNumber);
             if (sendLazyTime == null) {
                 sendLazyTime = postedTime;
             } else if (sendLazyTime.isAfter(postedTime)) {