655项目需求变更

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

@@ -109,7 +109,9 @@ public class GatekeeperOrderService {
         }
 
         Long userId = LoginUserHolder.getUserId();
+        log.info("门卫用户id:{}", userId);
         KwsUserResDto kwsUserResDto = remoteSystemService.queryByUserId(userId);
+        log.info("门卫用户信息:{}", JSON.toJSONString(kwsUserResDto));
         if (kwsUserResDto == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "用户数据不能为空！");
         }

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

@@ -1688,26 +1688,11 @@ public class WaybillOrderService {
                 CarWaybillV1Enum.REPLENISH_FINISH.getCode()
         );
         List<KwtWaybillOrder> waybillOrders = waybillOrderRepository.findWbOrderByTruckNoAndStatus(param.getTruckNo(), FORBIDDEN_STATUSES);
-        // 山下称重过磅
-        if (param.getWeighbridgeId() == 10003L) {
-            log.info("[山下称重过磅]山下开始称重过磅，入参参数：{}", JSON.toJSONString(param));
-            //若无运单，直接返回
-            if (CollectionUtils.isEmpty(waybillOrders)) {
-               return;
-            } else {
-                commonComeInto(param, waybillOrders, FORBIDDEN_STATUSES);
-            }
-            log.info("[山下称重过磅]山下称重过磅结束!");
-        } else {
-            // 山上称重过磅
-            log.info("[山上称重过磅]山上开始称重过磅，入参参数：{}", JSON.toJSONString(param));
-            if (CollectionUtils.isEmpty(waybillOrders)) {
-                throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "[山上称重过磅]当前车辆没有称重过磅状态的运单!");
-            }
-            commonComeInto(param, waybillOrders, FORBIDDEN_STATUSES);
-            log.info("[山上称重过磅]山上称重过磅结束！");
+        // 称重过磅
+        if (CollectionUtils.isEmpty(waybillOrders)) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "[山上称重过磅]当前车辆没有称重过磅状态的运单!");
         }
-
+        commonComeInto(param, waybillOrders, FORBIDDEN_STATUSES);
         log.info("[过磅]过磅结束！");
     }