货单编辑

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

@@ -4,75 +4,28 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class OrderGoodsEditParams {
 
     private Integer id;
 
-    @ApiModelProperty("订单编号")
-    private String orderNo;
-
     @ApiModelProperty("货单编号")
     private String orderGoodsNo;
 
-    @ApiModelProperty("用车需求： 1平台车辆 2部分平台车辆 3自有车辆")
-    private Integer truckDemand;
-
     @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
     private Integer vehicleUsage;
 
-    @ApiModelProperty("货单状态")
-    private Integer orderGoodsStatus;
-
-    @ApiModelProperty("损耗单价(分)")
-    private BigDecimal lossPrice;
-
     @ApiModelProperty("提取吨数")
     private BigDecimal extractWeight;
 
     @ApiModelProperty("剩余拉运吨数")
     private BigDecimal residueTransportWeight;
 
-    @ApiModelProperty("已拉运吨数")
-    private BigDecimal alreadyTransportWeight;
-
-    @ApiModelProperty("发货地址ID")
-    private Integer sendAddressId;
-
-    @ApiModelProperty("发货地址简称")
-    private String sendAddressShorter;
-
-    @ApiModelProperty("发货地址经度")
-    private BigDecimal sendLongitude;
-
-    @ApiModelProperty("发货地址纬度")
-    private BigDecimal sendLatitude;
-
-    @ApiModelProperty("收货地址ID")
-    private Integer receiveAddressId;
-
-    @ApiModelProperty("收货地址简称")
-    private String receiveAddressShorter;
-
-    @ApiModelProperty("收货地址经度")
-    private BigDecimal receiveLongitude;
-
-    @ApiModelProperty("收货地址纬度")
-    private BigDecimal receiveLatitude;
-
-    @ApiModelProperty("货物ID")
-    private Integer goodsId;
-
-    @ApiModelProperty("货物名称")
-    private String goodsName;
-
     @ApiModelProperty("挂单方式  1公开派单  2定向派单")
     private Integer pendingOrderWay;
 
-    @ApiModelProperty("定向运单失效时间")
-    private String directionalExpireTime;
-
     @ApiModelProperty("'最晚接单时间'")
     private String lastOrderTime;
     
@@ -82,7 +35,7 @@ public class OrderGoodsEditParams {
     @ApiModelProperty("最晚装货时间")
     private String lastLoadTime;
 
-    @ApiModelProperty("'最晚到达目的地时间'")
+    @ApiModelProperty("最晚到达目的地时间")
     private String lastArriveReceiveTime;
 
     @ApiModelProperty("挂单时间")
@@ -94,12 +47,6 @@ public class OrderGoodsEditParams {
     @ApiModelProperty("需要车辆/辆")
     private Integer needTruckNum;
 
-    @ApiModelProperty("高级物流经理id")
-    private Integer seniorLogisticsManagerId;
-
-    @ApiModelProperty("高级物流经理姓名")
-    private String seniorLogisticsManagerName;
-
     @ApiModelProperty("挂单运费")
     private BigDecimal pendingOrderFreight;
 
@@ -109,18 +56,12 @@ public class OrderGoodsEditParams {
     @ApiModelProperty("创建人姓名")
     private String userName;
 
-    @ApiModelProperty("结算账期  1拉运完成结  2月结")
-    private Integer settlementAccountPeriod;
-
-    @ApiModelProperty("是否暂停 0：否   1：是")
-    private Integer stopFlag;
-
     @ApiModelProperty("批次号")
     private Long batchNumber;
 
-    @ApiModelProperty("创建时间")
-    private String createTime;
-
     @ApiModelProperty("修改时间")
     private String modifiedTime;
+
+    @ApiModelProperty("车辆列表")
+    private List<String> truckList;
 }

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -49,11 +49,21 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final OrderChildDao orderChildDao;
 
-    //根据货单最晚接单时间处理的
+    //根据货单最晚接单时间处理
     public void expireProduceByLastOrderTime(LocalDateTime localDateTime, String orderGoodsNo) {
         redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
 
+    //删除货单最晚接单时间处理
+    public void deleteRedisRecordForLastOrderTime(String orderGoodsNo) {
+        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo);
+    }
+
+    //删除货单最晚到达货源地时间处理
+    public void deleteRedisRecordForLastArriveSendTime(String orderGoodsNo) {
+        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
+    }
+
     public void expireProduceByLastArriveSendTime(LocalDateTime localDateTime, String orderGoodsNo) {
         redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }

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

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
@@ -64,4 +65,8 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
 
     List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
+
+    List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos);
+
+    Integer updateOrderGoods(OrderGoodsEditParams orderGoodsEditParams);
 }

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

@@ -42,4 +42,6 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     List<OrderGoodsTruckBind> getTrucksBindByOrderGoodsNo(String orderGoodsNo,String truckNo);
 
     List<OrderGoodsTruckBind>  judgeTruckIsBindDxOrder(Set<String> set);
+
+    void deleteByIds(List<Integer> ids);
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
@@ -173,5 +174,15 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return baseMapper.findOrderGoodsByBatchNumber(batchNumber);
     }
 
