1.新增原矿物流订单自动完结

2.跟新正常流程装货过磅逻辑

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -4171,6 +4171,11 @@ public class KwtLogisticsConsignmentService {
 
     private void calculateFreight(List<KwtLogisticsOrder> completedLogisticsOrders) {
         for (KwtLogisticsOrder logisticsOrder : completedLogisticsOrders) {
+            // 原矿运输的不需要计算运费
+            if (Objects.equals(logisticsOrder.getOrderType(),1)) {
+                log.info("原矿运输订单不需要计算费用！");
+                return;
+            }
             //物流订单已完结，计算待付运费
             if (Objects.equals(logisticsOrder.getSettlement(), 1)) {
                 //todo 普通结算

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -1741,6 +1741,8 @@ public class WaybillOrderService {
             if (Objects.equals(param.getEntId(), unitInfoDetailVO.getEntId())) {
                 // 装货过磅
                 comeIntoHandler(param, waybillOrder);
+            } else {
+                throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "[称重过磅]产品销售的供应商不属当前过磅企业!");
             }
         }
         log.info("[过磅]过磅结束！");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/task/LogisticsOrderCompletionTask.java

@@ -183,6 +183,12 @@ public class LogisticsOrderCompletionTask {
 
     private void calculateFreight(List<KwtLogisticsOrder> completeLogisticOrders){
         for (KwtLogisticsOrder logisticsOrder : completeLogisticOrders) {
+            // 原矿运输的不需要计算运费
+            if (Objects.equals(logisticsOrder.getOrderType(),1)) {
+                log.info("原矿运输订单不需要计算费用！");
+                return;
+            }
+
             //物流订单已完结，计算待付运费
             if(Objects.equals(logisticsOrder.getSettlement(),1)){
                 //todo 普通结算