Merge remote-tracking branch 'origin/test' into test

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

@@ -2197,7 +2197,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         if (dif.compareTo(BigDecimal.ZERO) != 0) {
             BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo());
-            if(orderResidueWeight.compareTo(BigDecimal.ZERO) <= 0){
+
+            //增加吨数 && 订单剩余吨数小于等于0 ，则提示吨数不足
+            if(dif.compareTo(BigDecimal.ZERO) > 0 &&  orderResidueWeight.compareTo(BigDecimal.ZERO) <= 0){
                 throw new ServiceSystemException(ORDER_WEIGHT_LACK);
             }
             //运单修改装车吨数，从货单进行扣减