+    @Override
+    public List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos) {
+        return baseMapper.selectList(lQrWrapper().in(OrderGoods::getOrderGoodsNo, orderNos));
+    }
+
+    @Override
+    public Integer updateOrderGoods(OrderGoodsEditParams orderGoodsEditParams) {
+        return baseMapper.updateOrderGoods(orderGoodsEditParams);
+    }
+
 
 }

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

@@ -133,4 +133,9 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         query.in(OrderGoodsTruckBind :: getStatus,OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
         return baseMapper.selectList(query);
     }
+
+    @Override
+    public void deleteByIds(List<Integer> ids) {
+        baseMapper.deleteBatchIds(ids);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
@@ -60,4 +61,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "findOrderGoodsByBatchNumber")
     List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
+
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods")
+    Integer updateOrderGoods(@Param(value = "param") OrderGoodsEditParams orderGoodsEditParams);
 }

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

@@ -12,6 +12,8 @@ import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
+import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
@@ -37,6 +39,7 @@ import com.msl.common.base.Optional;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -48,10 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -87,6 +87,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
     private OrderChildDao orderChildDao;
 
+    private GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+
+    private OrderGoodsStatusLazyComponent orderGoodsStatusLazyComponent;
+
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
@@ -240,11 +244,72 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
 
