货单数量修改

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

@@ -49,4 +49,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String childNo);
 
     OrderChild getGoingLatestOrderChild(Long driverUserNo);
+
+    int countValidByOrderGoodsNo(String orderGoodsNo);
+
 }

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

@@ -33,7 +33,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 
-    void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
+    void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListPageParam);
 

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

@@ -173,4 +173,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .orderByDesc(OrderChild::getId)
                 .last("limit 1"));
     }
+
+    @Override
+    public int countValidByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.countValidByOrderGoodsNo(orderGoodsNo);
+    }
+
 }

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

@@ -70,8 +70,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight) {
-        baseMapper.updateOrderGoodsWeightAndStatus(id, orderChildWeight, OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
+    public void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus) {
+        baseMapper.updateOrderGoodsWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 
 
@@ -42,4 +43,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pageCarrierOrderChildList")
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(@Param("page") Page<PageCarrierOrderChildVO> page, @Param("param") PageCarrierOrderChildParam param);
 
+    @Select("select count(1) from order_child where order_goods_no = #{orderGoodsNo} and status < 110")
+    int countValidByOrderGoodsNo(String orderGoodsNo);
+
 }
\ No newline at end of file

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

@@ -34,9 +34,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     IPage<OrderGoodsVO> pageOrderGoodsList(Page<OrderGoodsVO> page, PageOrderGoodsListParam param);
 
     @Update(" update order_goods set " +
-            " residue_transport_weight = residue_transport_weight-#{weight}," +
+            " residue_transport_weight = if (residue_transport_weight>#{weight}, residue_transport_weight-#{weight}, 0)," +
             " already_transport_weight = already_transport_weight+#{weight}," +
-            "order_goods_status = #{orderGoodsStatus}" +
+            "order_goods_status = if (residue_transport_weight>#{weight}, #{orderGoodsStatus}, 40) " +
             " where id = #{id}")
     void updateOrderGoodsWeightAndStatus(@Param("id") Integer id, @Param("weight") BigDecimal orderChildWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);
 

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

@@ -21,7 +21,7 @@ public interface OrderGoodsService {
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 
-    void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
+    void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsList(OrderGoodsListPageParam orderGoodsListParam);
 }

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

@@ -909,21 +909,51 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 更新货单数据
      */
     private void updateOrderGoodsAmount(OrderGoods orderGoods, BigDecimal weight){
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), weight);
+        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
+
+        Integer status = orderGoods.getOrderGoodsStatus();
+        if (count == 0){
+            status = OrderGoodsStatusEnum.Status.PAYING.getCode();
+        }
+        else {
+            status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
+        }
+
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), weight, status);
     }
 
     /**
      * 取消返吨数
      */
     private void updateOrderGoodsAmountReturn(OrderChild orderChild, OrderGoods orderGoods){
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight().negate());
+        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
+
+        Integer status = orderGoods.getOrderGoodsStatus();
+        if (count == 0){
+            status = OrderGoodsStatusEnum.Status.PAYING.getCode();
+        }
+        else {
+            status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
+        }
+
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight().negate(), status);
     }
 
     /**
      * 装车补偿
      */
     private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif){
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif);
+        int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
+
+        Integer status = orderGoods.getOrderGoodsStatus();
+        if (count == 0){
+            status = OrderGoodsStatusEnum.Status.PAYING.getCode();
+        }
+        else {
+            status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
+        }
+
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, status);
     }
 
     /**

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

@@ -75,8 +75,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
     @Override
-    public void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight) {
-        orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight);
+    public void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus) {
+        orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
     }
 
     @Override