donglang 4 недель назад
Родитель
Сommit
3a756282d4

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

@@ -757,7 +757,7 @@ public class GatekeeperOrderService {
             creatPassLogo(subtask, waybillOrder, remark3);
 
         }
-
+        log.info("[门卫放行]创建车辆运单-节点轨迹完成!");
     }
 
     /**
@@ -810,6 +810,7 @@ public class GatekeeperOrderService {
      * @return
      */
     private Boolean calculateEmptyLoad(KwtWaybillOrder waybillOrder) {
+        log.info("[门卫放行]计算是否空载离场:{}", JSON.toJSONString(waybillOrder));
         //查询运单装卸货信息
         KwtWaybillOrderTicket orderTicket = waybillOrderTicketRepository.queryByWOrderIdByIdAndType(waybillOrder.getId(), 1);
         if (orderTicket == null) {
@@ -818,7 +819,9 @@ public class GatekeeperOrderService {
         BigDecimal loadAmount = orderTicket.getAmount();
 
         //空载离场,净重<=0.5
-        return loadAmount != null && loadAmount.compareTo(BigDecimal.valueOf(0.5)) <= 0;
+        boolean result = loadAmount != null && loadAmount.compareTo(BigDecimal.valueOf(0.5)) <= 0;
+        log.info("[门卫放行]计算是否空载离场完成:{}", JSON.toJSONString(result));
+        return result;
     }
 
 
@@ -827,6 +830,7 @@ public class GatekeeperOrderService {
      * @param gatekeeper
      */
     private void updateGatekeeperOrderStatus2(KwtGatekeeperWaybillOrder gatekeeper, GatekeeperOrderPassParam param, Boolean isEmptyLoadLeave) {
+        log.info("[门卫放行]更改门卫状态为已放行:{}", JSON.toJSONString(gatekeeper));
         if (!GatekeeperStatusEnum.PENDING_RELEASE.getCode().equals(gatekeeper.getStatus())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.FORKLIFT_ORDER_STATUS_ERROR, "当前门卫订单状态异常,不能放行!");
         }
@@ -838,6 +842,7 @@ public class GatekeeperOrderService {
         gatekeeper.setGatekeeperName(param.getGatekeeperName());
         gatekeeper.setUpdateUser(param.getGatekeeperUserId());
         gatekeeperWaybillOrderRepository.updateById(gatekeeper);
+        log.info("[门卫放行]更改门卫状态已放行完成!");
     }
 
     /**
@@ -861,6 +866,7 @@ public class GatekeeperOrderService {
      * @param gatekeeper
      */
     private void updateWaybillStatus2(KwtGatekeeperWaybillOrder gatekeeper, KwtWaybillOrder waybillOrder,Boolean isEmptyLoadLeave) {
+        log.info("[门卫放行]更改运单状态为已离场/空载离场:{}", JSON.toJSONString(gatekeeper));
         //装货单
         if (Objects.equals(gatekeeper.getType(), GatekeeperTypeEnum.LOADING.getCode())) {
             if (!CarWaybillV1Enum.WAIT_RELEASE.getCode().equals(waybillOrder.getStatus())) {
@@ -880,6 +886,7 @@ public class GatekeeperOrderService {
             waybillOrder.setStatus(CarWaybillV1Enum.COMPLETED.getCode());
         }
         waybillOrderRepository.updateById(waybillOrder);
+        log.info("[门卫放行]更改运单状态为已离场/空载离场完成!");
     }
 
     /**
@@ -887,6 +894,7 @@ public class GatekeeperOrderService {
      * @param gatekeeper
      */
     private void updateWaybillSubtaskStatus2(KwtGatekeeperWaybillOrder gatekeeper, Boolean isEmptyLoadLeave) {
+        log.info("[门卫放行]更改子运单状态为已离场/空载离场:{}", JSON.toJSONString(gatekeeper));
         KwtWaybillOrderSubtask waybillSubtask = waybillOrderSubtaskRepository.queryByWOrderId(gatekeeper.getWOrderId());
         if (waybillSubtask == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_SUB_NOT_FOUND, "未找到关联的子运单!");
@@ -907,6 +915,7 @@ public class GatekeeperOrderService {
             waybillSubtask.setStatus(CarWaybillV1Enum.COMPLETED.getCode());
         }
         waybillOrderSubtaskRepository.updateById(waybillSubtask);
+        log.info("[门卫放行]更改子运单状态为已离场/空载离场完成!");
     }
 
 
@@ -916,6 +925,7 @@ public class GatekeeperOrderService {
      * @param waybillOrder
      */
     private void creatGatekeeperUnLoadingOrder(KwtWaybillOrder waybillOrder) {
+        log.info("[门卫放行]开始创建卸货门卫订单:{}", JSON.toJSONString(waybillOrder));
         // 只有原矿运输的才会新增卸货门卫订单
         KwtLogisticsOrder logisticsOrder = getLogisticsOrder(waybillOrder.getLOrderId());
         if (!Objects.equals(1, logisticsOrder.getStatus())) {