+    /**
+     * 编辑货单提交
+     * @param param
+     */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateEditOrderGoods(UpdateEditOrderGoodsParam param) {
         List<OrderGoodsEditParams> childParamsList = param.getOrderGoodsChildParams();
-        List<OrderChild> orderChildList = orderChildDao.selectListByOrderGoodsList(childParamsList.stream().map(OrderGoodsEditParams::getOrderGoodsNo).collect(Collectors.toList()));
+        List<String> orderGoodsNos = childParamsList.stream().map(OrderGoodsEditParams::getOrderGoodsNo).collect(Collectors.toList());
+        List<OrderGoods> orderGoodsList = orderGoodsDao.selectListByOrderGoodsList(orderGoodsNos);
+
+        Map<String, List<OrderGoods>> orderGoodsMap = orderGoodsList.stream()
+                .collect(Collectors.groupingBy(OrderGoods::getOrderGoodsNo));
+
+        for (OrderGoodsEditParams orderGoodsEditParams : childParamsList) {
+            String orderGoodsNo = orderGoodsEditParams.getOrderGoodsNo();
+            OrderGoods oldOrderGoods = orderGoodsMap.get(orderGoodsNo).get(0);
+            List<OrderChild> orderChildList = orderChildDao.selectListByOrderGoodsList(orderGoodsNos);
+            boolean pendingOrderWayFlag = CollectionUtils.isNotEmpty(orderChildList);
+
+            if (pendingOrderWayFlag) {
+                Integer pendingOrderWay = oldOrderGoods.getPendingOrderWay();
+                if (!pendingOrderWay.equals(orderGoodsEditParams.getPendingOrderWay())) {
+                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单不允许更改挂单方式");
+                }
+            }
+
+            if (oldOrderGoods.getAlreadyTransportWeight().compareTo(orderGoodsEditParams.getExtractWeight()) > 0 ) {
+                //修改后的货单提取吨数小于已拉运的吨数
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数不应小于已经拉运的吨数");
+            }
+
+            if (orderChildList.size() < oldOrderGoods.getNeedTruckNum()) {
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "需要车辆数不能小于当前已经接单的运单数量");
+            }
 
+            List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo);
+            List<OrderGoodsTruckBind> getChildList = null;
+            if (CollectionUtils.isNotEmpty(truckBindList)) {
+                List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i -> !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
+                //已接单的记录
+                getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
+                orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));
+                for (OrderGoodsTruckBind bind : deleteList) {
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsNo, bind.getTruckNo());
+                }
+
+            }
+            LocalDateTime now = LocalDateTime.now();
+            List<String> truckList = orderGoodsEditParams.getTruckList();
+            if (CollectionUtil.isNotEmpty(truckList)) {
+                if (CollectionUtil.isNotEmpty(getChildList)) {
+                    truckList.retainAll(getChildList.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList()));
+                }
+                orderGoodsTruckBindDao.saveBatchEntity(param.getOrderNo(), orderGoodsNo, truckList, now);
+                goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, truckList);
+            }
+
+            orderGoodsStatusLazyComponent.deleteRedisRecordForLastOrderTime(orderGoodsNo);
+            orderGoodsStatusLazyComponent.deleteRedisRecordForLastArriveSendTime(orderGoodsNo);
+
+            orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(DateUtils.parseDateTime(orderGoodsEditParams.getLastOrderTime(), "yyyy-MM-dd HH:mm:ss").get(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastArriveSendTime(DateUtils.parseDateTime(orderGoodsEditParams.getLastArriveSendTime(), "yyyy-MM-dd HH:mm:ss").get(), orderGoodsNo);
+
+            orderGoodsDao.updateOrderGoods(orderGoodsEditParams);
+        }
 
     }
 

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

 package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsStopEnum;
@@ -208,4 +209,28 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+    public String updateOrderGoods(@Param(value ="params") OrderGoodsEditParams params){
+        String sql = new SQL() {{
+            UPDATE("order_goods")
+                    .SET("vehicle_usage = #{params.vehicleUsage}")
+                    .SET("extract_weight = #{params.extractWeight}")
+                    .SET("residue_transport_weight = #{params.residueTransportWeight}")
+                    .SET("pending_order_way = #{params.pendingOrderWay}")
+                    .SET("last_order_time = #{params.lastOrderTime}")
+                    .SET("last_arrive_send_time = #{params.lastArriveSendTime}")
+                    .SET("last_load_time = #{params.lastLoadTime}")
+                    .SET("last_arrive_receive_time = #{params.lastArriveReceiveTime}")
+                    .SET("pending_order_time = #{params.pendingOrderTime}")
+                    .SET("extract_way = #{params.extractWay}")
+                    .SET("need_truck_num = #{params.needTruckNum}")
+                    .SET("pending_order_freight = #{params.pendingOrderFreight}")
+                    .SET("user_no = #{params.userNo}")
+                    .SET("user_name = #{params.userName}")
+                    .SET("batch_number = #{params.batchNumber}")
+                    .WHERE("id = #{params.id}");
+
+        }}.toString();
+        return sql;
+    }
+
 }

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

@@ -163,7 +163,7 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             }
             mqMap.put(orderGoodsNo, postedTime);
             orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
-
+            orderGoodsStatusLazyComponent.expireProduceByLastArriveSendTime(orderGoods.getLastArriveReceiveTime(), orderGoodsNo);
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);
         }

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

@@ -175,6 +175,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             }
             mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
             orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastArriveSendTime(orderGoods.getLastArriveReceiveTime(), orderGoodsNo);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
 

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

@@ -170,6 +170,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             }
             mqMap.put(orderGoodsNo, postedTime);
             orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastArriveSendTime(orderGoods.getLastArriveReceiveTime(), orderGoodsNo);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);