门卫新增货损率逻辑

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -13,6 +13,7 @@ import com.sckw.fleet.api.model.vo.RDriverScoreVo;
 import com.sckw.fleet.api.model.vo.RDriverVo;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
+import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.order.api.model.OrderDetailVo;
 import com.sckw.order.api.model.UpdateActualAmountParam;
 import com.sckw.product.api.model.KwpGoods;
@@ -153,7 +154,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         driverBindTruck(waybillOrder);
 
         //8、生成门卫订单
-        createGatekeeperWaybillOrder(waybillOrder, truck, truckLoadVolume);
+        createGatekeeperWaybillOrder(logOrder, waybillOrder, truck, truckLoadVolume);
 
         BusinessContext.set("createdWaybillOrder", waybillOrder);
 
@@ -166,9 +167,22 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      * @param waybillOrder
      * @param truckLoadVolume
      */
-    private void createGatekeeperWaybillOrder(KwtWaybillOrder waybillOrder, RTruckVo truck, BigDecimal truckLoadVolume) {
+    private void createGatekeeperWaybillOrder(KwtLogisticsOrder logOrder, KwtWaybillOrder waybillOrder,
+                                              RTruckVo truck, BigDecimal truckLoadVolume) {
+        log.info("开始创建门卫订单，入参参数：{}", JSON.toJSONString(waybillOrder));
         CompletableFuture.runAsync(() -> {
             try {
+//                Long entId = null;
+//                // 原矿运输山上、上下门卫企业id
+//                List<Long> mockEntIds = Arrays.asList(538039617157337089L, 538040297439891457L);
+//                if (Objects.equals(1, logOrder.getOrderType())) {
+//                    entId = mockEntIds.get(0);
+//                } else {
+//                    OrderDetailRes tradeOrderDetail = tradeOrderInfoService.
+//                }
+
+
+
                 KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
                 gatekeeper.setEntId(waybillOrder.getEntId());
                 gatekeeper.setWOrderId(waybillOrder.getId());

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

@@ -427,7 +427,7 @@ public class GatekeeperOrderService {
         }
 
         // 原矿运输
-        if (isRawOre) {
+        if (isRawOre && Objects.equals(gatekeeperWaybillOrder.getType(),2)) {
             //装货净重
             BigDecimal loadAmount = ticket.getAmount();
             //卸货净重