655称重过磅优化

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

@@ -1272,6 +1272,8 @@ public class GatekeeperOrderService {
             // 定义运单可以可放行的状态集合
             if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.WAIT_LOADING.getCode())) {
                 log.info("[出场下榜]抬杆,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
+                // 填充抬杆完成标签
+                updateWaybillOrderOpened(waybillOrder);
                 return Boolean.TRUE;
             }
             // 定义运单可以可放行的状态集合
@@ -1279,9 +1281,13 @@ public class GatekeeperOrderService {
                 KwtForkliftWaybillOrder forklift = forkliftWaybillOrderRepository.queryForkliftWaybillOrderByWOrderId(waybillOrder.getId());
                 if (Objects.equals(forklift.getStatus(), ForkliftStatusEnum.COMPLETED.getCode())) {
                     log.info("[出场下榜]铲车司机完成装载，空载离场过磅,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
+                    // 填充抬杆完成标签
+                    updateWaybillOrderOpened(waybillOrder);
                     return Boolean.TRUE;
                 } else {
                     log.info("[出场下榜]铲车司机未接单，空载离场过磅,校验出场结果：{}, 运单：{}", Boolean.TRUE, JSON.toJSONString(waybillOrder));
+                    // 填充抬杆完成标签
+                    updateWaybillOrderOpened(waybillOrder);
                     return Boolean.TRUE;
                 }
             }
@@ -1294,6 +1300,16 @@ public class GatekeeperOrderService {
         return Boolean.FALSE;
     }
 
+    /**
+     * 填充抬杆完成标签
+     * @param waybillOrder
+     */
+    private void updateWaybillOrderOpened(KwtWaybillOrder waybillOrder) {
+        waybillOrder.setOpened(1);
+        waybillOrderRepository.updateById(waybillOrder);
+        log.info("已完成全部过磅流程，运单：{}", JSON.toJSONString(waybillOrder));
+    }
+
     /**
      * 校验是否可放行
      * @param gatekeeper
@@ -1345,9 +1361,7 @@ public class GatekeeperOrderService {
             );
             Boolean result = PASS_STATUSES.contains(gatekeeperWaybillOrder.getStatus()) ? Boolean.TRUE : Boolean.FALSE;
             if(result) {
-                waybillOrder.setOpened(1);
-                waybillOrderRepository.updateById(waybillOrder);
-                log.info("已完成全部过磅流程，运单：{}", JSON.toJSONString(waybillOrder));
+                updateWaybillOrderOpend(waybillOrder);
             }
             log.info("最后过磅,校验出场是否可放行完成，抬杆结果：{}, 运单：{}", JSON.toJSONString(result), JSON.toJSONString(waybillOrder));
             return result;