655称重过磅优化

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

@@ -1261,24 +1261,29 @@ public class GatekeeperOrderService {
             }
             if (Objects.equals(forklift.getStatus(), ForkliftStatusEnum.COMPLETED.getCode())) {
                 Boolean result = Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.EXIT_COMPLETED.getCode()) ? Boolean.TRUE : Boolean.FALSE;
-                log.info("[出场上榜]铲车司机完成装载，抬杆结果：{}, 运单：{}", Boolean.FALSE, JSON.toJSONString(waybillOrder));
+                log.info("[出场上榜]铲车司机完成装载，抬杆结果：{}, 运单：{}", result, JSON.toJSONString(waybillOrder));
                 return result;
             }
 
             Boolean result = Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.REFUSE_TRAFFIC.getCode()) ? Boolean.TRUE : Boolean.FALSE;
-            log.info("[进场下榜/出场上榜]抬杆,校验出场结果：{}, 运单：{}", JSON.toJSONString(result), JSON.toJSONString(waybillOrder));
+            log.info("[进场下榜/出场上榜]抬杆,校验出场结果：{}, 运单：{}", result, JSON.toJSONString(waybillOrder));
             return result;
         } else {
-            // 定义运单可以可放行的状态集合
+            KwtForkliftWaybillOrder forklift = forkliftWaybillOrderRepository.queryForkliftWaybillOrderByWOrderId(waybillOrder.getId());
+            if (Objects.equals(forklift.getStatus(), ForkliftStatusEnum.COMPLETED.getCode())) {
+                Boolean result = Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.EXIT_COMPLETED.getCode()) ? Boolean.TRUE : Boolean.FALSE;
+                log.info("[出场上榜]运输司机回退，铲车司机完成装载，抬杆结果：{}, 运单：{}", result, JSON.toJSONString(waybillOrder));
+                return result;
+            }
+
             if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.WAIT_LOADING.getCode())) {
                 log.info("[出场下榜]抬杆,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
                 // 填充抬杆完成标签
                 updateWaybillOrderOpened(waybillOrder);
                 return Boolean.TRUE;
             }
-            // 定义运单可以可放行的状态集合
+
             if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())) {
-                KwtForkliftWaybillOrder forklift = forkliftWaybillOrderRepository.queryForkliftWaybillOrderByWOrderId(waybillOrder.getId());
                 if (Objects.equals(forklift.getStatus(), ForkliftStatusEnum.COMPLETED.getCode())) {
                     log.info("[出场下榜]铲车司机完成装载，空载离场过磅,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
                     // 填充抬杆完成标签
@@ -1292,7 +1297,7 @@ public class GatekeeperOrderService {
                 }
             }
             if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.REFUSE_TRAFFIC.getCode())) {
-                log.info("[出场下榜]铲车未接单，有重量过磅,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
+                log.info("[出场下榜]铲车未接单，有重量过磅,校验出场结果：{}, 运单：{}", Boolean.FALSE, JSON.toJSONString(waybillOrder));
                 return Boolean.FALSE;
             }
         }