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

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

@@ -96,6 +96,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
                 .set(OrderChild::getUnloadNet, item.getUnloadNet())
+                .set(OrderChild::getWeight, item.getWeight())
+                .set(OrderChild::getFreight, item.getFreight())
         );
     }
 

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

@@ -465,9 +465,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
         }
 
-        if (!loadCheck(param.getUnloadNet(), orderChild.getTruckLoad())){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
-        }
+//        if (!loadCheck(param.getUnloadNet(), orderChild.getTruckLoad())){
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
+//        }
 
         if (orderChild.getUnloadTime() == null && Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())) {
             updateUnloadFirst(param, orderChild);
@@ -603,9 +603,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (!loadCheck(param.getLoadNet(), orderChild.getTruckLoad())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_WEIGHT_ERROR);
         }
-        if (!loadCheck(param.getUnloadNet(), orderChild.getTruckLoad())){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
-        }
+//        if (!loadCheck(param.getUnloadNet(), orderChild.getTruckLoad())){
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
+//        }
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);