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

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/GatekeeperOrderService.java

@@ -892,7 +892,7 @@ public class GatekeeperOrderService {
         updateWaybillOrderStatus2(gatekeeper, param, waybillOrder, isEmptyLoadLeave);
 
         //4. 创建门卫卸货订单
-        creatGatekeeperUnLoadingOrder(gatekeeper, waybillOrder);
+        creatGatekeeperUnLoadingOrder(gatekeeper, waybillOrder, isEmptyLoadLeave);
     }
 
     /**
@@ -1015,7 +1015,7 @@ public class GatekeeperOrderService {
      *
      * @param waybillOrder
      */
-    private void creatGatekeeperUnLoadingOrder(KwtGatekeeperWaybillOrder gatekeeperOrder, KwtWaybillOrder waybillOrder) {
+    private void creatGatekeeperUnLoadingOrder(KwtGatekeeperWaybillOrder gatekeeperOrder, KwtWaybillOrder waybillOrder, Boolean isEmptyLoadLeave) {
         log.info("[门卫放行]开始创建卸货门卫订单：{}", JSON.toJSONString(waybillOrder));
         // 原矿卸货放行不需要创建门卫订单
         if (Objects.equals(gatekeeperOrder.getType(), GatekeeperTypeEnum.UNLOADING.getCode())) {
@@ -1023,6 +1023,10 @@ public class GatekeeperOrderService {
             return;
         }
 
+        if (isEmptyLoadLeave) {
+            log.info("[门卫放行]空载离场的原矿订单不需要创建卸货门卫订单：{}", JSON.toJSONString(waybillOrder));
+        }
+
         // 只有原矿运输的才会新增卸货门卫订单
         KwtLogisticsOrder logisticsOrder = getLogisticsOrder(waybillOrder.getLOrderId());
         if (!Objects.equals(1, logisticsOrder.getOrderType())) {

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 普通结算