跳过雷达判断 手动选仓 自动选仓

Service/Execute/Step/CarPrepareState.cs

@@ -184,7 +184,7 @@ public class CarPrepareState : IState
 
                 }
 
-                return PadarMgr._PadarClient?.CarState == 6;
+                return PadarMgr._PadarClient?.CarState == 6 || machine.ManualSkipRadar;
             },
             () =>
             {
@@ -405,11 +405,12 @@ public class CarPrepareState : IState
                     //选包成功
                     _CommonMgr.LockBinAndUpdateAmt(orderBatteryInfo);
                     machine.SwapOrderBatteryInfo = orderBatteryInfo;
-                 
+
+                    bool isManual = StaticStationInfo.SelectPackManually == (int)SwapConstant.AutoOrManual.Manual;
                     machine.SelectPackFlag = true;
                     _CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.SelectPackSuccess,
-                        machine,"手动选包",param: JsonConvert.SerializeObject(machine.SwapOrderBatteryInfo)
+                        machine,isManual?"手动选包":"自动选包",param: JsonConvert.SerializeObject(machine.SwapOrderBatteryInfo)
-                        ,type:(int)SwapConstant.StepType.MANUAL);
+                        ,type:isManual?(int)SwapConstant.StepType.MANUAL:(int)SwapConstant.StepType.AUTO);
                 }
             }, () =>
             {

Service/Execute/Step/StationReadyState.cs

@@ -217,7 +217,7 @@ public class StationReadyState : IState
                     
                 }
 
-                return PadarMgr._PadarClient?.CarState == 6;
+                return PadarMgr._PadarClient?.CarState == 6 ||  machine.ManualSkipRadar;
             },
             () =>
             {

WebStarter/db/lxw0607.sql

@@ -1,51 +0,0 @@
-/*
-Navicat MySQL Data Transfer
-
-Source Server         : rszn-dev
-Source Server Version : 80034
-Source Host           : 192.168.2.2:3306
-Source Database       : huanneng_dev
-
-Target Server Type    : MYSQL
-Target Server Version : 80034
-File Encoding         : 65001
-
-Date: 2024-06-07 14:58:49
-*/
-
-SET FOREIGN_KEY_CHECKS=0;
-
--- ----------------------------
--- Table structure for emeter_energy
--- ----------------------------
-DROP TABLE IF EXISTS `emeter_energy`;
-CREATE TABLE `emeter_energy` (
-                                 `id` varchar(255) NOT NULL,
-                                 `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '电表编码',
-                                 `value` float(10,4) DEFAULT NULL COMMENT '电表当前读数',
-  `upload_time` datetime DEFAULT NULL COMMENT '充电机上报时间',
-  `upload_flag` int DEFAULT NULL COMMENT '0未上传1上传',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='电表小时';
-
--- ----------------------------
--- Table structure for emeter_energy_change
--- ----------------------------
-DROP TABLE IF EXISTS `emeter_energy_change`;
-CREATE TABLE `emeter_energy_change` (
-                                        `id` varchar(255) NOT NULL,
-                                        `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '电表编码',
-                                        `value` float(10,4) DEFAULT NULL COMMENT '电表当前读数',
-  `upload_time` datetime DEFAULT NULL COMMENT '充电机上报时间',
-  `upload_flag` int DEFAULT NULL COMMENT '0未上传1上传',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='电表小时';
--- 添加换电类型
-ALTER TABLE swap_order_report_cloud ADD `upload_time`  datetime DEFAULT NULL COMMENT "上报时间" ;
-
--- 添加入仓时间
-ALTER TABLE bin_info ADD `in_time`  datetime DEFAULT NULL COMMENT "入仓时间" ;
-
--- 添加站外充电枪编号
-ALTER TABLE charge_order ADD COLUMN out_charger_gun_no VARCHAR(255) COMMENT '站外充电枪编号,1枪或2枪';
-