From 6bff484432905b36f69de472e99468edbea11bb0 Mon Sep 17 00:00:00 2001
From: zgw <13623675548@163.com>
Date: Fri, 31 Jul 2026 09:59:53 +0800
Subject: [PATCH] chore: restore source from initial FT546MWS archive

---
 AGENTS.md                                     |  479 +++
 pom.xml                                       |    2 +-
 .../src/main/java/com/ruoyi/Dzp/DzpSend.java  |  120 +
 .../java/com/ruoyi/Dzp/LEDSender2010.java     | 3235 +++++++++++++++++
 .../src/main/java/com/ruoyi/Dzp/Lzss.java     |  164 +
 .../main/java/com/ruoyi/Dzp/MyUdpSocket.java  |   93 +
 .../main/java/com/ruoyi/Dzp/ProtocolDemo.java |  995 +++++
 .../java/com/ruoyi/Dzp/domain/basLed.java     |   27 +
 .../com/ruoyi/Dzp/mapper/BasLedMapper.java    |   15 +
 .../api/controller/ToErpApiController.java    |   64 +-
 .../api/controller/ToWmsApiController.java    |  137 +-
 .../ruoyi/api/domain/CallBackErpItems.java    |   95 +-
 .../api/domain/DeliveryNoticeItemVo.java      |    5 +-
 .../com/ruoyi/api/domain/RequestEnter.java    |    3 +
 .../com/ruoyi/api/domain/WmsJobRequest.java   |    2 +
 .../com/ruoyi/api/service/IToErpService.java  |    2 +
 .../api/service/impl/ToErpServiceImpl.java    |   95 +-
 .../api/service/impl/ToWmsServiceImpl.java    |    2 +
 .../ruoyi/bas/agvPoint/domain/AgvTask.java    |   22 +
 .../service/impl/CheckStockinServiceImpl.java |    4 +-
 .../agv/mapper/AgvContainerTaskMapper.java    |    2 +
 .../agv/service/IAgvContainerTaskService.java |    2 +
 .../impl/AgvContainerTaskServiceImpl.java     |    5 +
 .../ruoyi/in/stockin/domain/InStockin.java    |   27 +
 .../in/stockin/mapper/InStockinMapper.java    |    2 +
 .../in/stockin/service/IInStockinService.java |    2 +-
 .../service/impl/InStockinServiceImpl.java    |    5 +
 .../stockindetail/domain/InStockinDetail.java |    4 +-
 .../stockinfinish/domain/InStockinFinish.java |    9 +
 .../com/ruoyi/job/mydojob/domain/MydoJob.java |   20 +
 .../job/mydojob/mapper/MydoJobMapper.java     |    4 +
 .../log/controller/RequestLogController.java  |   28 +
 .../ruoyi/log/mapper/RequestLogMapper.java    |    6 +
 .../ruoyi/log/service/IRequestLogService.java |    5 +
 .../service/impl/RequestLogServiceImpl.java   |   20 +-
 .../ViewHandAllotStockController.java         |    3 +
 .../domain/ViewHandAllotStock.java            |   34 +-
 .../controller/OutStockoutController.java     |   26 +-
 .../outStockout/mapper/OutStockoutMapper.java |    2 +
 .../service/IOutStockoutService.java          |    1 +
 .../service/impl/OutStockoutServiceImpl.java  |    5 +
 .../ViewProductAndStockController.java        |    2 +-
 .../ruoyi/pda/controller/PdaController.java   |  200 +-
 .../ruoyi/pda/domain/TrayCodeMakeSure.java    |    3 +
 .../com/ruoyi/pda/domain/TrayCodeMsg.java     |   14 +-
 .../java/com/ruoyi/pda/mapper/PdaMapper.java  |   14 +-
 .../com/ruoyi/pda/service/PdaService.java     |    6 +-
 .../com/ruoyi/pda/service/PdaServiceImp.java  |   70 +-
 .../controller/BasStockHcController.java      |  104 -
 .../stock/hcstock/domain/BasStockHc.java      |  562 ---
 .../hcstock/mapper/BasStockHcMapper.java      |   61 -
 .../hcstock/service/IBasStockHcService.java   |   61 -
 .../service/impl/BasStockHcServiceImpl.java   |   93 -
 .../stock/controller/BasStockController.java  |   10 +-
 .../ruoyi/stock/stock/domain/BasStock.java    |    3 +
 .../stock/stock/mapper/BasStockMapper.java    |   15 +-
 .../stock/stock/service/IBasStockService.java |    6 +
 .../service/impl/BasStockServiceImpl.java     |   28 +-
 .../src/main/resources/application.yml        |    6 +-
 .../mapper/agv/AgvContainerTaskMapper.xml     |    9 +-
 .../resources/mapper/bas/AgvPointMapper.xml   |    2 +-
 .../resources/mapper/bas/BasLedMapper.xml     |   65 +
 .../bas/cargoSpace/BasCargoSpaceMapper.xml    |    6 +-
 .../mapper/in/InStockinDetailMapper.xml       |   11 +
 .../mapper/in/InStockinFinishMapper.xml       |    4 +-
 .../resources/mapper/in/InStockinMapper.xml   |   98 +-
 .../mapper/job/MydoJobDetailMapper.xml        |   14 +-
 .../mapper/job/MydoJobFinishMapper.xml        |    8 +-
 .../resources/mapper/job/MydoJobMapper.xml    |   22 +
 .../mapper/agv/AgvContainerTaskMapper.xml     |  105 -
 .../mapper/mapper/ai/ChatMessageMapper.xml    |  118 -
 .../mapper/mapper/ai/ConversationsMapper.xml  |  108 -
 .../mapper/mapper/api/JobStatisticsMapper.xml |   36 -
 .../mapper/mapper/api/KnowledgeFileMapper.xml |  106 -
 .../mapper/mapper/api/MoveMsgMapper.xml       |  108 -
 .../mapper/bas/BasContainerDetailsMapper.xml  |   93 -
 .../mapper/mapper/bas/BasContainerMapper.xml  |  105 -
 .../mapper/mapper/bas/BasCustomerMapper.xml   |  152 -
 .../mapper/mapper/bas/BasJobIdMapper.xml      |  165 -
 .../mapper/bas/BasProductCodeMapper.xml       |  132 -
 .../mapper/mapper/bas/BasProductMapper.xml    |  290 --
 .../mapper/bas/BasProductPortMapper.xml       |   77 -
 .../mapper/bas/BasProductPortRelMapper.xml    |  115 -
 .../mapper/mapper/bas/BasRoadwayMapper.xml    |   93 -
 .../mapper/mapper/bas/BasSupplierMapper.xml   |  142 -
 .../mapper/mapper/bas/BasTagMapper.xml        |   96 -
 .../mapper/mapper/bas/BasTaskNoMapper.xml     |   48 -
 .../mapper/bas/BasTraycodeFormatMapper.xml    |  106 -
 .../mapper/mapper/bas/BasTraycodeMapper.xml   |  101 -
 .../mapper/bas/BasWarehousePortMapper.xml     |   73 -
 .../bas/cargoSpace/BasCargoSpaceMapper.xml    |  237 --
 .../bas/warehouse/BasWarehouseMapper.xml      |  114 -
 .../mapper/check/CheckCommitRecordMapper.xml  |   82 -
 .../CheckDifferenceRecordFinishMapper.xml     |  203 --
 .../check/CheckDifferenceRecordMapper.xml     |  203 --
 .../check/CheckStockinDetailFinishMapper.xml  |  286 --
 .../mapper/check/CheckStockinDetailMapper.xml |  238 --
 .../mapper/check/CheckStockinFinishMapper.xml |  197 -
 .../mapper/check/CheckStockinMapper.xml       |  186 -
 .../mapper/mapper/in/InStockinBackMapper.xml  |  173 -
 .../mapper/in/InStockinDetailBackMapper.xml   |  300 --
 .../mapper/in/InStockinDetailFinishMapper.xml |  291 --
 .../mapper/in/InStockinDetailMapper.xml       |  356 --
 .../mapper/in/InStockinFinishMapper.xml       |  244 --
 .../mapper/mapper/in/InStockinMapper.xml      |  246 --
 .../mapper/in/TransferBillCallbackMapper.xml  |   95 -
 .../mapper/index/BillStatusCountMapper.xml    |   34 -
 .../mapper/index/CargoSpaceCountMapper.xml    |   16 -
 .../mapper/mapper/index/IndexCountMapper.xml  |   28 -
 .../mapper/index/ViewIndexJobMapper.xml       |   26 -
 .../mapper/index/WeekJobCountMapper.xml       |   39 -
 .../mapper/job/MydoJobDetailFinishMapper.xml  |  302 --
 .../mapper/mapper/job/MydoJobDetailMapper.xml |  426 ---
 .../mapper/mapper/job/MydoJobFinishMapper.xml |  263 --
 .../mapper/mapper/job/MydoJobMapper.xml       |  282 --
 .../mapper/mapper/mp/UserlMapper.xml          |    8 -
 .../mapper/out/OutExceptionRecordMapper.xml   |   86 -
 .../mapper/mapper/out/OutPickSubmitMapper.xml |  101 -
 .../mapper/out/OutStockoutBackMapper.xml      |  225 --
 .../out/OutStockoutDetailBackMapper.xml       |  320 --
 .../out/OutStockoutDetailFinishMapper.xml     |  262 --
 .../mapper/out/OutStockoutDetailMapper.xml    |  259 --
 .../mapper/out/OutStockoutFinishMapper.xml    |  168 -
 .../mapper/mapper/out/OutStockoutMapper.xml   |  249 --
 .../mapper/out/ViewHandAllotStockMapper.xml   |  264 --
 .../resources/mapper/mapper/pda/PdaMapper.xml |  186 -
 .../mapper/mapper/pda/TrayMsgMapper.xml       |   81 -
 .../ViewProductAndStockMapper.xml             |  157 -
 .../ReceiveStockinDetailFinishMapper.xml      |  260 --
 .../receive/ReceiveStockinDetailMapper.xml    |  205 --
 .../receive/ReceiveStockinFinishMapper.xml    |  237 --
 .../mapper/receive/ReceiveStockinMapper.xml   |  198 -
 .../requestInterface/RequestLogMapper.xml     |  121 -
 .../mapper/search/StockSummaryMapper.xml      |  415 ---
 .../search/ViewFlatWarehouseInFlowMapper.xml  |  184 -
 .../search/ViewFlatWarehouseOutFlowMapper.xml |  184 -
 .../mapper/search/ViewInJobFlowMapper.xml     |  293 --
 .../mapper/search/ViewOutJobFlowMapper.xml    |  293 --
 .../mapper/search/ViewStockDetailMapper.xml   |  249 --
 .../mapper/search/ViewStockSecureMapper.xml   |  484 ---
 .../mapper/search/ViewStockWarningMapper.xml  |  484 ---
 .../search/ViewStockinHistoryMapper.xml       |  243 --
 .../search/ViewStockoutHistoryMapper.xml      |  203 --
 .../stock/BasStockFreezeRecordMapper.xml      |  147 -
 .../stock/BasStockMaintainRecordMapper.xml    |  147 -
 .../mapper/mapper/stock/BasStockMapper.xml    |  264 --
 .../mapper/work/ViewNoDoneOutWorkMapper.xml   |   31 -
 .../mapper/out/OutStockoutDetailMapper.xml    |    2 +-
 .../mapper/out/OutStockoutFinishMapper.xml    |    1 +
 .../mapper/out/OutStockoutMapper.xml          |   40 +-
 .../mapper/out/ViewHandAllotStockMapper.xml   |   40 +-
 .../main/resources/mapper/pda/PdaMapper.xml   |   45 +
 .../requestInterface/RequestLogMapper.xml     |   11 +
 .../mapper/stock/BasStockHcMapper.xml         |  228 --
 .../resources/mapper/stock/BasStockMapper.xml |  859 +++--
 ruoyi-ui/src/api/out/outStockout.js           |    2 +-
 ruoyi-ui/src/views/bas/traycode/index.vue     |   53 +-
 ruoyi-ui/src/views/check/create/index.vue     |   10 +-
 ruoyi-ui/src/views/in/job/index.vue           |    4 +-
 ruoyi-ui/src/views/in/stockIn/index.vue       |  138 +-
 ruoyi-ui/src/views/out/addOutStockout.vue     |   14 +-
 ruoyi-ui/src/views/out/outStockoutManage.vue  |   95 +-
 ruoyi-ui/src/views/stock/management/index.vue |  156 +-
 ruoyi-ui/src/views/stock/pointOut.vue         |   18 +-
 ruoyi-ui/vue.config.js                        |    2 +-
 165 files changed, 7087 insertions(+), 16145 deletions(-)
 create mode 100644 AGENTS.md
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/DzpSend.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/LEDSender2010.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/Lzss.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/MyUdpSocket.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/ProtocolDemo.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/domain/basLed.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/Dzp/mapper/BasLedMapper.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvTask.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java
 create mode 100644 ruoyi-admin/src/main/resources/mapper/bas/BasLedMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml
 delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..e06f366
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,479 @@
+# FT546MWS 项目说明
+
+## 项目概述
+
+FT546MWS 是一个基于 **若依（RuoYi）** 框架定制的制造执行系统（MES）和仓库管理系统（WMS），采用前后端分离架构。项目基于若依 v3.9.0 进行二次开发，集成了工业物联网（IIoT）功能和 AI 能力。
+
+### 核心技术栈
+
+#### 后端技术
+- **框架**: Spring Boot 3.5.4
+- **Java 版本**: Java 17
+- **数据库**: SQL Server 2019 (主库), MariaDB (从库, 可选)
+- **ORM**: MyBatis 3.0.4 + MyBatis-Plus 3.5.14
+- **连接池**: Druid 1.2.23
+- **缓存**: Redis
+- **权限认证**: JWT + Spring Security
+- **API 文档**: SpringDoc OpenAPI (Swagger)
+- **定时任务**: Quartz
+- **代码生成**: Velocity 模板引擎
+- **工业通信**: HslCommunication 3.7.0 (支持 PLC、Modbus 等工业协议)
+- **AI 集成**: Spring AI 1.0.1 (OpenAI 兼容接口, 向量数据库)
+- **MCP 协议**: Spring AI MCP Client
+- **工具库**: Hutool 5.8.27, FastJSON2 2.0.57, POI 4.1.2
+
+#### 前端技术
+- **框架**: Vue 2.6.12
+- **UI 组件库**: Element UI 2.15.14
+- **状态管理**: Vuex 3.6.0
+- **路由**: Vue Router 3.4.9
+- **图表**: ECharts 5.4.0
+- **国际化**: Vue I18n 7.3.2
+- **构建工具**: Vue CLI 4.4.6
+- **其他**: Axios, Quill (富文本编辑器), VueCropper (图片裁剪)
+
+### 项目架构
+
+这是一个典型的前后端分离的 Maven 多模块项目，包含以下模块：
+
+```
+FT546MWS/
+├── ruoyi-admin/          # Web 服务入口模块（启动类、控制器）
+├── ruoyi-framework/      # 框架核心模块（安全配置、拦截器、工具类）
+├── ruoyi-system/         # 系统管理模块（用户、角色、菜单、部门等）
+├── ruoyi-common/         # 通用工具模块（工具类、常量、注解）
+├── ruoyi-generator/      # 代码生成器模块
+├── ruoyi-quartz/         # 定时任务模块
+├── ruoyi-ui/             # 前端 Vue 项目
+├── sql/                  # 数据库脚本
+├── bin/                  # 批处理脚本（构建、运行、清理）
+└── pom.xml              # Maven 父 POM 配置
+```
+
+### 业务模块
+
+前端业务模块（位于 `ruoyi-ui/src/views/`）：
+- **system**: 系统管理（用户、角色、菜单、部门、岗位、字典、参数、通知）
+- **monitor**: 系统监控（在线用户、操作日志、登录日志、服务监控、缓存监控、定时任务）
+- **tool**: 系统工具（表单构建、代码生成、系统接口）
+- **bas**: 基础数据管理
+- **in**: 入库管理
+- **out**: 出库管理
+- **stock**: 库存管理
+- **check**: 盘点管理
+- **job**: 作业管理
+- **kpi**: 绩效管理
+- **ai**: AI 功能集成
+- **search**: 搜索功能
+- **requestInterface**: 接口请求管理
+- **dashboard**: 仪表盘/数据看板
+
+## 环境配置
+
+### 数据库配置
+
+#### 主数据库（SQL Server）
+- **地址**: 172.16.2.170:1433
+- **数据库名**: FT546-wms
+- **用户名**: sa
+- **密码**: Flrd0914.
+- **驱动**: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
+#### 从数据库（MariaDB）- 已禁用
+- **地址**: 172.16.2.170:3307
+- **数据库名**: mydb
+- **用户名**: root
+- **密码**: Flrd0914.
+
+### Redis 配置
+- **地址**: 172.16.2.170:6379
+- **数据库索引**: 0
+- **密码**: 123456
+- **超时**: 10s
+
+### AI 配置
+- **提供商**: SiliconFlow (OpenAI 兼容)
+- **Base URL**: https://api.siliconflow.cn
+- **对话模型**: deepseek-ai/DeepSeek-V3.1
+- **嵌入模型**: Qwen/Qwen3-Embedding-8B (1024 维度)
+- **向量数据库**: MariaDB (已配置但未完全启用)
+
+### Druid 监控
+- **访问地址**: http://localhost:8080/druid/
+- **用户名**: ruoyi
+- **密码**: 123456
+
+### API 文档
+- **Swagger UI**: http://localhost:8080/swagger-ui.html
+- **OpenAPI JSON**: http://localhost:8080/v3/api-docs
+
+## 构建和运行
+
+### 后端构建和运行
+
+#### 方式一：使用 Maven 命令
+
+```bash
+# 进入项目根目录
+cd D:\workSpace\PROJECT_SPACE\FT546\FT546MWS
+
+# 清理并编译
+mvn clean compile
+
+# 打包（跳过测试）
+mvn clean package -DskipTests
+
+# 运行
+java -jar ruoyi-admin/target/ruoyi-admin.jar
+
+# 或使用 JVM 参数运行
+java -Dname=ruoyi-admin.jar -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-admin/target/ruoyi-admin.jar
+```
+
+#### 方式二：使用批处理脚本
+
+```bash
+# 进入 bin 目录
+cd bin
+
+# 启动服务
+ry.bat
+# 选择 [1] 启动 ruoyi-admin.jar
+
+# 停止服务
+ry.bat
+# 选择 [2] 关闭 ruoyi-admin.jar
+
+# 重启服务
+ry.bat
+# 选择 [3] 重启 ruoyi-admin.jar
+
+# 查看状态
+ry.bat
+# 选择 [4] 查看状态
+```
+
+#### 方式三：使用 IDE
+1. 使用 IntelliJ IDEA 或 Eclipse 导入项目（Maven 项目）
+2. 找到启动类：`com.ruoyi.RuoYiApplication`（位于 ruoyi-admin 模块）
+3. 运行启动类
+
+### 前端构建和运行
+
+#### 开发环境
+
+```bash
+# 进入前端目录
+cd ruoyi-ui
+
+# 安装依赖（使用 npm 镜像加速）
+npm install --registry=https://registry.npmmirror.com
+
+# 或直接安装
+npm install
+
+# 启动开发服务器
+npm run dev
+```
+
+前端服务启动后，浏览器访问：http://localhost:80
+
+默认账号：
+- 用户名: admin
+- 密码: admin123
+
+#### 生产环境构建
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
+
+构建产物将输出到 `ruoyi-ui/dist` 目录。
+
+#### 使用批处理脚本
+
+```bash
+# 进入前端 bin 目录
+cd ruoyi-ui\bin
+
+# 运行前端开发服务器
+run-web.bat
+
+# 打包前端
+package.bat
+
+# 清理构建产物
+clean.bat
+```
+
+## 开发规范
+
+### 后端开发规范
+
+#### 包结构规范
+```
+com.ruoyi
+├── common/              # 通用模块
+│   ├── annotation/      # 自定义注解
+│   ├── constant/        # 常量定义
+│   ├── core/           # 核心配置
+│   ├── enums/          # 枚举类
+│   ├── exception/      # 异常处理
+│   └── utils/          # 工具类
+├── framework/          # 框架核心
+│   ├── aspectj/        # 切面
+│   ├── config/         # 配置类
+│   ├── interceptor/    # 拦截器
+│   ├── security/       # 安全相关
+│   └── web/            # Web 配置
+├── system/             # 系统管理
+│   ├── controller/     # 控制器
+│   ├── domain/         # 实体类
+│   ├── mapper/         # 数据访问层
+│   └── service/        # 业务逻辑层
+│       └── impl/       # 业务实现
+└── web/                # Web 控制器（其他业务模块）
+```
+
+#### 代码生成规范
+项目使用代码生成器（`ruoyi-generator` 模块）快速生成 CRUD 代码：
+
+1. 在数据库中创建表
+2. 登录系统 → 系统工具 → 代码生成
+3. 导入表并配置生成信息
+4. 生成代码并下载
+5. 将生成的代码复制到对应模块
+
+生成的代码包括：
+- Java 实体类（domain）
+- Mapper 接口和 XML（mapper）
+- Service 接口和实现（service/impl）
+- Controller 控制器（controller）
+- Vue 页面（前端 views）
+- API 接口定义（前端 api）
+
+#### 控制器规范
+- 使用 `@RestController` 注解
+- 统一返回格式：`AjaxResult`（包装 success、error、data）
+- 权限控制：使用 `@PreAuthorize("@ss.hasPermi('system:user:list')")`
+- 操作日志：使用 `@Log(title = "用户管理", businessType = BusinessType.INSERT)`
+- 分页查询：使用 `startPage()` 方法（继承 BaseController）
+
+#### Service 规范
+- 接口定义在 `service` 包
+- 实现类在 `service/impl` 包
+- 使用 `@Service` 注解
+- 业务逻辑方法命名：`selectXxxList`（查询）、`insertXxx`（新增）、`updateXxx`（修改）、`deleteXxxByIds`（删除）
+- 缓存注解：`@Cacheable`（查询）、`@CacheEvict`（更新/删除）
+
+#### Mapper 规范
+- 使用 MyBatis-Plus 注解或 XML 配置
+- XML 文件位于 `resources/mapper/` 目录
+- 继承 `BaseMapper<T>` 接口
+- 复杂查询使用 XML 文件编写 SQL
+
+### 前端开发规范
+
+#### 目录结构规范
+```
+src/
+├── api/                # API 接口定义
+│   ├── login.js       # 登录相关
+│   ├── system/        # 系统管理
+│   ├── monitor/       # 监控模块
+│   └── ...            # 其他业务模块
+├── assets/            # 静态资源
+│   ├── images/        # 图片
+│   ├── icons/         # 图标
+│   ├── logo/          # Logo
+│   └── styles/        # 样式文件
+├── components/        # 公共组件
+│   ├── Pagination/    # 分页组件
+│   ├── RightToolbar/  # 工具栏
+│   ├── Editor/        # 富文本编辑器
+│   └── ...            # 其他组件
+├── directive/         # 自定义指令
+├── layout/            # 布局组件
+├── plugins/           # 插件
+├── router/            # 路由配置
+├── store/             # Vuex 状态管理
+├── utils/             # 工具函数
+├── views/             # 页面组件
+│   ├── system/        # 系统管理页面
+│   ├── monitor/       # 监控页面
+│   └── ...            # 其他业务页面
+├── App.vue            # 根组件
+├── main.js            # 入口文件
+├── permission.js      # 权限控制
+└── settings.js        # 全局配置
+```
+
+#### 组件命名规范
+- 组件名使用 PascalCase（大驼峰）
+- 文件名与组件名保持一致
+- 例如：`UserList.vue`
+
+#### API 调用规范
+- API 接口定义在 `src/api/` 目录
+- 使用 Axios 发送请求（已封装）
+- 请求路径配置在 `.env.development` 等环境变量文件中
+- 统一使用 `request.js` 封装的请求方法
+
+#### 路由规范
+- 路由配置在 `src/router/index.js`
+- 使用 Vue Router 的路由懒加载
+- 需要权限的路由在路由配置中添加 `meta` 字段
+- 例如：`meta: { title: '用户管理', icon: 'user', noCache: true }`
+
+#### 样式规范
+- 使用 SCSS 预处理器
+- 全局样式放在 `src/assets/styles/` 目录
+- 组件样式使用 `<style scoped>` 限定作用域
+- 遵循 BEM 命名规范
+
+## 测试
+
+### 后端测试
+```bash
+# 运行所有测试
+mvn test
+
+# 运行指定测试类
+mvn test -Dtest=UserServiceTest
+
+# 运行指定测试方法
+mvn test -Dtest=UserServiceTest#testGetUser
+```
+
+### 前端测试
+目前项目未配置前端单元测试，建议添加 Jest 或 Mocha。
+
+## 部署
+
+### 后端部署
+```bash
+# 打包
+mvn clean package -DskipTests
+
+# 生成的 JAR 文件位于：ruoyi-admin/target/ruoyi-admin.jar
+
+# 上传到服务器后，使用脚本或命令启动
+nohup java -jar ruoyi-admin.jar > app.log 2>&1 &
+
+# 或使用提供的脚本
+./ry.bat  # Windows
+./ry.sh   # Linux
+```
+
+### 前端部署
+```bash
+# 构建生产版本
+npm run build:prod
+
+# 生成的静态文件位于：dist/ 目录
+
+# 将 dist 目录内容部署到 Nginx 或其他 Web 服务器
+# Nginx 配置示例：
+server {
+    listen 80;
+    server_name your-domain.com;
+    root /path/to/dist;
+    index index.html;
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /prod-api/ {
+        proxy_pass http://backend-server:8080/;
+    }
+}
+```
+
+## 常见问题
+
+### 1. 端口冲突
+- 后端默认端口：8080
+- 前端默认端口：80
+- 如需修改，请编辑 `application.yml`（后端）和 `vue.config.js`（前端）
+
+### 2. 数据库连接失败
+- 检查数据库服务是否启动
+- 检查 `application-druid.yml` 中的数据库配置
+- 确保网络可访问数据库服务器
+
+### 3. Redis 连接失败
+- 检查 Redis 服务是否启动
+- 检查 `application.yml` 中的 Redis 配置
+- 确保网络可访问 Redis 服务器
+
+### 4. 前端跨域问题
+- 开发环境已配置代理（`vue.config.js` 中的 `proxy`）
+- 生产环境需要在 Nginx 或后端配置 CORS
+
+### 5. 代码生成器无法使用
+- 确保数据库表已创建
+- 检查表是否有主键
+- 检查字段注释是否完整
+
+### 6. 文件上传失败
+- 检查 `application.yml` 中的文件路径配置
+- 确保目录存在且有写入权限
+- 检查文件大小限制（默认 20MB）
+
+## 项目特色
+
+### 1. 工业物联网集成
+- 使用 HslCommunication 库支持多种工业协议
+- 可与 PLC、Modbus 设备通信
+- 适用于制造业数据采集和设备控制
+
+### 2. AI 能力
+- 集成 Spring AI 框架
+- 支持 OpenAI 兼容的大模型接口
+- 支持向量数据库和文档检索
+- 可用于智能问答、数据分析等场景
+
+### 3. MCP 协议支持
+- 支持 MCP（Model Context Protocol）客户端
+- 可连接 MCP 服务进行上下文管理
+
+### 4. 多数据库支持
+- 主数据库：SQL Server
+- 从数据库：MariaDB（可选）
+- 支持主从读写分离
+
+### 5. 代码生成器
+- 一键生成前后端 CRUD 代码
+- 支持自定义模板
+- 大幅提升开发效率
+
+### 6. 完善的权限控制
+- 基于 RBAC 的权限模型
+- 支持数据权限控制
+- 支持按钮级别的权限控制
+
+### 7. 系统监控
+- 在线用户监控
+- 操作日志记录
+- 系统性能监控
+- 缓存监控
+- 定时任务管理
+
+## 联系方式
+
+- 若依官方文档：http://doc.ruoyi.vip
+- 若依官方演示：http://vue.ruoyi.vip
+- 项目仓库：http://106.13.86.63:10082/zyr/FT546MWS.git
+
+## 许可证
+
+本项目基于 MIT 许可证开源，详见 [LICENSE](LICENSE) 文件。
+
+---
+
+**注意**: 本项目包含敏感信息（数据库密码、API 密钥等），在生产环境部署前请务必修改这些配置。
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 796e05e..1458717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <parameters>true</parameters>
                     <source>${java.version}</source>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/DzpSend.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/DzpSend.java
new file mode 100644
index 0000000..916ae55
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/DzpSend.java
@@ -0,0 +1,120 @@
+package com.ruoyi.Dzp;
+
+
+import com.ruoyi.Dzp.domain.basLed;
+import com.ruoyi.Dzp.mapper.BasLedMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api2dzp")
+public class DzpSend {
+    @Autowired
+    private BasLedMapper mapper;
+
+
+    @Scheduled(fixedDelay = 1000)
+    public void InLed() throws IOException {
+        basLed basLed = new basLed();
+        basLed.setSendFlag("0");
+        basLed.setId(1);
+        List<com.ruoyi.Dzp.domain.basLed> basLeds = mapper.selectBasLedList(basLed);
+        if (basLeds != null && basLeds.size() > 0 && (basLeds.get(0).getModel().equals("1") || basLeds.get(0).getModel().equals("2"))) {
+            MyUdpSocket myUdpSocket = new MyUdpSocket(6666);
+            ProtocolDemo.my_udp = myUdpSocket;
+            String ip = basLeds.get(0).getIpAddress();
+            String msgProductTitle = "物资编码：";
+            String msgProduct = basLeds.get(0).getProduct_id();
+            String msgSpecTitle = "物资规格：";
+            String msgSpec = basLeds.get(0).getSpec();
+            String msg3 = "托盘条码：" + basLeds.get(0).getTrayCode();
+            String msg4 = null;
+            if (basLeds.get(0).getModel().equals("1")) {
+                msg4 = "入库数量：";
+            } else {
+                msg4 = "出库数量：";
+            }
+            String ms7 = "物资名称：";
+            String msg8 = basLeds.get(0).getProductName();
+            String msgQuantity = basLeds.get(0).getQuantity();
+            if (ProtocolDemo.demo_play_chapterschedule4(ip, msgProductTitle, msgSpecTitle, msg4, msg3, msgSpec, msgProduct, ms7, msg8, msgQuantity)) {
+                basLeds.get(0).setSendFlag("1");
+                mapper.updateBasLed(basLeds.get(0));
+            }
+            myUdpSocket.close();
+
+        }
+        basLed basLed2 = new basLed();
+        basLed2.setSendFlag("0");
+        basLed2.setId(2);
+        List<com.ruoyi.Dzp.domain.basLed> basLeds2 = mapper.selectBasLedList(basLed2);
+        if (basLeds2 != null && basLeds2.size() > 0 && (basLeds2.get(0).getModel().equals("1") || basLeds2.get(0).getModel().equals("2"))) {
+            MyUdpSocket myUdpSocket = new MyUdpSocket(6666);
+            ProtocolDemo.my_udp = myUdpSocket;
+
+            String ip = basLeds2.get(0).getIpAddress();
+            String msgProductTitle = "物资编码：";
+            String msgProduct = basLeds2.get(0).getProduct_id();
+            String msgSpecTitle = "物资规格：";
+            String msgSpec = basLeds2.get(0).getSpec();
+            String msg3 = "托盘条码：" + basLeds2.get(0).getTrayCode();
+            String msg4 = null;
+            if (basLeds2.get(0).getModel().equals("1")) {
+                msg4 = "入库数量：";
+            } else {
+                msg4 = "出库数量：";
+            }
+            String ms7 = "物资名称：";
+            String msg8 = basLeds2.get(0).getProductName();
+            String msgQuantity = basLeds2.get(0).getQuantity();
+            if (ProtocolDemo.demo_play_chapterschedule4(ip, msgProductTitle, msgSpecTitle, msg4, msg3, msgSpec, msgProduct, ms7, msg8, msgQuantity)) {
+                basLeds2.get(0).setSendFlag("1");
+                mapper.updateBasLed(basLeds2.get(0));
+            }
+
+            myUdpSocket.close();
+
+        }
+
+
+    }
+
+
+    @Scheduled(fixedDelay = 1000)
+    public void ErrorLed() throws IOException {
+        basLed basLed = new basLed();
+        basLed.setSendFlag("0");
+        basLed.setId(1);
+        List<com.ruoyi.Dzp.domain.basLed> basLeds = mapper.selectBasLedList(basLed);
+        if (basLeds != null && basLeds.size() > 0 && basLeds.get(0).getModel().equals("3")) {
+            MyUdpSocket myUdpSocket = new MyUdpSocket(6666);
+            ProtocolDemo.my_udp = myUdpSocket;
+            String ip = basLeds.get(0).getIpAddress();
+            if (ProtocolDemo.demo_play_chapterschedule2(ip, "报警信息", basLeds.get(0).getErrorMsg())) {
+                basLeds.get(0).setSendFlag("1");
+                mapper.updateBasLed(basLeds.get(0));
+            }
+            myUdpSocket.close();
+
+        }
+        basLed basLed2 = new basLed();
+        basLed2.setSendFlag("0");
+        basLed2.setId(2);
+        List<com.ruoyi.Dzp.domain.basLed> basLeds2 = mapper.selectBasLedList(basLed2);
+        if (basLeds2 != null && basLeds2.size() > 0 && basLeds2.get(0).getModel().equals("3")) {
+            MyUdpSocket myUdpSocket = new MyUdpSocket(6666);
+            ProtocolDemo.my_udp = myUdpSocket;
+            String ip = basLeds2.get(0).getIpAddress();
+            if (ProtocolDemo.demo_play_chapterschedule2(ip, "报警信息", basLeds2.get(0).getErrorMsg())) {
+                basLeds2.get(0).setSendFlag("1");
+                mapper.updateBasLed(basLeds2.get(0));
+            }
+            myUdpSocket.close();
+        }
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/LEDSender2010.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/LEDSender2010.java
new file mode 100644
index 0000000..88daa12
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/LEDSender2010.java
@@ -0,0 +1,3235 @@
+package com.ruoyi.Dzp;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.font.FontRenderContext;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+
+public class LEDSender2010 {
+
+    // ====���붯����ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '���',
+    // 1 = '������ʾ',
+    // 2 = '�����ʾ',
+    // 3 = '�Ϲ���ʾ',
+    // 4 = '�ҹ���ʾ',
+    // 5 = '�¹���ʾ',
+    // 6 = '���������ʾ',
+    // 7 = '�����Ϲ���ʾ',
+    // 8 = '�����ҹ���ʾ',
+    // 9 = '�����¹���ʾ',
+    // 10 = '�м�������չ��',
+    // 11 = '�м�������չ��',
+    // 12 = '�м�������չ��',
+    // 13 = '������������',
+    // 14 = '������������',
+    // 15 = '��������չ��',
+    // 16 = '��������չ��',
+    // 17 = '�����Ͻ�����',
+    // 18 = '�����½�����',
+    // 19 = '�����Ͻ�����',
+    // 20 = '�����½�����',
+    // 21 = '������������',
+    // 22 = '������������',
+    // 23 = '�����Ҷ��',
+    // 24 = '�����Ҷ��',
+    // =====================================
+
+    // ====����������ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '���',
+    // 1 = '����ʧ',
+    // 2 = '������ʧ',
+    // 3 = '�������м��£',
+    // 4 = '�������м��£',
+    // 5 = '�������м��£',
+    // 6 = '���������Ƴ�',
+    // 7 = '���������Ƴ�',
+    // 8 = '���������£',
+    // 9 = '�������Һ�£',
+    // 10 = '�����Ͻ��Ƴ�',
+    // 11 = '�����½��Ƴ�',
+    // 12 = '�����Ͻ��Ƴ�',
+    // 13 = '�����½��Ƴ�',
+    // 14 = '���������Ƴ�',
+    // 15 = '���������Ƴ�',
+    // 16 = '�����Ҷ��',
+    // 17 = '�����Ҷ��'
+    // =====================================
+
+    // ====ͣ��������ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '��̬��ʾ',
+    // 1 = '��˸��ʾ'
+    // =====================================
+
+    public static final int PKP_PREFIX = 0x55;
+    public static final int PKP_SUFFIX = 0xAA;
+    public static final int PKP_FILLCH = 0xBB;
+
+    public static final int ALIGN_LEFT = 0x0;
+    public static final int ALIGN_TOP = 0x0;
+    public static final int ALIGN_CENTER = 0x1;
+    public static final int ALIGN_RIGHT = 0x2;
+    public static final int ALIGN_BOTTOM = 0x2;
+
+    public static final int ROOT_PLAY = 0x21;				//��Ŀ���ݣ����浽RAM�����綪ʧ
+    public static final int ROOT_DOWNLOAD = 0x22;			//��Ŀ���ݣ����浽Flash
+    public static final int ROOT_PLAY_CHAPTER = 0x23;		//������߸���ijһĻ
+    public static final int ROOT_DOWNLOAD_CHAPTER = 0x24;
+    public static final int ROOT_PLAY_REGION = 0x25;		//������߸���ijһ����
+    public static final int ROOT_DOWNLOAD_REGION = 0x26;
+    public static final int ROOT_PLAY_LEAF = 0x27;			//������߸���ijһҳ��
+    public static final int ROOT_DOWNLOAD_LEAF = 0x28;
+    public static final int ROOT_PLAY_OBJECT = 0x29;		//������߸���ijһ����
+    public static final int ROOT_DOWNLOAD_OBJECT = 0x2a;
+
+    public static final int COLOR_TYPE_DOUBLE = 0x2;
+    public static final int COLOR_TYPE_THREE = 0x3;
+    public static final int COLOR_TYPE_FULL = 0x4;
+
+    public static final int BITMAP_RED = 0x1;
+    public static final int BITMAP_GREEN = 0x2;
+    public static final int BITMAP_YELLOW = 0x3;
+    public static final int BITMAP_COLOR = 0x4;
+    public static final int BITMAP_RGB = 0x3;
+    public static final int BITMAP_FULLCOLOR = 0x5;
+
+    public static final int PKC_BEGIN = 0;
+    public static final int PKC_END = 1;
+    public static final int PKC_DATA = 2;
+    public static final int PKC_RESPOND = 3;
+    public static final int PKC_NOTIFY = 100;
+
+    public static final int PKC_ADJUST_TIME = 6;
+    public static final int PKC_GET_PARAM = 7;
+    public static final int PKC_SET_PARAM = 8;
+    public static final int PKC_GET_POWER = 9;
+    public static final int PKC_SET_POWER = 10;
+    public static final int PKC_GET_BRIGHT = 11;
+    public static final int PKC_SET_BRIGHT = 12;
+    public static final int PKC_COM_TRANSFER = 21;
+    public static final int PKC_SET_SWITCH = 27;
+    public static final int PKC_GET_POWER_SCHEDULE = 60;
+    public static final int PKC_SET_POWER_SCHEDULE = 61;
+    public static final int PKC_RESET_DISPLAY = 99;
+
+    public static final int OBJECT_CHAPTER = 0x3F;
+    public static final int OBJECT_REGION = 0x3E;
+    public static final int OBJECT_LEAF = 0x30;
+    public static final int OBJECT_WINDOW = 0x31;
+    public static final int OBJECT_DCLOCK = 0x32;
+    public static final int OBJECT_STRING = 0x33;
+    public static final int OBJECT_STRING_DCLOCK = 0x35;
+    public static final int OBJECT_PIXELS = 0x36;
+    public static final int OBJECT_PIXELSET = 0x37;
+    public static final int OBJECT_WINDOWS = 0x3B;
+    public static final int OBJECT_STRINGS = 0x3C;
+    public static final int OBJECT_SCHEDULE_WINDOW = 0x3E;
+    public static final int OBJECT_VOICE = 0x5F;
+
+    public static final int DF_YEAR = 1;
+    public static final int DF_MONTH = 2;
+    public static final int DF_DAY = 3;
+    public static final int DF_WEEK = 4;
+    public static final int DF_HOUR = 5;
+    public static final int DF_MINUTE = 6;
+    public static final int DF_SECOND = 7;
+    public static final int DF_USER = 8;
+
+    public static final int NOTIFY_ROOT_DOWNLOAD = 0x00010003;  //����Flash���Ž�Ŀ
+    public static final int NOTIFY_ROOT_PLAY = 0x00020003;  //����Flash���Ž�Ŀ
+
+    /*
+    typedef struct PKG_HEADER{
+            WORD   Command;
+            BYTE   srcAddr;
+            BYTE   dstAddr;
+            DWORD  SerialNo;
+    }TPKG_Header, *PPKG_Header;
+    */
+    static final int PKG_HEADER_STRUCT_SIZE = 8; //2+1+1+4
+    static final int PKG_HEADER_COMMAND_OFFSET = 0;
+    static final int PKG_HEADER_SRCADDR_OFFSET = 2;
+    static final int PKG_HEADER_DSTADDR_OFFSET = 3;
+    static final int PKG_HEADER_SERIALNO_OFFSET = 4;
+
+    /*
+    typedef struct _SYSTEMTIME {
+        WORD wYear;
+        WORD wMonth;
+        WORD wDayOfWeek;
+        WORD wDay;
+        WORD wHour;
+        WORD wMinute;
+        WORD wSecond;
+        WORD wMilliseconds;
+    } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
+    */
+    static final int SYSTEMTIME_SIZE = 16;
+    static final int SYSTEMTIME_YEAR_OFFSET = 0;
+    static final int SYSTEMTIME_MONTH_OFFSET = 2;
+    static final int SYSTEMTIME_WEEK_OFFSET = 4;
+    static final int SYSTEMTIME_DAY_OFFSET = 6;
+    static final int SYSTEMTIME_HOUR_OFFSET = 8;
+    static final int SYSTEMTIME_MINUTE_OFFSET = 10;
+    static final int SYSTEMTIME_SECOND_OFFSET = 12;
+    static final int SYSTEMTIME_MSECOND_OFFSET = 14;
+
+    /*
+    TPowerSchedule = packed record
+        Enabled:    DWord;
+        Mode:       DWord;
+        OpenTime:   array [0..20] of TTimeStamp;
+        CloseTime:  array [0..20] of TTimeStamp;
+        Checksum:   DWord;
+    end;
+    PPowerSchedule = ^TPowerSchedule;
+    */
+    static final int PWOERSCHEDULE_SIZE = 348;
+    static final int PWOERSCHEDULE_ENABLED_OFFSET = 0;
+    static final int PWOERSCHEDULE_MODE_OFFSET = 4;
+    static final int PWOERSCHEDULE_OPENTIME_OFFSET = 8;
+    static final int PWOERSCHEDULE_CLOSETIME_OFFSET = 176;
+    static final int PWOERSCHEDULE_SUNDAY_OPENTIME_OFFSET = 8;
+    static final int PWOERSCHEDULE_SUNDAY_CLOSETIME_OFFSET = 176;
+    static final int PWOERSCHEDULE_MONDAY_OPENTIME_OFFSET = 32;
+    static final int PWOERSCHEDULE_MONDAY_CLOSETIME_OFFSET = 200;
+    static final int PWOERSCHEDULE_TUESDAY_OPENTIME_OFFSET = 56;
+    static final int PWOERSCHEDULE_TUESDAY_CLOSETIME_OFFSET = 224;
+    static final int PWOERSCHEDULE_WEDNESDAY_OPENTIME_OFFSET = 80;
+    static final int PWOERSCHEDULE_WEDNESDAY_CLOSETIME_OFFSET = 248;
+    static final int PWOERSCHEDULE_THURSDAY_OPENTIME_OFFSET = 104;
+    static final int PWOERSCHEDULE_THURSDAY_CLOSETIME_OFFSET = 272;
+    static final int PWOERSCHEDULE_FRIDAY_OPENTIME_OFFSET = 128;
+    static final int PWOERSCHEDULE_FRIDAY_CLOSETIME_OFFSET = 296;
+    static final int PWOERSCHEDULE_SATURDAY_OPENTIME_OFFSET = 152;
+    static final int PWOERSCHEDULE_SATURDAY_CLOSETIME_OFFSET = 320;
+
+    /*
+    //������ͷ��
+    typedef struct ROOT{
+          WORD  id;
+          WORD  color;
+          DWORD size;
+          DWORD count;
+          long  survive;
+          WORD  flag;
+          WORD  Reserved;
+        }TRoot, *PRoot;
+    */
+    static final int ROOT_STRUCT_SIZE = 20; //2+2+4+4+4+2+2
+    static final int ROOT_COLORTYPE_OFFSET = 2;
+    static final int ROOT_SIZE_OFFSET = 4;
+    static final int ROOT_COUNT_OFFSET = 8;
+    static final int ROOT_SURVIVE_OFFSET = 12;
+    static final int ROOT_FLAG_OFFSET = 16;
+
+    /*
+    //�ֲ�ˢ�²������ݽṹ����
+    typedef struct CUSTOMACTION{
+        TRoot header;  //������ͷ��
+        WORD actionmode;       //����ģʽ(����/�滻)
+        WORD chapterindex;     //���ĸ��½ڲ�������滻
+        WORD regionindex;      //���ĸ����򴰲�������滻
+        WORD leafindex;        //���ĸ�ҳ���������滻
+        WORD objectindex;      //���ĸ�λ�ò�������滻�ؼ�
+        WORD reserved;
+    }TCustomAction, *PCustomAction;
+    */
+    static final int ROOT_SUB_STRUCT_SIZE = ROOT_STRUCT_SIZE + 12; //2+2+4+4+4+2+2
+    static final int ROOT_SUB_ACTION_MODE = 0;
+    static final int ROOT_SUB_CHAPTER_INDEX = 2;
+    static final int ROOT_SUB_REGION_INDEX = 4;
+    static final int ROOT_SUB_LEAF_INDEX = 6;
+    static final int ROOT_SUB_OBJECT_INDEX = 8;
+
+    /*
+    typedef struct PLAYSCHEDULE{
+      WORD  kind;           //���żƻ�����0=ʼ�ղ��ţ�1=��ÿ����ֹʱ�䲥�ţ�3=��ָ������ֹ����ʱ�䲥��
+      WORD  week;           //�����յ���������Ч
+      TTimeStamp fromtime;  //��ʼʱ��
+      TTimeStamp totime;    //����ʱ��
+    }TPlaySchedule, *PPlaySchedule;
+    */
+    static final int PLAY_SCHEDULE_SIZE = 20;
+    static final int PLAY_SCHEDULE_KIND_OFFSET = 0;
+    static final int PLAY_SCHEDULE_WEEK_OFFSET = 2;
+    static final int PLAY_SCHEDULE_FROMTIME_OFFSET = 4;
+    static final int PLAY_SCHEDULE_FROMDATE_OFFSET = 8;
+    static final int PLAY_SCHEDULE_TOTIME_OFFSET = 12;
+    static final int PLAY_SCHEDULE_TODATE_OFFSET = 16;
+    /*
+    //�½����ݽṹ��
+    typedef struct CHAPTER{
+      WORD  id;             //��ʶ����������У��
+      WORD  no;             //��Ŀ��ţ���0
+      WORD  wait;           //�Ƿ�ȴ��������(=1�ȴ�; =0��ʱ�����)
+      WORD  repeat;         //��Ŀ���Ŵ�����Ԥ��δʵ�֣���0
+      WORD  count;          //�߼���������
+      BYTE  compress;       //�Ƿ�ѹ����Ԥ��δʵ�֣���0
+      BYTE  priority;       //���ȼ���Ԥ��δʵ�֣���0
+      DWORD time;           //��Ŀ��ʾʱ������λ����
+      DWORD size;           //��ʶ�ý�Ŀ�ֽ���(���������ֽ����͸�Ԫ�ر����ֽ���֮��)
+      TPlaySchedule schedule; //���żƻ�
+    }TChapter, *PChapter;
+    */
+    static final int CHAPTER_STRUCT_SIZE = 20 + PLAY_SCHEDULE_SIZE; //2+2+2+2+2+1+1+4+4+PLAY_SCHEDULE_SIZE
+    static final int CHAPTER_SIZE_OFFSET = 16;
+    static final int CHAPTER_COUNT_OFFSET = 8;
+    static final int CHAPTER_WAIT_OFFSET = 4;
+    static final int CHAPTER_PRIORITY_OFFSET = 11;
+    static final int CHAPTER_TIME_OFFSET = 12;
+    static final int CHAPTER_PLAY_SCHEDULE_KIND_OFFSET = 20 + PLAY_SCHEDULE_KIND_OFFSET;
+    static final int CHAPTER_PLAY_SCHEDULE_WEEK_OFFSET = 20 + PLAY_SCHEDULE_WEEK_OFFSET;
+    static final int CHAPTER_PLAY_SCHEDULE_FROMTIME_OFFSET = 20 + PLAY_SCHEDULE_FROMTIME_OFFSET;
+    static final int CHAPTER_PLAY_SCHEDULE_FROMDATE_OFFSET = 20 + PLAY_SCHEDULE_FROMDATE_OFFSET;
+    static final int CHAPTER_PLAY_SCHEDULE_TOTIME_OFFSET = 20 + PLAY_SCHEDULE_TOTIME_OFFSET;
+    static final int CHAPTER_PLAY_SCHEDULE_TODATE_OFFSET = 20 + PLAY_SCHEDULE_TODATE_OFFSET;
+
+    /*
+    //�������ݽṹ��
+    typedef struct REGION{
+      WORD  id;             //��ʶ����������У��
+      WORD  no;             //�߼����ڱ�ţ���0
+      WORD  over;           //��Ŀ�Ƿ񲥷����(��modeΪ�ȴ����󲥷����ʱ�����ֶ���Ч���Լ�������ֶ���Ч)
+      WORD  count;          //ҳ����Ŀ
+      DWORD size;           //��ʶ���߼������ֽ���(���������ֽ����͸�Ԫ�ر����ֽ���֮��)
+      TRect rect;           //�߼�����λ�ô�С
+      BYTE  border;
+      BYTE  Reserved1;
+      WORD  Reserved2;
+    }TRegion, *PRegion;
+    */
+    static final int REGION_STRUCT_SIZE = 32; //2+2+2+2+4+16+1+1+2
+    static final int REGION_SIZE_OFFSET = 8;
+    static final int REGION_COUNT_OFFSET = 6;
+    static final int REGION_LEFT_OFFSET = 12;
+    static final int REGION_TOP_OFFSET = 16;
+    static final int REGION_RIGHT_OFFSET = 20;
+    static final int REGION_BOTTOM_OFFSET = 24;
+
+    /*
+    //ҳ�����ݽṹ��
+    typedef struct LEAF{
+      WORD  id;             //ҳ����(��ҳ���滻ʱ�����ݴ˱���滻)
+      WORD  no;
+      WORD  wait;           //�Ƿ�ȴ��������(=1�ȴ�; =0��ʱ�����)
+      WORD  serial;         //�Ƿ��з�ʽ���ţ���0
+      WORD  count;          //������Ŀ
+      WORD  Reserved;
+      DWORD time;           //ҳ����ʾʱ��
+      DWORD size;           //��ʶ��ҳ���ֽ���(���������ֽ����͸�Ԫ�ر����ֽ���֮��)
+      WORD  Reserved1;
+      WORD  Reserved2;
+    }TLeaf, *PLeaf;
+    */
+    static final int LEAF_STRUCT_SIZE = 24; //2+2+2+2+2+2+4+4+2+2
+    static final int LEAF_SIZE_OFFSET = 16;
+    static final int LEAF_COUNT_OFFSET = 8;
+    static final int LEAF_WAIT_OFFSET = 4;
+    static final int LEAF_TIME_OFFSET = 12;
+
+    /*
+    //����ͨ�����Խṹ��
+    typedef struct OBJECT{
+      WORD  id;             //�����ʶ
+      BYTE  transparent;    //�Ƿ�͸��
+      BYTE  flag;           //һЩ����λ
+      DWORD size;           //�����ֽ���
+      TRect rect;           //������ʾ����
+    }TObject, *PObject;
+    */
+    static final int OBJECT_STRUCT_SIZE = 24;  //2+1+1+4+16
+    static final int OBJECT_TRANSPARENT_OFFSET = 2;
+    static final int OBJECT_SIZE_OFFSET = 4;
+    static final int OBJECT_LEFT_OFFSET = 8;
+    static final int OBJECT_TOP_OFFSET = 12;
+    static final int OBJECT_RIGHT_OFFSET = 16;
+    static final int OBJECT_BOTTOM_OFFSET = 20;
+
+    /*
+    //�ಥ�Ŷ������ݽṹ����������TWindow������߶��TString����
+    typedef struct WINDOWS{
+      TObject     object;     //�����һ�㶨��
+      BYTE        method;     //������ʽ
+      BYTE        speed;      //�����ٶ�
+      WORD        count;      //�����ĵ�Window����
+    }TWindows, *PWindows;
+    */
+    static final int STRINGS_STRUCT_SIZE = OBJECT_STRUCT_SIZE + 4;  //1+1+2
+    static final int STRINGS_COUNT_OFFSET = OBJECT_STRUCT_SIZE + 2;
+    static final int WINDOWS_STRUCT_SIZE = OBJECT_STRUCT_SIZE + 4;  //1+1+2
+    static final int WINDOWS_COUNT_OFFSET = OBJECT_STRUCT_SIZE + 2;
+
+    /*
+    //�������ֶ���
+    typedef struct STRING{
+      WORD        id;
+      BYTE        inMethod;   //���뷽ʽ
+      BYTE        outMethod;  //������ʽ
+      BYTE        stopMethod; //ͣ����ʽ
+      BYTE        alignment;  //���뷽ʽ
+      WORD        inSpeed;    //�����ٶ�
+      WORD        outSpeed;   //�����ٶ�
+      WORD        stopSpeed;  //ͣ���ٶ�(����Ϊ��˸ʱ����ʾ��˸�ٶ�)
+      DWORD       stoptime;   //ͣ��ʱ��
+      long        stopx;      //ͣ��λ��
+      DWORD       size;       //���ݳ���
+      DWORD       color;      //�ַ���ɫ
+      WORD        fontset;    //�ַ���(һ����� 0=16���� 1=24����)
+      WORD        Reserved2;
+    }TString, *PString;
+    */
+    static final int STRING_STRUCT_SIZE = 32;  //2+1+1+1+1+2+2+2+4+4+4+4+2+2
+    static final int STRING_IN_METHOD_OFFSET = 2;
+    static final int STRING_OUT_METHOD_OFFSET = 3;
+    static final int STRING_STOP_METHOD_OFFSET = 4;
+    static final int STRING_IN_SPEED_OFFSET = 6;
+    static final int STRING_OUT_SPEED_OFFSET = 8;
+    static final int STRING_STOP_SPEED_OFFSET = 10;
+    static final int STRING_STOP_TIME_OFFSET = 12;
+    static final int STRING_SIZE_OFFSET = 20;
+    static final int STRING_COLOR_OFFSET = 24;
+    static final int STRING_FONT_SET_OFFSET = 28;
+
+    /*
+    //��������ʱ�����
+    typedef struct STRINGDCLOCK{
+      TObject     object;       //�����һ�㶨��
+      BYTE        type;         //���ͣ�����ʱ�䡢��սʱ��
+      BYTE        direct;       //����=0������=1��ʱ����ת90�ȣ�=2˳ʱ����ת90��
+      WORD        step;         //����
+      TTimeStamp  basetime;     //��׼ʱ��(��սʱ��ʹ��)
+      TTimeStamp  fromtime;     //��ʼʱ��(��սʱ��ʹ��)
+      TTimeStamp  totime;       //����ʱ��(��սʱ��ʹ��)
+      long        year_offset;  //��ƫ����
+      long        month_offset; //��ƫ����
+      long        day_offset;   //��ƫ����
+      long        time_offset;  //ʱ��ƫ����(����)
+      WORD        formats[MAX_DATETIME_FORMAT];  //��ʾ��ʽ[32]
+      DWORD       color;
+      BYTE        fontset;
+      BYTE        reserved;
+      WORD        reserved2;
+    }TStringDClock, *PStringDClock;
+    */
+    static final int SDCLOCK_STRUCT_SIZE = OBJECT_STRUCT_SIZE+116;  //2+1+1+1+1+2+2+2+4+4+4+4+2+2
+    static final int SDCLOCK_FORMAT_OFFSET = 44;
+    static final int SDCLOCK_COLOR_OFFSET = 108;
+    static final int SDCLOCK_FONTSET_OFFSET = 112;
+
+    /*
+    //����ʱ�����
+    typedef struct DClock{
+      TObject     object;       //�����һ�㶨��
+      BYTE        type;         //���ͣ�����ʱ�䡢��սʱ��
+      BYTE        direct;       //����=0������=1��ʱ����ת90�ȣ�=2˳ʱ����ת90��
+      WORD        step;         //����
+      TTimeStamp  basetime;     //��׼ʱ��(��սʱ��ʹ��)
+      TTimeStamp  fromtime;     //��ʼʱ��(��սʱ��ʹ��)
+      TTimeStamp  totime;       //����ʱ��(��սʱ��ʹ��)
+      long        year_offset;  //��ƫ����
+      long        month_offset; //��ƫ����
+      long        day_offset;   //��ƫ����
+      long        time_offset;  //ʱ��ƫ����(����)
+      WORD        formats[MAX_DATETIME_FORMAT];  //��ʾ��ʽ
+    }TDClock, *PDClock;
+    */
+    static final int DCLOCK_STRUCT_SIZE = OBJECT_STRUCT_SIZE+108;  //2+1+1+1+1+2+2+2+4+4+4+4+2+2
+    static final int DCLOCK_FORMAT_OFFSET = 44;
+
+    /*
+    //����ʱ������ʱ����
+    typedef struct COUNTER{
+      TObject    object;
+      TTimeStamp basetime;
+      WORD       type;
+      WORD       format;
+      WORD       Reserved1;
+      WORD       Reserved2;
+    }TCounter, *PCounter;
+    */
+    static final int COUNTER_STRUCT_SIZE = OBJECT_STRUCT_SIZE+24;  //2+1+1+1+1+2+2+2+4+4+4+4+2+2
+    static final int COUNTER_BASETIME_OFFSET = 0;
+    static final int COUNTER_TYPE_OFFSET = 8;
+    static final int COUNTER_FORMAT_OFFSET = 10;
+
+    /*
+    //�������Ŷ���
+    typedef struct VOICE{
+      TObject     object;     //�����һ�㶨��
+      DWORD       interval;
+      DWORD       times;
+      BYTE        voice_speaker;
+      BYTE        voice_volumn;
+      BYTE        voice_tone;
+      BYTE        voice_speed;
+      DWORD       reversed[4];
+    }TVoice, *PVoice;
+    */
+    static final int VOICE_STRUCT_SIZE = OBJECT_STRUCT_SIZE + 16;
+    static final int VOICE_INTERVAL_OFFSET = OBJECT_STRUCT_SIZE;
+    static final int VOICE_TIMES_OFFSET = OBJECT_STRUCT_SIZE + 4;
+    static final int VOICE_SPEAKER_OFFSET = OBJECT_STRUCT_SIZE + 8;
+    static final int VOICE_VOLUMN_OFFSET = OBJECT_STRUCT_SIZE + 9;
+    static final int VOICE_TONE_OFFSET = OBJECT_STRUCT_SIZE + 10;
+    static final int VOICE_SPEED_OFFSET = OBJECT_STRUCT_SIZE + 11;
+
+    /*
+    //ͼƬ���󣬺������һ������TPixels
+    typedef struct WINDOW{
+      WORD        id;
+      BYTE        inMethod;   //���뷽ʽ
+      BYTE        outMethod;  //������ʽ
+      BYTE        stopMethod; //ͣ����ʽ
+      BYTE        flag;       //һЩ���Ʊ�־
+      WORD        inSpeed;    //�����ٶ�
+      WORD        outSpeed;   //�����ٶ�
+      WORD        stopSpeed;  //ͣ���ٶ�(����Ϊ��˸ʱ����ʾ��˸�ٶ�)
+      DWORD       stoptime;   //ͣ��ʱ��
+      long        stopx;      //ͣ��λ��
+      DWORD       size;       //���ݳ���
+    }TWindow, *PWindow;
+    */
+    static final int WINDOW_STRUCT_SIZE = 24;  //2+1+1+1+1+2+2+2+4+4+4
+    static final int WINDOW_IN_METHOD_OFFSET = 2;
+    static final int WINDOW_OUT_METHOD_OFFSET = 3;
+    static final int WINDOW_STOP_METHOD_OFFSET = 4;
+    static final int WINDOW_IN_SPEED_OFFSET = 6;
+    static final int WINDOW_OUT_SPEED_OFFSET = 8;
+    static final int WINDOW_STOP_SPEED_OFFSET = 10;
+    static final int WINDOW_STOP_TIME_OFFSET = 12;
+    static final int WINDOW_SIZE_OFFSET = 20;
+
+    /*
+    //ͼƬ���󣬺������һ������TPixels
+    typedef struct SCHEDULEWINDOW{
+      WORD        id;
+      BYTE        inMethod;   //���뷽ʽ
+      BYTE        outMethod;  //������ʽ
+      BYTE        stopMethod; //ͣ����ʽ
+      BYTE        flag;       //һЩ���Ʊ�־
+      WORD        inSpeed;    //�����ٶ�
+      WORD        outSpeed;   //�����ٶ�
+      WORD        stopSpeed;  //ͣ���ٶ�(����Ϊ��˸ʱ����ʾ��˸�ٶ�)
+      DWORD       stoptime;   //ͣ��ʱ��
+      long        stopx;      //ͣ��λ��
+      DWORD       size;       //���ݳ���
+      TPlaySchedule schedule; //���żƻ�
+    }TScheduleWindow, *PScheduleWindow;
+    */
+    static final int SCHEDULE_WINDOW_STRUCT_SIZE = WINDOW_STRUCT_SIZE + PLAY_SCHEDULE_SIZE;  //2+1+1+1+1+2+2+2+4+4+4+20
+
+    /*
+    //�������ݽṹ���壨���󼯰����������
+    typedef struct PIXELSET{
+      WORD   id;            //�����ʶ
+      WORD   count;         //TPixels������Ŀ
+      DWORD  size;          //�����ֽ���
+    }TPixelSet, *PPixelSet;
+    */
+    static final int PIXELSET_STRUCT_SIZE = 8;  //2+2+4
+    static final int PIXELSET_COUNT_OFFSET = 2;
+    static final int PIXELSET_SIZE_OFFSET = 4;
+
+    /*
+    //�������ݽṹ����
+    typedef struct PIXELS{
+      WORD   id;            //�����ʶ
+      WORD   bits;          //ÿ����λ��
+      long   width;         //������
+      long   height;        //����߶�
+      DWORD  size;          //�����С
+    }TPixels, *PPixels;
+    */
+    static final int PIXELS_STRUCT_SIZE = 16;  //2+2+4+4+4
+    static final int PIXELS_BITS_OFFSET = 2;
+    static final int PIXELS_WIDTH_OFFSET = 4;
+    static final int PIXELS_HEIGHT_OFFSET = 8;
+    static final int PIXELS_SIZE_OFFSET = 12;
+
+    /*
+    typedef struct PKG_RESPOND{
+        TPKG_Header Header;
+        WORD Command;
+        WORD Result;
+    }TPKG_Respond, *PPKG_Respond;
+    */
+    static final int RESPOND_STRUCT_SIZE = 12;
+    static final int RESPOND_COMMAND_OFFSET = 0;
+    static final int RESPOND_RESULT_OFFSET = 2;
+
+    /*
+    typedef struct BOARDPARAM{
+          WORD   width;
+          WORD   height;
+          WORD   type;
+          WORD   frequency;
+          DWORD  flag;
+          DWORD  uart;								//+2+2+2+2+4+4=16
+          BYTE   mac[ETHER_ADDRESS_LENGTH];
+          BYTE   ip[IP_ADDRESS_LENGTH];
+          BYTE   gateMAC[ETHER_ADDRESS_LENGTH];
+          BYTE   serverIP[IP_ADDRESS_LENGTH];		//+6+4+6+4=36
+          BYTE   brightness;
+          BYTE   importflag;
+          BYTE   rootcount;
+          BYTE   disconnect_sec;
+          DWORD  rom_size;
+          long   left;
+          long   top;								//+4+4+4+4=52
+          WORD   scan_mode;
+          WORD   server_port;
+          WORD   line_order;
+          WORD   oe_time;
+          WORD   shift_freq;
+          WORD   refresh_freq;						//+2+2+2+2+2+2=64;
+          BYTE   GateIP[IP_ADDRESS_LENGTH];
+          BYTE   ipMask[IP_ADDRESS_LENGTH];			//+4+4=72
+          BYTE   name[32];
+          DWORD  ident;
+          DWORD  address;							//+32+4+4=112
+          DWORD  pkp_rx_timeo;
+          DWORD  pkp_tx_timeo;
+          DWORD  pkp_tx_repeat;
+          BYTE   dnsIP[IP_ADDRESS_LENGTH];
+          BYTE   dnsMAC[ETHER_ADDRESS_LENGTH];
+          WORD   ReportTime;						//+12+4+6+2=136
+          //���server_host=0����server_domain��Ч
+          BYTE   serverDomain[32];
+          //��ʾ������Կ������������Կ���������ݰ�����ֹ�Ƿ��û�����ʾ���Ϸ�����Ϣ
+          DWORD  key;
+          DWORD  pkp_length;                        //+32+4+4=176
+          //��Ӧ��bin�ļ���
+          char   bin_name[32];                      //+32=208
+          //////////////////////////////////////////////////////
+          //�����ز���
+          BYTE   light_sense;
+          BYTE   light_sense_auto;
+          WORD   light_sense_reserved;
+          WORD   light_sense_split_val[8];
+          BYTE   light_sense_bright_val[8];         //+28=236
+          //////////////////////////////////////////////////////
+          //˫��ʱ��ͬ���ܿض�IP��ַ
+          BYTE   TimeSyncIP[IP_ADDRESS_LENGTH];		//+4=240
+          //////////////////////////////////////////////////////
+          //�Զ���������
+          BYTE   auto_reset_enabled;
+          BYTE   auto_reset_type;
+          BYTE   auto_reset_hour;
+          BYTE   auto_reset_minute;
+        }TBoardParam, *PBoardParam;
+    */
+    static final int BOARDPARAM_STRUCT_SIZE = 512;
+    static final int BOARDPARAM_WIDTH_OFFSET = 0;
+    static final int BOARDPARAM_HEIGHT_OFFSET = 2;
+    static final int BOARDPARAM_COLORMODE_OFFSET = 4;
+    static final int BOARDPARAM_IP_OFFSET = 22;
+
+    static int root_seek = -1;
+    static int root_size = 0;
+    static int root_count = 0;
+    static int chapter_seek = -1;
+    static int chapter_size = 0;
+    static int chapter_count = 0;
+    static int region_seek = -1;
+    static int region_size = 0;
+    static int region_count = 0;
+    static int leaf_seek = -1;
+    static int leaf_size = 0;
+    static int leaf_count = 0;
+    static int strings_seek = -1;
+    static int strings_size = 0;
+    static int strings_count = 0;
+    static int windows_seek = -1;
+    static int windows_size = 0;
+    static int windows_count = 0;
+    static int data_seek = 0;
+
+    public static byte[] data_stream;
+    public static byte[] cmd_stream;
+    public static byte[] respond_stream;
+    public static byte[] packet_stream;
+    public static int packet_size;
+
+    public static int get_boardparam_respond_size = 0;
+
+    public static final int RGB_SPLIT = 64;
+
+    public int fix_serialno=0;
+
+    static private int current_color_type=0;
+
+    public void print_stream(byte[] stream, int size){
+        int i;
+        short x;
+        String s;
+        //System.out.print("size="+size+"; "+"data=");
+        for (i=0; i<size; i++){
+            if (stream[i]<0) x=(short)(256+stream[i]); else x=stream[i];
+            s=Integer.toHexString(x);
+            if (s.length()==1) s="0x0"+s; else s="0x"+s;
+            //System.out.print(s);
+            //System.out.print(' ');
+        }
+        //System.out.println();
+    }
+
+    public void print_stream_ex(byte[] stream, int start, int size){
+        int i;
+        short x;
+        //System.out.print("size="+size+"; "+"data=");
+        for (i=start; i<start+size; i++){
+            if (stream[i]<0) x=(short)(256+stream[i]); else x=stream[i];
+            //System.out.print(x);
+            //System.out.print(' ');
+        }
+        //System.out.println();
+    }
+
+    static byte lo_of_short(short value){
+        return (byte)(value&0xFF);
+    }
+
+    static byte hi_of_short(short value){
+        return (byte)((value>>8)&0xFF);
+    }
+
+    static short lo_of_int(int value){
+        return (short)(value&0xFFFF);
+    }
+
+    static short hi_of_int(int value){
+        return (short)((value>>16)&0xFFFF);
+    }
+
+    static void byteFill(byte[] buffer, int index, byte value){
+        buffer[index]=value;
+    }
+
+    static int asByte(byte[] buffer, int index){
+        return buffer[index];
+    }
+
+    static void shortFill(byte[] buffer, int index, short value){
+        buffer[index]=lo_of_short(value);
+        buffer[index+1]=hi_of_short(value);
+    }
+
+    static int asShort(byte[] buffer, int index){
+        int value;
+        short result=0;
+        if (buffer[index]>=0) value=buffer[index]; else value=(256+buffer[index]);
+        result+=value;
+        if (buffer[index+1]>=0) value=buffer[index+1]; else value=(256+buffer[index+1]);
+        result+=(value<<8);
+        return (short)result;
+    }
+
+    static String asIP(byte[] buffer, int index){
+        int[] ip=new int[4];
+        int i;
+        for(i=0; i<4; i++){
+            if (buffer[index+i]>=0) ip[i]=buffer[index+i]; else ip[i]=(256+buffer[index+i]);
+        }
+        return ip[0]+"."+ip[1]+"."+ip[2]+"."+ip[3];
+    }
+
+    static String asMAC(byte[] buffer, int index){
+        int[] mac=new int[6];
+        int i;
+        for(i=0; i<6; i++){
+            if (buffer[index+i]>=0) mac[i]=buffer[index+i]; else mac[i]=(256+buffer[index+i]);
+        }
+        return mac[0]+"-"+mac[1]+"-"+mac[2]+"-"+mac[3]+"-"+mac[4]+"-"+mac[5];
+    }
+
+    static void intFill(byte[] buffer, int index, int value){
+        buffer[index]=lo_of_short(lo_of_int(value));
+        buffer[index+1]=hi_of_short(lo_of_int(value));
+        buffer[index+2]=lo_of_short(hi_of_int(value));
+        buffer[index+3]=hi_of_short(hi_of_int(value));
+    }
+
+    static void timeFill(byte[] buffer, int index, int hour, int minute, int second){
+        int time;
+        time=((hour*60+minute)*60+second)*1000;
+        intFill(buffer, index, time);
+    }
+
+    static void dateFill(byte[] buffer, int index, int year, int month, int day){
+        int date;
+        int MonthDays[][]={{31,28,31,30,31,30,31,31,30,31,30,31}, {31,29,31,30,31,30,31,31,30,31,30,31}};
+        int i,y,m,d;
+
+        y=year-1;
+        for (m=0,d=year; d>100; d-=100, m++) ;
+        if ((year&3)==0 && ((m&3)==0 || d!=0)) d=1; else d=0;
+
+        date=day;
+        for (i=1; i<=month-1; i++) date+=MonthDays[d][i-1];
+        date+=y*365+(y>>2)-(y/100)+(y/400);
+
+        intFill(buffer, index, date);
+    }
+
+    static void timestampFill(byte[] buffer, int index, int year, int month, int day, int hour, int minute, int second){
+        timeFill(buffer, index, hour, minute, second);
+        dateFill(buffer, index+4, year, month, day);
+    }
+
+    static int asInt(byte[] buffer, int index){
+        int value;
+        int result=0;
+        if (buffer[index]>=0) value=buffer[index]; else value=(256+buffer[index]);
+        result+=value;
+        if (buffer[index+1]>=0) value=buffer[index+1]; else value=(256+buffer[index+1]);
+        result+=(value<<8);
+        if (buffer[index+2]>=0) value=buffer[index+2]; else value=(256+buffer[index+2]);
+        result+=(value<<16);
+        if (buffer[index+3]>=0) value=buffer[index+3]; else value=(256+buffer[index+3]);
+        result+=(value<<24);
+        return result;
+    }
+
+    static void blockFill(byte[] buffer, int index, int count, byte value){
+        int i;
+        for (i=index; i<index+count; i++){
+            buffer[i]=value;
+        }
+    }
+
+    public void blockCopy(byte[] obuffer, int ostart, byte[] ibuffer, int istart, int count){
+        int x, y, i;
+        x=ostart;
+        y=istart;
+        for (i=0; i<count; i++){
+            obuffer[x++]=ibuffer[y++];
+        }
+    }
+
+    public void stringCopy(byte[] obuffer, int ostart, String str, int len){
+        int x, i;
+        x=ostart;
+        for (i=0; i<len; i++){
+            obuffer[x++]=str.getBytes()[i];
+        }
+    }
+
+    static short CRCTableHi[]={
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
+            0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40};
+
+    static short CRCTableLo[]={
+            0x00, 0xC0, 0xC1, 0x01, 0xC3, 0x03, 0x02, 0xC2, 0xC6, 0x06, 0x07, 0xC7, 0x05, 0xC5, 0xC4, 0x04,
+            0xCC, 0x0C, 0x0D, 0xCD, 0x0F, 0xCF, 0xCE, 0x0E, 0x0A, 0xCA, 0xCB, 0x0B, 0xC9, 0x09, 0x08, 0xC8,
+            0xD8, 0x18, 0x19, 0xD9, 0x1B, 0xDB, 0xDA, 0x1A, 0x1E, 0xDE, 0xDF, 0x1F, 0xDD, 0x1D, 0x1C, 0xDC,
+            0x14, 0xD4, 0xD5, 0x15, 0xD7, 0x17, 0x16, 0xD6, 0xD2, 0x12, 0x13, 0xD3, 0x11, 0xD1, 0xD0, 0x10,
+            0xF0, 0x30, 0x31, 0xF1, 0x33, 0xF3, 0xF2, 0x32, 0x36, 0xF6, 0xF7, 0x37, 0xF5, 0x35, 0x34, 0xF4,
+            0x3C, 0xFC, 0xFD, 0x3D, 0xFF, 0x3F, 0x3E, 0xFE, 0xFA, 0x3A, 0x3B, 0xFB, 0x39, 0xF9, 0xF8, 0x38,
+            0x28, 0xE8, 0xE9, 0x29, 0xEB, 0x2B, 0x2A, 0xEA, 0xEE, 0x2E, 0x2F, 0xEF, 0x2D, 0xED, 0xEC, 0x2C,
+            0xE4, 0x24, 0x25, 0xE5, 0x27, 0xE7, 0xE6, 0x26, 0x22, 0xE2, 0xE3, 0x23, 0xE1, 0x21, 0x20, 0xE0,
+            0xA0, 0x60, 0x61, 0xA1, 0x63, 0xA3, 0xA2, 0x62, 0x66, 0xA6, 0xA7, 0x67, 0xA5, 0x65, 0x64, 0xA4,
+            0x6C, 0xAC, 0xAD, 0x6D, 0xAF, 0x6F, 0x6E, 0xAE, 0xAA, 0x6A, 0x6B, 0xAB, 0x69, 0xA9, 0xA8, 0x68,
+            0x78, 0xB8, 0xB9, 0x79, 0xBB, 0x7B, 0x7A, 0xBA, 0xBE, 0x7E, 0x7F, 0xBF, 0x7D, 0xBD, 0xBC, 0x7C,
+            0xB4, 0x74, 0x75, 0xB5, 0x77, 0xB7, 0xB6, 0x76, 0x72, 0xB2, 0xB3, 0x73, 0xB1, 0x71, 0x70, 0xB0,
+            0x50, 0x90, 0x91, 0x51, 0x93, 0x53, 0x52, 0x92, 0x96, 0x56, 0x57, 0x97, 0x55, 0x95, 0x94, 0x54,
+            0x9C, 0x5C, 0x5D, 0x9D, 0x5F, 0x9F, 0x9E, 0x5E, 0x5A, 0x9A, 0x9B, 0x5B, 0x99, 0x59, 0x58, 0x98,
+            0x88, 0x48, 0x49, 0x89, 0x4B, 0x8B, 0x8A, 0x4A, 0x4E, 0x8E, 0x8F, 0x4F, 0x8D, 0x4D, 0x4C, 0x8C,
+            0x44, 0x84, 0x85, 0x45, 0x87, 0x47, 0x46, 0x86, 0x82, 0x42, 0x43, 0x83, 0x41, 0x81, 0x80, 0x40};
+
+    static int CreateCRC(byte[] buffer, int size){
+        short CRCHi=0xFF;
+        short CRCLo=0xFF;
+        int r;
+        int i;
+
+        for (i=0; i<size; i++)
+        {
+            r=(buffer[i]^CRCHi)&0xFF;
+            CRCHi=(short)(CRCLo^CRCTableHi[r]);
+            CRCLo=CRCTableLo[r];
+        }
+        return ((CRCHi&0xFF)<<8)+(CRCLo&0xFF);
+    }
+
+    static int Pack(byte[] opacket, byte[] ipacket, int isize){
+        int x, y;
+        int crc;
+        x=0;
+        y=0;
+        crc=CreateCRC(ipacket, isize);
+        ipacket[isize++]=(byte)(crc&0xFF);
+        ipacket[isize++]=(byte)((crc>>8)&0xFF);
+        opacket[y++]=(byte)PKP_PREFIX;
+        for (x=0; x<isize; x++){
+            switch(ipacket[x]){
+                case (byte)PKP_PREFIX:
+                    opacket[y++]=(byte)PKP_FILLCH;
+                    opacket[y++]=(byte)(PKP_PREFIX+1);
+                    break;
+                case (byte)PKP_SUFFIX:
+                    opacket[y++]=(byte)PKP_FILLCH;
+                    opacket[y++]=(byte)(PKP_SUFFIX+1);
+                    break;
+                case (byte)PKP_FILLCH:
+                    opacket[y++]=(byte)PKP_FILLCH;
+                    opacket[y++]=(byte)(PKP_FILLCH+1);
+                    break;
+                default:
+                    opacket[y++]=ipacket[x];
+                    break;
+            }
+        }
+        opacket[y++]=(byte)PKP_SUFFIX;
+        return y;
+    }
+
+    static int Depack(byte[] opacket, byte[] ipacket, int isize){
+        int x, y;
+        x=1;
+        y=0;
+        while (x<isize-1){
+            switch(ipacket[x]){
+                case (byte)PKP_FILLCH:
+                    opacket[y++]=(byte)(ipacket[x+1]-1);
+                    x+=2;
+                    break;
+                default:
+                    opacket[y++]=ipacket[x];
+                    x++;
+                    break;
+            }
+        }
+        return y-2;
+    }
+
+    //��ʼ����Ŀ����
+    //roottype: ��Ŀ����  ROOT_PLAYΪRAM��Ŀ�����綪ʧ��ROOT_DOWNLOADΪFLASH��Ŀ�����粻��ʧ��
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    public void MakeRoot(int roottype, int colortype) {
+        root_seek=0;
+        root_count=0;
+        root_size=ROOT_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        data_seek=root_seek+root_size;
+        //System.out.println("root="+data_seek);
+    }
+
+    //��ʼ����������
+    //roottype: ��Ŀ����  ROOT_PLAYΪRAM��Ŀ�����綪ʧ��ROOT_DOWNLOADΪFLASH��Ŀ�����粻��ʧ��
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    //survive: ��Ŀ����ʱ�����룩��roottypeΪROOT_PLAYʱ��Ч�������͵Ľ�Ŀ���Ŵﵽ���ʱ������ʾ���ý�Ŀ��
+    public void MakeRootEx(int roottype, int colortype, int survive) {
+        root_seek=0;
+        root_count=0;
+        root_size=ROOT_STRUCT_SIZE;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, survive);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        data_seek=root_seek+root_size;
+        //System.out.println("root="+data_seek);
+    }
+
+    //��ʼ���ֲ�ˢ�£�ֻ����һ����Ŀ����Ŀ����
+    //roottype: ��Ŀ����  ROOT_PLAY_CHAPTER
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    //mode: ˢ��ģʽ��0���룬1�滻��Ŀǰֻ֧��1�滻��ʽ
+    //chapter_index: �滻��Ŀ���
+    public void MakeChapter(int roottype, int colortype, int mode, int chapter_index,
+                            int wait, int time) {
+        root_seek=0;
+        chapter_seek=0;
+        region_seek=0;
+        leaf_seek=0;
+
+        root_count=0;
+        root_size=ROOT_SUB_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_ACTION_MODE, (short)mode);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_CHAPTER_INDEX, (short)chapter_index);
+
+        data_seek=root_seek+root_size;
+
+        chapter_seek=data_seek;
+        chapter_count=0;
+        chapter_size=CHAPTER_STRUCT_SIZE;
+        blockFill(data_stream, chapter_seek, chapter_size, (byte)0);
+        shortFill(data_stream, chapter_seek, (short)OBJECT_CHAPTER);
+        shortFill(data_stream, chapter_seek+CHAPTER_WAIT_OFFSET, (short)wait);
+        intFill(data_stream, chapter_seek+CHAPTER_TIME_OFFSET, time);
+        intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        shortFill(data_stream, chapter_seek+CHAPTER_COUNT_OFFSET, (short)chapter_count);
+        root_size+=chapter_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=chapter_seek+chapter_size;
+    }
+
+    public void MakeChapterEx(int roottype, int colortype, int mode, int chapter_index,
+                              int wait, int time, int priority, int kind, int week,
+                              int from_year, int from_month, int from_day, int from_hour, int from_minute, int from_second,
+                              int to_year, int to_month, int to_day, int to_hour, int to_minute, int to_second) {
+        root_seek=0;
+        chapter_seek=0;
+        region_seek=0;
+        leaf_seek=0;
+
+        root_count=0;
+        root_size=ROOT_SUB_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_ACTION_MODE, (short)mode);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_CHAPTER_INDEX, (short)chapter_index);
+
+        data_seek=root_seek+root_size;
+
+        chapter_seek=data_seek;
+        chapter_count=0;
+        chapter_size=CHAPTER_STRUCT_SIZE;
+        blockFill(data_stream, chapter_seek, chapter_size, (byte)0);
+        shortFill(data_stream, chapter_seek, (short)OBJECT_CHAPTER);
+
+        shortFill(data_stream, chapter_seek+CHAPTER_WAIT_OFFSET, (short)wait);
+        byteFill(data_stream, chapter_seek+CHAPTER_PRIORITY_OFFSET, (byte)priority);
+        intFill(data_stream, chapter_seek+CHAPTER_TIME_OFFSET, time);
+        intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        shortFill(data_stream, chapter_seek+CHAPTER_COUNT_OFFSET, (short)chapter_count);
+        shortFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_KIND_OFFSET, (short)kind);
+        shortFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_WEEK_OFFSET, (short)week);
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_FROMTIME_OFFSET, SystemTimeToTime(from_hour, from_minute, from_second));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_FROMDATE_OFFSET, SystemTimeToDate(from_year, from_month, from_day));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_TOTIME_OFFSET, SystemTimeToTime(to_hour, to_minute, to_second));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_TODATE_OFFSET, SystemTimeToDate(to_year, to_month, to_day));
+
+        root_size+=chapter_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=chapter_seek+chapter_size;
+    }
+
+    //��ʼ���ֲ�ˢ�£�ֻ����һ����������Ŀ����
+    //roottype: ��Ŀ����  ROOT_PLAY_REGION
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    //mode: ˢ��ģʽ��0���룬1�滻��Ŀǰֻ֧��1�滻��ʽ
+    //chapter_index: �滻��Ŀ���
+    //region_index: �滻�������
+    public void MakeRegion(int roottype, int colortype, int mode, int chapter_index, int region_index,
+                           int left, int top, int width, int height) {
+        root_seek=0;
+        chapter_seek=0;
+        region_seek=0;
+        leaf_seek=0;
+
+        root_count=0;
+        root_size=ROOT_SUB_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_ACTION_MODE, (short)mode);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_CHAPTER_INDEX, (short)chapter_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_REGION_INDEX, (short)region_index);
+
+        data_seek=root_seek+root_size;
+
+        region_seek=data_seek;
+        region_count=0;
+        region_size=REGION_STRUCT_SIZE;
+        blockFill(data_stream, region_seek, region_size, (byte)0);
+        shortFill(data_stream, region_seek, (short)OBJECT_REGION);
+        intFill(data_stream, region_seek+REGION_LEFT_OFFSET, left);
+        intFill(data_stream, region_seek+REGION_TOP_OFFSET, top);
+        intFill(data_stream, region_seek+REGION_RIGHT_OFFSET, left+width);
+        intFill(data_stream, region_seek+REGION_BOTTOM_OFFSET, top+height);
+        intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        shortFill(data_stream, region_seek+REGION_COUNT_OFFSET, (short)region_count);
+        root_size+=region_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=region_seek+region_size;
+    }
+
+    //��ʼ���ֲ�ˢ�£�ֻ����һ��ҳ�棩��Ŀ����
+    //roottype: ��Ŀ����  ROOT_PLAY_LEAF
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    //mode: ˢ��ģʽ��0���룬1�滻��Ŀǰֻ֧��1�滻��ʽ
+    //chapter_index: �滻��Ŀ���
+    //region_index: �滻�������
+    //leaf_index: �滻ҳ����
+    public void MakeLeaf(int roottype, int colortype, int mode, int chapter_index, int region_index, int leaf_index,
+                         int wait, int time) {
+        root_seek=0;
+        chapter_seek=0;
+        region_seek=0;
+        leaf_seek=0;
+
+        root_count=0;
+        root_size=ROOT_SUB_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_ACTION_MODE, (short)mode);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_CHAPTER_INDEX, (short)chapter_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_REGION_INDEX, (short)region_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_LEAF_INDEX, (short)leaf_index);
+
+        data_seek=root_seek+root_size;
+
+        leaf_seek=data_seek;
+        leaf_count=0;
+        leaf_size=LEAF_STRUCT_SIZE;
+        blockFill(data_stream, leaf_seek, leaf_size, (byte)0);
+        shortFill(data_stream, leaf_seek, (short)OBJECT_LEAF);
+        shortFill(data_stream, leaf_seek+LEAF_WAIT_OFFSET, (short)wait);
+        intFill(data_stream, leaf_seek+LEAF_TIME_OFFSET, time);
+        intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+        root_size+=leaf_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=leaf_seek+leaf_size;
+
+    }
+
+    //��ʼ���ֲ�ˢ�£�ֻ����һ�����󣩽�Ŀ����
+    //roottype: ��Ŀ����  ROOT_PLAY_LEAF
+    //colortype: ��ɫ���� COLOR_TYPE_DOUBLEΪ˫��ɫ��COLOR_TYPE_THREEΪ�޻Ҷ�ȫ��
+    //mode: ˢ��ģʽ��0���룬1�滻��Ŀǰֻ֧��1�滻��ʽ
+    //chapter_index: �滻��Ŀ���
+    //region_index: �滻�������
+    //leaf_index: �滻ҳ����
+    //object_index: �滻������
+    public void MakeObject(int roottype, int colortype, int mode, int chapter_index, int region_index, int leaf_index, int object_index) {
+        root_seek=0;
+        chapter_seek=0;
+        region_seek=0;
+        leaf_seek=0;
+
+        root_count=0;
+        root_size=ROOT_SUB_STRUCT_SIZE;
+        current_color_type=colortype;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)roottype);
+        shortFill(data_stream, root_seek+ROOT_COLORTYPE_OFFSET, (short)colortype);
+        intFill(data_stream, root_seek+ROOT_SURVIVE_OFFSET, -1);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_ACTION_MODE, (short)mode);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_CHAPTER_INDEX, (short)chapter_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_REGION_INDEX, (short)region_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_LEAF_INDEX, (short)leaf_index);
+        shortFill(data_stream, root_seek+ROOT_STRUCT_SIZE+ROOT_SUB_OBJECT_INDEX, (short)object_index);
+
+        data_seek=root_seek+root_size;
+    }
+
+    //��ӽ�Ŀ
+    //wait 1=�ȴ���Ŀ�ڲ����ݲ������  0=���ս�Ŀʱ�䳤�Ȳ���
+    //time ��Ŀ����ʱ������λ����
+    public void AddChapter(int wait, int time) {
+        chapter_seek=data_seek;
+        chapter_count=0;
+        chapter_size=CHAPTER_STRUCT_SIZE;
+        blockFill(data_stream, chapter_seek, chapter_size, (byte)0);
+        shortFill(data_stream, chapter_seek, (short)OBJECT_CHAPTER);
+        shortFill(data_stream, chapter_seek+CHAPTER_WAIT_OFFSET, (short)wait);
+        intFill(data_stream, chapter_seek+CHAPTER_TIME_OFFSET, time);
+        intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        shortFill(data_stream, chapter_seek+CHAPTER_COUNT_OFFSET, (short)chapter_count);
+        root_count++;
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        root_size+=chapter_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=chapter_seek+chapter_size;
+        //System.out.println("chapter="+data_seek);
+    }
+
+    int SystemTimeToDate(int year, int month, int day)
+    {
+        long MonthDays[][]={{31,28,31,30,31,30,31,31,30,31,30,31},{31,29,31,30,31,30,31,31,30,31,30,31}};
+        int i, y, m, d;
+        int date;
+
+        y=year-1;
+        for (m=0,d=year; d>100; d-=100, m++) ;
+
+        if (((year & 3)==0) && ((m & 3)==0 || (d!=0))) d=1;
+        else d=0;
+
+        date=day;
+        for (i=1; i<=month-1; i++) date+=MonthDays[d][i-1];
+        date+=y*365+(y>>2)-(y/100)+(y/400);
+
+        return date;
+    }
+
+    int SystemTimeToTime(int hour, int minute, int second)
+    {
+        return hour*60*60000+minute*60000+second*1000;
+    }
+
+    //��ӽ�Ŀ
+    //wait 1=�ȴ���Ŀ�ڲ����ݲ������  0=���ս�Ŀʱ�䳤�Ȳ���
+    //time ��Ŀ����ʱ������λ����
+    //priority ���ȼ�����ʾ����ֻ�������ȼ����Ľ�Ŀ������ж����Ŀ��������ȼ���ֵ����ѭ���л�����
+    //kind �ƻ�ģʽ��=0ʼ�ղ��ţ�=1��һ��ÿ�ղ��ţ�=2����ֹʱ�䲥�ţ�=3������
+    //week һ�ܶ��壬��kind=1ʱ��Ч����bit0-bit6��ʾ���յ�����
+    //              ����0x1     ��һ0x2    �ܶ�0x4     ����0x8     ����0x10     ����0x20     ����0x30
+    //              ���ֵ���������ϣ�����ֻ������һ���ܶ���������3�죬��week��ֵ0x2+0x4+0x8����
+    public void AddChapterEx(int wait, int time, int priority, int kind, int week,
+                             int from_year, int from_month, int from_day, int from_hour, int from_minute, int from_second,
+                             int to_year, int to_month, int to_day, int to_hour, int to_minute, int to_second) {
+        chapter_seek=data_seek;
+        chapter_count=0;
+        chapter_size=CHAPTER_STRUCT_SIZE;
+        blockFill(data_stream, chapter_seek, chapter_size, (byte)0);
+        shortFill(data_stream, chapter_seek, (short)OBJECT_CHAPTER);
+        shortFill(data_stream, chapter_seek+CHAPTER_WAIT_OFFSET, (short)wait);
+        byteFill(data_stream, chapter_seek+CHAPTER_PRIORITY_OFFSET, (byte)priority);
+        intFill(data_stream, chapter_seek+CHAPTER_TIME_OFFSET, time);
+        intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        shortFill(data_stream, chapter_seek+CHAPTER_COUNT_OFFSET, (short)chapter_count);
+        shortFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_KIND_OFFSET, (short)kind);
+        shortFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_WEEK_OFFSET, (short)week);
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_FROMTIME_OFFSET, SystemTimeToTime(from_hour, from_minute, from_second));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_FROMDATE_OFFSET, SystemTimeToDate(from_year, from_month, from_day));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_TOTIME_OFFSET, SystemTimeToTime(to_hour, to_minute, to_second));
+        intFill(data_stream, chapter_seek+CHAPTER_PLAY_SCHEDULE_TODATE_OFFSET, SystemTimeToDate(to_year, to_month, to_day));
+        root_count++;
+        intFill(data_stream, root_seek+ROOT_COUNT_OFFSET, root_count);
+        root_size+=chapter_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=chapter_seek+chapter_size;
+        //System.out.println("chapter="+data_seek);
+    }
+
+    //��ӷ���
+    //left,top,width,height: ���Ͽ��
+    public void AddRegion(int left, int top, int width, int height) {
+        region_seek=data_seek;
+        region_count=0;
+        region_size=REGION_STRUCT_SIZE;
+        blockFill(data_stream, region_seek, region_size, (byte)0);
+        shortFill(data_stream, region_seek, (short)OBJECT_REGION);
+        intFill(data_stream, region_seek+REGION_LEFT_OFFSET, left);
+        intFill(data_stream, region_seek+REGION_TOP_OFFSET, top);
+        intFill(data_stream, region_seek+REGION_RIGHT_OFFSET, left+width);
+        intFill(data_stream, region_seek+REGION_BOTTOM_OFFSET, top+height);
+        intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        shortFill(data_stream, region_seek+REGION_COUNT_OFFSET, (short)region_count);
+        if (chapter_seek>0) {
+            chapter_count++;
+            shortFill(data_stream, chapter_seek+CHAPTER_COUNT_OFFSET, (short)chapter_count);
+            chapter_size+=region_size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=region_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=region_seek+region_size;
+    }
+
+    //���ҳ��
+    //wait 1=�ȴ�ҳ���ڲ����ݲ������  0=����ҳ��ʱ�䳤�Ȳ���
+    //time ҳ�沥��ʱ������λ����
+    public void AddLeaf(int wait, int time) {
+        leaf_seek=data_seek;
+        leaf_count=0;
+        leaf_size=LEAF_STRUCT_SIZE;
+        blockFill(data_stream, leaf_seek, leaf_size, (byte)0);
+        shortFill(data_stream, leaf_seek, (short)OBJECT_LEAF);
+        shortFill(data_stream, leaf_seek+LEAF_WAIT_OFFSET, (short)wait);
+        intFill(data_stream, leaf_seek+LEAF_TIME_OFFSET, time);
+        intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+        if (region_seek>0) {
+            region_count++;
+            shortFill(data_stream, region_seek+REGION_COUNT_OFFSET, (short)region_count);
+            region_size+=leaf_size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=leaf_size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=leaf_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=leaf_seek+leaf_size;
+    }
+
+    public void AddStrings(int left, int top, int width, int height) {
+        strings_seek=data_seek;
+        strings_count=0;
+        strings_size=STRINGS_STRUCT_SIZE;
+        blockFill(data_stream, strings_seek, strings_size, (byte)0);
+        shortFill(data_stream, strings_seek, (short)OBJECT_STRINGS);
+        blockFill(data_stream, strings_seek+OBJECT_TRANSPARENT_OFFSET, 1, (byte)1);
+        intFill(data_stream, strings_seek+OBJECT_LEFT_OFFSET, left);
+        intFill(data_stream, strings_seek+OBJECT_TOP_OFFSET, top);
+        intFill(data_stream, strings_seek+OBJECT_RIGHT_OFFSET, left+width);
+        intFill(data_stream, strings_seek+OBJECT_BOTTOM_OFFSET, top+height);
+        shortFill(data_stream, strings_seek+STRINGS_COUNT_OFFSET, (short)strings_count);
+        intFill(data_stream, strings_seek+OBJECT_SIZE_OFFSET, strings_size);
+        if (leaf_seek>0) {
+            leaf_count++;
+            shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+            leaf_size+=strings_size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=strings_size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=strings_size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=strings_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=strings_seek+strings_size;
+        //System.out.println("strings="+data_seek);
+    }
+
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    //color 0xFF=�죬0xFF00=�̣�0xFFFF=��
+    //fontset 0=16����1=24����
+    public void AddChildString(String text, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime, int color, int fontset) {
+        int seek, size;
+        int len=0;
+        byte[] gb2312;
+        try {
+            byte[] s=text.getBytes("GB2312");
+            print_stream(s, s.length);
+            len=s.length+1;
+            if ((len&0x3)>0) len=((len+0x3)&(~0x3));
+            gb2312=new byte[len];
+            blockFill(gb2312, 0, len, (byte)0);
+            blockCopy(gb2312, 0, s, 0, s.length);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            gb2312=new byte[0];
+        }
+
+        seek=data_seek;
+        size=STRING_STRUCT_SIZE+len;
+        size=((size+0x3)&(~0x3));
+        blockFill(data_stream, seek, size, (byte)0);
+        shortFill(data_stream, seek, (short)OBJECT_STRING);
+        byteFill(data_stream, seek+STRING_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+STRING_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+STRING_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+STRING_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+STRING_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+STRING_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+STRING_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+STRING_COLOR_OFFSET, color);
+        shortFill(data_stream, seek+STRING_FONT_SET_OFFSET, (short)fontset);
+        intFill(data_stream, seek+STRING_SIZE_OFFSET, size);
+        //stringCopy(data_stream, seek+STRING_STRUCT_SIZE, text, len);
+        blockCopy(data_stream, seek+STRING_STRUCT_SIZE, gb2312, 0, len);
+        strings_count++;
+        shortFill(data_stream, strings_seek+STRINGS_COUNT_OFFSET, (short)strings_count);
+        strings_size+=size;
+        intFill(data_stream, strings_seek+OBJECT_SIZE_OFFSET, strings_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childstring="+data_seek);
+    }
+
+    public void AddWindows(int left, int top, int width, int height) {
+        windows_seek=data_seek;
+        windows_count=0;
+        windows_size=WINDOWS_STRUCT_SIZE;
+        blockFill(data_stream, windows_seek, windows_size, (byte)0);
+        shortFill(data_stream, windows_seek, (short)OBJECT_WINDOWS);
+        blockFill(data_stream, windows_seek+OBJECT_TRANSPARENT_OFFSET, 1, (byte)1);
+        intFill(data_stream, windows_seek+OBJECT_LEFT_OFFSET, left);
+        intFill(data_stream, windows_seek+OBJECT_TOP_OFFSET, top);
+        intFill(data_stream, windows_seek+OBJECT_RIGHT_OFFSET, left+width);
+        intFill(data_stream, windows_seek+OBJECT_BOTTOM_OFFSET, top+height);
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_count++;
+            shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+            leaf_size+=windows_size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=windows_size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=windows_size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=windows_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=windows_seek+windows_size;
+        //System.out.println("windows="+data_seek);
+    }
+
+    //dib_buffer ����ͼƬRGB����
+    //dib_buffer_size ���鳤��
+    //dib_width ������
+    //dib_height ����߶�
+    static int AddPixelsRG(int[] dib_buffer, int dib_buffer_size, int dib_width, int dib_height) {
+        int pixels_seek, pixels_size, pixels_height;
+        int x, y;
+        int shift[] = new int[4];
+        int shift_value[] = new int[4];
+        int shift_mask[] = new int[4];
+        int bits_value[] = new int[4];
+        int bits_seek, bits_size;
+        int buffer_seek=0;
+        int byte_seek=3;
+
+        pixels_height=((dib_height+0xF)&(~0xF));
+        bits_size=(pixels_height>>2)*dib_width;
+        pixels_seek=data_seek;
+        pixels_size=PIXELS_STRUCT_SIZE+bits_size;
+        blockFill(data_stream, pixels_seek, pixels_size, (byte)0);
+
+        shortFill(data_stream, pixels_seek, (short)OBJECT_PIXELS);
+        shortFill(data_stream, pixels_seek+PIXELS_BITS_OFFSET, (short)BITMAP_YELLOW);
+        intFill(data_stream, pixels_seek+PIXELS_WIDTH_OFFSET, (int)dib_width);
+        intFill(data_stream, pixels_seek+PIXELS_HEIGHT_OFFSET, (int)pixels_height);
+        intFill(data_stream, pixels_seek+PIXELS_SIZE_OFFSET, (int)pixels_size);
+
+        bits_seek=pixels_seek+PIXELS_STRUCT_SIZE;
+        for (x=0; x<dib_width; x++){
+            shift[0]=0x0; shift[1]=0x0; shift[2]=0x0; shift[3]=0x80;
+            shift_mask[0]=0x0; shift_mask[1]=0x0; shift_mask[2]=0x0; shift_mask[3]=0xC0;
+            bits_value[0]=0x0; bits_value[1]=0x0; bits_value[2]=0x0; bits_value[3]=0x0;
+            byte_seek=3;
+            for (y=0; y<dib_height; y++){
+                shift_value[0]=0; shift_value[1]=0; shift_value[2]=0; shift_value[3]=0;
+                if (((dib_buffer[buffer_seek]>>8)&0xFF)>RGB_SPLIT) shift_value[byte_seek]|=shift[byte_seek];
+                shift[byte_seek]>>=1;
+                if ((dib_buffer[buffer_seek]&0xFF)>RGB_SPLIT) shift_value[byte_seek]|=shift[byte_seek];
+                shift[byte_seek]>>=1;
+                buffer_seek++;
+                if (shift_value[byte_seek]>0){
+                    bits_value[byte_seek]&=(~shift_mask[byte_seek]);
+                    bits_value[byte_seek]|=shift_value[byte_seek];
+                }
+                shift_mask[byte_seek]>>=2;
+                if (byte_seek==0 && shift[byte_seek]==0){
+                    data_stream[bits_seek]=(byte)bits_value[0];
+                    data_stream[bits_seek+1]=(byte)bits_value[1];
+                    data_stream[bits_seek+2]=(byte)bits_value[2];
+                    data_stream[bits_seek+3]=(byte)bits_value[3];
+                    bits_seek+=4;
+                    shift[0]=0x0; shift[1]=0x0; shift[2]=0x0; shift[3]=0x80;
+                    shift_mask[0]=0x0; shift_mask[1]=0x0; shift_mask[2]=0x0; shift_mask[3]=0xC0;
+                    bits_value[0]=0x0; bits_value[1]=0x0; bits_value[2]=0x0; bits_value[3]=0x0;
+                    byte_seek=3;
+                }
+                if (shift[byte_seek]==0){
+                    byte_seek--;
+                    shift[byte_seek]=0x80;
+                    shift_mask[byte_seek]=0xC0;
+                    bits_value[byte_seek]=0;
+                }
+            }
+            if (shift[3]!=0x80){
+                data_stream[bits_seek]=(byte)bits_value[0];
+                data_stream[bits_seek+1]=(byte)bits_value[1];
+                data_stream[bits_seek+2]=(byte)bits_value[2];
+                data_stream[bits_seek+3]=(byte)bits_value[3];
+                bits_seek+=4;
+            }
+        }
+
+        return pixels_size;
+    }
+
+    //dib_buffer ����ͼƬRGB����
+    //dib_buffer_size ���鳤��
+    //dib_width ������
+    //dib_height ����߶�
+    static int AddPixelsRGB(int[] dib_buffer, int dib_buffer_size, int dib_width, int dib_height) {
+        int pixels_seek, pixels_size, pixels_height;
+        int x, y, i;
+        int shift[] = new int[4];
+        int shift_value_r[] = new int[4];
+        int shift_value_g[] = new int[4];
+        int shift_value_b[] = new int[4];
+        int bits_seek, bits_size;
+        int buffer_seek=0;
+        int byte_seek=3;
+
+        pixels_height=((dib_height+0x1F)&(~0x1F));
+        bits_size=(pixels_height>>3)*dib_width*3;
+        pixels_seek=data_seek;
+        pixels_size=PIXELS_STRUCT_SIZE+bits_size;
+        blockFill(data_stream, pixels_seek, pixels_size, (byte)0);
+
+        shortFill(data_stream, pixels_seek, (short)OBJECT_PIXELS);
+        shortFill(data_stream, pixels_seek+PIXELS_BITS_OFFSET, (short)BITMAP_RGB);
+        intFill(data_stream, pixels_seek+PIXELS_WIDTH_OFFSET, (int)dib_width);
+        intFill(data_stream, pixels_seek+PIXELS_HEIGHT_OFFSET, (int)pixels_height);
+        intFill(data_stream, pixels_seek+PIXELS_SIZE_OFFSET, (int)pixels_size);
+
+        bits_seek=pixels_seek+PIXELS_STRUCT_SIZE;
+        for (x=0; x<dib_width; x++){
+            shift[0]=0x0; shift[1]=0x0; shift[2]=0x0; shift[3]=0x80;
+            byte_seek=3;
+            for (i=0; i<4; i++) shift_value_r[i]=0;
+            for (i=0; i<4; i++) shift_value_g[i]=0;
+            for (i=0; i<4; i++) shift_value_b[i]=0;
+            for (y=0; y<dib_height; y++){
+                if ((dib_buffer[buffer_seek]&0xFF)>RGB_SPLIT) {
+                    for (i=0; i<4; i++) shift_value_r[i]|=shift[i];
+                }
+                if (((dib_buffer[buffer_seek]>>8)&0xFF)>RGB_SPLIT) {
+                    for (i=0; i<4; i++) shift_value_g[i]|=shift[i];
+                }
+                if (((dib_buffer[buffer_seek]>>16)&0xFF)>RGB_SPLIT) {
+                    for (i=0; i<4; i++) shift_value_b[i]|=shift[i];
+                }
+                shift[byte_seek]>>=1;
+                buffer_seek++;
+                if (byte_seek==0 && shift[byte_seek]==0){
+                    for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_r[i];
+                    bits_seek+=4;
+                    for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_g[i];
+                    bits_seek+=4;
+                    for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_b[i];
+                    bits_seek+=4;
+                    shift[0]=0x0; shift[1]=0x0; shift[2]=0x0; shift[3]=0x80;
+                    byte_seek=3;
+                    for (i=0; i<4; i++) shift_value_r[i]=0;
+                    for (i=0; i<4; i++) shift_value_g[i]=0;
+                    for (i=0; i<4; i++) shift_value_b[i]=0;
+                }
+                if (shift[byte_seek]==0){
+                    byte_seek--;
+                    shift[byte_seek]=0x80;
+                }
+            }
+            if (shift[3]!=0x80){
+                for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_r[i];
+                bits_seek+=4;
+                for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_g[i];
+                bits_seek+=4;
+                for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)shift_value_b[i];
+                bits_seek+=4;
+            }
+        }
+
+        return pixels_size;
+    }
+
+    //dib_buffer ����ͼƬRGB����
+    //dib_buffer_size ���鳤��
+    //dib_width ������
+    //dib_height ����߶�
+    static int AddPixelsFull(int[] dib_buffer, int dib_buffer_size, int dib_width, int dib_height) {
+        int pixels_seek, pixels_size, pixels_height;
+        int x, y, z, i;
+        int shift[] = new int[4];
+        int data_value[] = new int[4];
+        int r_value, g_value, b_value;
+        int bits_seek, bits_size;
+        int buffer_seek=0;
+        int byte_seek=3;
+
+        pixels_height=dib_height;
+        bits_size=pixels_height*dib_width*4;
+        pixels_seek=data_seek;
+        pixels_size=PIXELS_STRUCT_SIZE+bits_size;
+        blockFill(data_stream, pixels_seek, pixels_size, (byte)0);
+
+        shortFill(data_stream, pixels_seek, (short)OBJECT_PIXELS);
+        shortFill(data_stream, pixels_seek+PIXELS_BITS_OFFSET, (short)BITMAP_RGB);
+        intFill(data_stream, pixels_seek+PIXELS_WIDTH_OFFSET, (int)dib_width);
+        intFill(data_stream, pixels_seek+PIXELS_HEIGHT_OFFSET, (int)pixels_height);
+        intFill(data_stream, pixels_seek+PIXELS_SIZE_OFFSET, (int)pixels_size);
+
+        bits_seek=pixels_seek+PIXELS_STRUCT_SIZE;
+        for (x=0; x<dib_width; x++){
+            for (y=0; y<dib_height; y++){
+                byte_seek=3;
+                shift[0]=0x0; shift[1]=0x0; shift[2]=0x0; shift[3]=0x80;
+                for (i=0; i<4; i++) data_value[i]=0;
+                r_value=(dib_buffer[buffer_seek]&0xFF);
+                g_value=((dib_buffer[buffer_seek]>>8)&0xFF);
+                b_value=((dib_buffer[buffer_seek]>>16)&0xFF);
+                if (r_value>0 || g_value>0 || b_value>0){
+                    for (z=0; z<8; z++){
+                        data_value[byte_seek]<<=1;
+                        if ((r_value & 0x80) > 0) data_value[byte_seek]|=1;
+                        data_value[byte_seek]<<=1;
+                        if ((g_value & 0x80) > 0) data_value[byte_seek]|=1;
+                        data_value[byte_seek]<<=1;
+                        if ((b_value & 0x80) > 0) data_value[byte_seek]|=1;
+                        data_value[byte_seek]<<=1;
+                        r_value<<=1;
+                        g_value<<=1;
+                        b_value<<=1;
+                        shift[byte_seek]>>=4;
+                        if (shift[byte_seek]==0){
+                            if (byte_seek==0) byte_seek=3; else	byte_seek--;
+                            shift[byte_seek]=0x80;
+                        }
+                    }
+                }
+                for (i=0; i<4; i++) data_stream[bits_seek+i]=(byte)data_value[i];
+                bits_seek+=4;
+                buffer_seek++;
+            }
+        }
+
+        return pixels_size;
+    }
+
+    static int AddPixels(int[] dib_buffer, int dib_buffer_size, int dib_width, int dib_height) {
+        switch(current_color_type) {
+            case COLOR_TYPE_THREE:
+                return AddPixelsRGB(dib_buffer, dib_buffer_size, dib_width, dib_height);
+            case COLOR_TYPE_FULL:
+                return AddPixelsFull(dib_buffer, dib_buffer_size, dib_width, dib_height);
+            default:
+                return AddPixelsRG(dib_buffer, dib_buffer_size, dib_width, dib_height);
+        }
+    }
+
+    //buffer ����ͼƬRGB����
+    //buffer_size ���鳤��
+    //width ������
+    //height ����߶�
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    public void AddChildWindow(int[] buffer, int buffer_size, int width, int height, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        int seek, size;
+        int pixels_size;
+
+        seek=data_seek;
+        size=WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+
+        data_seek+=WINDOW_STRUCT_SIZE;
+        pixels_size=AddPixels(buffer, buffer_size, width, height);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    //buffer ����ͼƬRGB����
+    //buffer_size ���鳤��
+    //width ������
+    //height ����߶�
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    //kind �ƻ�ģʽ��=0ʼ�ղ��ţ�=1��һ��ÿ�ղ��ţ�=2����ֹʱ�䲥�ţ�=3������
+    //week һ�ܶ��壬��kind=1ʱ��Ч����bit0-bit6��ʾ���յ�����
+    //              ����0x1     ��һ0x2    �ܶ�0x4     ����0x8     ����0x10     ����0x20     ����0x30
+    //              ���ֵ���������ϣ�����ֻ������һ���ܶ���������3�죬��week��ֵ0x2+0x4+0x8����
+    public void AddChildScheduleWindow(int[] buffer, int buffer_size, int width, int height,
+                                       int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime,
+                                       int kind, int week,
+                                       int from_year, int from_month, int from_day, int from_hour, int from_minute, int from_second,
+                                       int to_year, int to_month, int to_day, int to_hour, int to_minute, int to_second) {
+        int seek, size;
+        int pixels_size;
+
+        seek=data_seek;
+        size=SCHEDULE_WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_SCHEDULE_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        shortFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_KIND_OFFSET, (short)kind);
+        shortFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_WEEK_OFFSET, (short)week);
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_FROMTIME_OFFSET, SystemTimeToTime(from_hour, from_minute, from_second));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_FROMDATE_OFFSET, SystemTimeToDate(from_year, from_month, from_day));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_TOTIME_OFFSET, SystemTimeToTime(to_hour, to_minute, to_second));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_TODATE_OFFSET, SystemTimeToDate(to_year, to_month, to_day));
+
+        data_seek+=SCHEDULE_WINDOW_STRUCT_SIZE;
+        pixels_size=AddPixels(buffer, buffer_size, width, height);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    static int AddPicturePixels(String filename) {
+        int pixels_size=0;
+        BufferedImage bi;
+        try {
+            bi = ImageIO.read(new FileInputStream(filename));
+            pixels_size=AddPixels(getBufferedImageRGB(bi), bi.getWidth() * bi.getHeight(), bi.getWidth(), bi.getHeight());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return pixels_size;
+    }
+
+    //filename ͼƬ�ļ���
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    public void AddChildPicture(String filename, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        int seek, size;
+        int pixels_size;
+
+        seek=data_seek;
+        size=WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+
+        data_seek+=WINDOW_STRUCT_SIZE;
+        pixels_size=AddPicturePixels(filename);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    static int GetTextPixelsWidth(String text, String fontname, int fontsize, int fontstyle) {
+        int value=0;
+        BufferedImage bi;
+        try {
+            bi = createImage(text, new Font(fontname, fontstyle, fontsize), Color.BLACK, Color.YELLOW);
+            value = bi.getWidth();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return value;
+    }
+
+    static int GetTextPixelsHeight(String text, String fontname, int fontsize, int fontstyle) {
+        int value=0;
+        BufferedImage bi;
+        try {
+            bi = createImage(text, new Font(fontname, fontstyle, fontsize), Color.BLACK, Color.YELLOW);
+            value = bi.getHeight();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return value;
+    }
+
+    /*
+     * ����str,font����ʽ����ͼ�񻺴�
+     */
+    static BufferedImage createImage(String str, Font font, Color bkcolor, Color color) throws Exception {
+        // ��ȡfont����ʽӦ����str�ϵ���������
+        Rectangle2D r = font.getStringBounds(str, new FontRenderContext(AffineTransform.getScaleInstance(1, 1), false, false));
+        int unitHeight = (int) Math.floor(r.getHeight());// ��ȡ�����ַ��ĸ߶�
+        // ��ȡ����str����font��ʽ�Ŀ�����������������+1��֤��Ⱦ�������������ַ�����ΪͼƬ�Ŀ��
+        int width = (int) Math.round(r.getWidth()) + 1;
+        int height = unitHeight + 3;// �ѵ����ַ��ĸ߶�+3��֤�߶Ⱦ����������ַ�����ΪͼƬ�ĸ߶�
+        // ����ͼƬ
+        //logger.error(host+"<<createImage--BufferedImage>> <width>="+width+"<height>="+height);
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
+        Graphics g = image.getGraphics();
+        g.setColor(bkcolor);
+        g.fillRect(0, 0, width, height);// ���ú�ɫ�������ͼƬ,Ҳ���DZ���
+        g.setColor(color);// �ٻ��ɺ�ɫ
+        g.setFont(font);// ���û�������
+        g.drawString(str, 0, font.getSize());// �����ַ���
+        g.dispose();
+        return image;
+    }
+
+    static int GetJuhaoOffsetX(int fontsize){
+        return -4;
+    }
+
+    static int GetJuhaoOffsetY(int fontsize){
+        return 8;
+    }
+
+    /*
+     * ����str,font����ʽ����ͼ�񻺴�
+     */
+    static BufferedImage createImageJuhao(String str, Font font, Color bkcolor, Color color, int fontsize) throws Exception {
+        // ��ȡfont����ʽӦ����str�ϵ���������
+        FontRenderContext rc = new FontRenderContext(AffineTransform.getScaleInstance(1, 1), false, false);
+        Rectangle2D r = font.getStringBounds(str, rc);
+        String sTemp;
+        int unitHeight = (int) Math.floor(r.getHeight());// ��ȡ�����ַ��ĸ߶�
+        // ��ȡ����str����font��ʽ�Ŀ�����������������+1��֤��Ⱦ�������������ַ�����ΪͼƬ�Ŀ��
+        int width = (int) Math.round(r.getWidth()) + 1;
+        int height = unitHeight + 3;// �ѵ����ַ��ĸ߶�+3��֤�߶Ⱦ����������ַ�����ΪͼƬ�ĸ߶�
+        int[] iWidths;
+        String[] sItems;
+        int i, k, x, y;
+
+        x = 0;
+        sTemp = str;
+        k = sTemp.indexOf("��");
+        while (k >= 0){
+            x+=2;
+            sTemp = sTemp.substring(k+1);
+            k = sTemp.indexOf("��");
+        }
+        if (!sTemp.isEmpty()) {
+            x++;
+        }
+        sItems = new String[x];
+        iWidths = new int[x];
+
+        x = 0;
+        sTemp = str;
+        k = sTemp.indexOf("��");
+        while (k >= 0){
+            sItems[x++] = sTemp.substring(0, k);
+            sItems[x++] = "��";
+            sTemp = sTemp.substring(k+1);
+            k = sTemp.indexOf("��");
+        }
+        if (!sTemp.isEmpty()) {
+            sItems[x++] = sTemp;
+        }
+
+        k = x;
+        width = 0;
+        for (i=0; i<k; i++){
+            r = font.getStringBounds(sItems[i], rc);
+            iWidths[i] = (int) Math.round(r.getWidth()) + 1;
+            width += iWidths[i];
+        }
+
+        // ����ͼƬ
+        //logger.error(host+"<<createImage--BufferedImage>> <width>="+width+"<height>="+height);
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
+        Graphics g = image.getGraphics();
+        g.setColor(bkcolor);
+        g.fillRect(0, 0, width, height);// ���ú�ɫ�������ͼƬ,Ҳ���DZ���
+        g.setColor(color);// �ٻ��ɺ�ɫ
+        g.setFont(font);// ���û�������
+
+        x = 0;
+        y = font.getSize();
+        for (i=0; i<k; i++){
+            if (sItems[i] == "��"){
+                g.drawString(sItems[i], x + GetJuhaoOffsetX(fontsize), y + GetJuhaoOffsetY(fontsize));// �����ַ���
+            }else{
+                g.drawString(sItems[i], x, y);// �����ַ���
+            }
+            x += iWidths[i];
+        }
+
+        //g.drawString(str, 0, font.getSize());// �����ַ���
+        g.dispose();
+        return image;
+    }
+
+    /*
+     * ����str,font����ʽ����ͼ�񻺴�
+     */
+    @SuppressWarnings("unchecked")
+    static BufferedImage createImageEx(String str, Font font, Color bkcolor, Color color, int halign, boolean wordwrap, int matrixwidth) throws Exception {
+        if (!wordwrap)
+        {
+            return createImage(str, font, bkcolor, color);
+        }
+        else
+        {
+            // ��ȡfont����ʽӦ����str�ϵ���������
+            int textwidth;
+            int i, width=0, height=0, cwidth=0, cx=0, cy=0, x, y;
+            Rectangle2D r;
+            char ch;
+            boolean ch_return=false;
+            ArrayList strlist = new ArrayList();
+            ArrayList widthlist = new ArrayList();
+            String szChar="";
+            String szLine="";
+            i=0;
+            while (i<str.length()){
+                ch=str.charAt(i);
+                szChar=String.valueOf(ch);
+                if (szChar.compareTo("\r")==0)
+                {
+                    r=font.getStringBounds("V", new FontRenderContext(AffineTransform.getScaleInstance(1, 1), false, false));
+                    // ��ȡ�����ַ��ĸ߶ȣ� �ѵ����ַ��ĸ߶�+3��֤�߶Ⱦ����������ַ�����ΪͼƬ�ĸ߶�
+                    cy = (int) Math.floor(r.getHeight()) + 3;
+                    if (cwidth>width) width=cwidth;
+                    strlist.add(szLine);
+                    widthlist.add(cwidth);
+                    cwidth=0;
+                    height+=cy;
+                    szLine="";
+                    ch_return=true;
+                    i++;
+                }
+                else if (szChar.compareTo("\n")==0)
+                {
+                    if (!ch_return)
+                    {
+                        r=font.getStringBounds("V", new FontRenderContext(AffineTransform.getScaleInstance(1, 1), false, false));
+                        // ��ȡ�����ַ��ĸ߶ȣ� �ѵ����ַ��ĸ߶�+3��֤�߶Ⱦ����������ַ�����ΪͼƬ�ĸ߶�
+                        cy = (int) Math.floor(r.getHeight()) + 3;
+                        if (cwidth>width) width=cwidth;
+                        strlist.add(szLine);
+                        widthlist.add(cwidth);
+                        cwidth=0;
+                        height+=cy;
+                        szLine="";
+                    }
+                    ch_return=false;
+                    i++;
+                }
+                else
+                {
+                    r=font.getStringBounds(szChar, new FontRenderContext(AffineTransform.getScaleInstance(1, 1), false, false));
+                    // ��ȡ����str����font��ʽ�Ŀ�����������������+1��֤��Ⱦ�������������ַ�����ΪͼƬ�Ŀ��
+                    cx = (int) Math.round(r.getWidth()) + 1;
+                    // ��ȡ�����ַ��ĸ߶ȣ� �ѵ����ַ��ĸ߶�+3��֤�߶Ⱦ����������ַ�����ΪͼƬ�ĸ߶�
+                    cy = (int) Math.floor(r.getHeight()) + 3;
+                    if (cwidth>0 && cwidth+cx>matrixwidth){
+                        if (cwidth>width) width=cwidth;
+                        strlist.add(szLine);
+                        widthlist.add(cwidth);
+                        cwidth=cx;
+                        height+=cy;
+                        szLine=szChar;
+                    }
+                    else{
+                        cwidth+=cx;
+                        szLine=szLine+szChar;
+                    }
+                    ch_return=false;
+                    i++;
+                }
+                //System.out.print(ch);
+            }
+            if (cwidth>0){
+                if (cwidth>width) width=cwidth;
+                strlist.add(szLine);
+                widthlist.add(cwidth);
+                height+=cy;
+            }
+            if (width==0 || height==0){
+                width=10; height=10;
+            }
+            // ����ͼƬ
+            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
+            Graphics g = image.getGraphics();
+            g.setColor(bkcolor);
+            g.fillRect(0, 0, width, height);// ���ú�ɫ�������ͼƬ,Ҳ���DZ���
+            g.setColor(color);// �ٻ��ɺ�ɫ
+            g.setFont(font);// ���û�������
+            y=font.getSize();
+            for (i=0; i<strlist.size(); i++){
+                szLine=strlist.get(i).toString();
+                textwidth=Integer.parseInt(widthlist.get(i).toString());
+                x=0;
+                switch(halign){
+                    case ALIGN_CENTER:
+                        x=(matrixwidth-textwidth)/2;
+                        break;
+                    case ALIGN_RIGHT:
+                        x=matrixwidth-textwidth;
+                        break;
+                }
+                g.drawString(szLine, x, y);// �����ַ���
+                y+=cy;
+            }
+            g.dispose();
+            strlist.clear();
+            widthlist.clear();
+            return image;
+        }
+    }
+
+    /*
+     * ��ȡ����ͼƬ��RGBһά����
+     */
+    static int[] getBufferedImageRGB(BufferedImage bufferedImage) {
+        int width = bufferedImage.getWidth();
+        int height = bufferedImage.getHeight();
+        int red,green,blue,pix;
+        int[] imageRGB = new int[width * height];
+
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+                pix = bufferedImage.getRGB(i, j);
+                red = (pix & 0xff0000) >> 16;
+                green = (pix & 0x00ff00) >> 8;
+                blue = (pix & 0xff);
+                imageRGB[i*height+j] = (int) blue << 16 | (int) green << 8 | (int) red;
+            }
+        }
+
+        return imageRGB;
+    }
+
+    static int AddTextPixels(String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int matrixwidth) {
+        int pixels_size=0;
+        BufferedImage bi;
+        try {
+            //�˴�������쳣������exception����ɵ�������û������ϣ���ĿУ��ͻ�ʧ��
+            //���ڴ˴���ӡ��־����ʾ��������в���
+            //logger.error(host+"<<AddTextPixels--createImageEx>> <text>="+text+"<fontname>="+fontname+"<fontstyle>="+fontstyle+"<fontsize>="+fontsize+"<bkcolor>="+bkcolor+"<fontcolor>="+fontcolor+"<halign>="+halign+"<wordwrap>="+wordwrap+"<matrixwidth>="+matrixwidth);
+            bi = createImageEx(text, new Font(fontname, fontstyle, fontsize), bkcolor, fontcolor, halign, wordwrap, matrixwidth);
+            //logger.error(host+"<<AddTextPixels--AddPixels>> <biWidth>="+bi.getWidth()+"<biHeight>="+bi.getHeight());
+            pixels_size=AddPixels(getBufferedImageRGB(bi), bi.getWidth() * bi.getHeight(), bi.getWidth(), bi.getHeight());
+        } catch (Exception e) {
+            //logger.error(host+"<<AddTextPixels--Exception>> <exception_msg>="+e.getMessage());
+            e.printStackTrace();
+        }
+        return pixels_size;
+    }
+
+    static int AddTextPixelsJuhao(String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int matrixwidth) {
+        int pixels_size=0;
+        BufferedImage bi;
+        try {
+            //�˴�������쳣������exception����ɵ�������û������ϣ���ĿУ��ͻ�ʧ��
+            //���ڴ˴���ӡ��־����ʾ��������в���
+            //logger.error(host+"<<AddTextPixels--createImageEx>> <text>="+text+"<fontname>="+fontname+"<fontstyle>="+fontstyle+"<fontsize>="+fontsize+"<bkcolor>="+bkcolor+"<fontcolor>="+fontcolor+"<halign>="+halign+"<wordwrap>="+wordwrap+"<matrixwidth>="+matrixwidth);
+            bi = createImageJuhao(text, new Font(fontname, fontstyle, fontsize), bkcolor, fontcolor, fontsize);
+            //logger.error(host+"<<AddTextPixels--AddPixels>> <biWidth>="+bi.getWidth()+"<biHeight>="+bi.getHeight());
+            pixels_size=AddPixels(getBufferedImageRGB(bi), bi.getWidth() * bi.getHeight(), bi.getWidth(), bi.getHeight());
+        } catch (Exception e) {
+            //logger.error(host+"<<AddTextPixels--Exception>> <exception_msg>="+e.getMessage());
+            e.printStackTrace();
+        }
+        return pixels_size;
+    }
+
+    //buffer ����ͼƬRGB����
+    //buffer_size ���鳤��
+    //width ������
+    //height ����߶�
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    public void AddChildText(String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        int seek, size;
+        int pixels_size;
+        int matrix_width;
+
+        seek=data_seek;
+        size=WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+
+        data_seek+=WINDOW_STRUCT_SIZE;
+        matrix_width=asInt(data_stream, windows_seek+OBJECT_RIGHT_OFFSET)-asInt(data_stream, windows_seek+OBJECT_LEFT_OFFSET);
+        pixels_size=AddTextPixels(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, wordwrap, matrix_width);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    //buffer ����ͼƬRGB����
+    //buffer_size ���鳤��
+    //width ������
+    //height ����߶�
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    public void AddChildTextJuhao(String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        int seek, size;
+        int pixels_size;
+        int matrix_width;
+
+        seek=data_seek;
+        size=WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+
+        data_seek+=WINDOW_STRUCT_SIZE;
+        matrix_width=asInt(data_stream, windows_seek+OBJECT_RIGHT_OFFSET)-asInt(data_stream, windows_seek+OBJECT_LEFT_OFFSET);
+        pixels_size=AddTextPixelsJuhao(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, wordwrap, matrix_width);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    //buffer ����ͼƬRGB����
+    //buffer_size ���鳤��
+    //width ������
+    //height ����߶�
+    //inmethod ���뷽ʽ���ڴ�java�ļ����Ϸ��ж���
+    //outmethod ������ʽ���ڴ�java�ļ����Ϸ��ж���
+    //inspeed, outspeed ���������ٶȣ�0��5
+    //stopmethod ͣ����ʽ������0
+    //stopspeed ͣ���ٶȣ�����0
+    public void AddChildScheduleText(String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap,
+                                     int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime,
+                                     int kind, int week,
+                                     int from_year, int from_month, int from_day, int from_hour, int from_minute, int from_second,
+                                     int to_year, int to_month, int to_day, int to_hour, int to_minute, int to_second) {
+        int seek, size;
+        int pixels_size;
+        int matrix_width;
+
+        seek=data_seek;
+        size=SCHEDULE_WINDOW_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+
+        shortFill(data_stream, seek, (short)OBJECT_SCHEDULE_WINDOW);
+        byteFill(data_stream, seek+WINDOW_IN_METHOD_OFFSET, (byte)inmethod);
+        shortFill(data_stream, seek+WINDOW_IN_SPEED_OFFSET, (short)inspeed);
+        byteFill(data_stream, seek+WINDOW_OUT_METHOD_OFFSET, (byte)outmethod);
+        shortFill(data_stream, seek+WINDOW_OUT_SPEED_OFFSET, (short)outspeed);
+        byteFill(data_stream, seek+WINDOW_STOP_METHOD_OFFSET, (byte)stopmethod);
+        shortFill(data_stream, seek+WINDOW_STOP_SPEED_OFFSET, (short)stopspeed);
+        intFill(data_stream, seek+WINDOW_STOP_TIME_OFFSET, stoptime);
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        shortFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_KIND_OFFSET, (short)kind);
+        shortFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_WEEK_OFFSET, (short)week);
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_FROMTIME_OFFSET, SystemTimeToTime(from_hour, from_minute, from_second));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_FROMDATE_OFFSET, SystemTimeToDate(from_year, from_month, from_day));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_TOTIME_OFFSET, SystemTimeToTime(to_hour, to_minute, to_second));
+        intFill(data_stream, seek+WINDOW_STRUCT_SIZE+PLAY_SCHEDULE_TODATE_OFFSET, SystemTimeToDate(to_year, to_month, to_day));
+
+        data_seek+=SCHEDULE_WINDOW_STRUCT_SIZE;
+        matrix_width=asInt(data_stream, windows_seek+OBJECT_RIGHT_OFFSET)-asInt(data_stream, windows_seek+OBJECT_LEFT_OFFSET);
+        pixels_size=AddTextPixels(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, wordwrap, matrix_width);
+
+        size+=pixels_size;
+        intFill(data_stream, seek+WINDOW_SIZE_OFFSET, size);
+        windows_count++;
+        shortFill(data_stream, windows_seek+WINDOWS_COUNT_OFFSET, (short)windows_count);
+        windows_size+=size;
+        intFill(data_stream, windows_seek+OBJECT_SIZE_OFFSET, windows_size);
+        if (leaf_seek>0) {
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("childwindow="+data_seek);
+    }
+
+    //����ʱ����ʾ��ʽ������
+    private void SDClockFormat(byte[] stream, int index, String format){
+        if (format=="#y"){
+            stream[index]=DF_YEAR;
+            stream[index+1]=0;
+        }else if (format=="#m"){
+            stream[index]=DF_MONTH;
+            stream[index+1]=0;
+        }else if (format=="#w"){
+            stream[index]=DF_WEEK;
+            stream[index+1]=0;
+        }else if (format=="#d"){
+            stream[index]=DF_DAY;
+            stream[index+1]=0;
+        }else if (format=="#h"){
+            stream[index]=DF_HOUR;
+            stream[index+1]=0;
+        }else if (format=="#n"){
+            stream[index]=DF_MINUTE;
+            stream[index+1]=0;
+        }else if (format=="#s"){
+            stream[index]=DF_SECOND;
+            stream[index+1]=0;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=0;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=1;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=2;
+        }else if (format=="ʱ"){
+            stream[index]=DF_USER;
+            stream[index+1]=3;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=4;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=5;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=6;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=7;
+        }else if (format=="-"){
+            stream[index]=DF_USER;
+            stream[index+1]=8;
+        }else if (format==":"){
+            stream[index]=DF_USER;
+            stream[index+1]=9;
+        }else if (format==" "){
+            stream[index]=DF_USER;
+            stream[index+1]=10;
+        }
+    }
+
+    public void AddStringDateTime(int left, int top, int width, int height, int color, int fontset, String[] formats, int formats_count) {
+        int seek, size;
+        int i;
+        seek=data_seek;
+        size=SDCLOCK_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+        shortFill(data_stream, seek, (short)OBJECT_STRING_DCLOCK);
+        blockFill(data_stream, seek+OBJECT_TRANSPARENT_OFFSET, 1, (byte)1);
+        intFill(data_stream, seek+OBJECT_LEFT_OFFSET, left);
+        intFill(data_stream, seek+OBJECT_TOP_OFFSET, top);
+        intFill(data_stream, seek+OBJECT_RIGHT_OFFSET, left+width);
+        intFill(data_stream, seek+OBJECT_BOTTOM_OFFSET, top+height);
+        for (i=0; i<formats_count; i++){
+            SDClockFormat(data_stream, seek+OBJECT_STRUCT_SIZE+SDCLOCK_FORMAT_OFFSET+(i<<1), formats[i]);
+        }
+        intFill(data_stream, seek+OBJECT_STRUCT_SIZE+SDCLOCK_COLOR_OFFSET, color);
+        byteFill(data_stream, seek+OBJECT_STRUCT_SIZE+SDCLOCK_FONTSET_OFFSET, (byte)fontset);
+        intFill(data_stream, seek+OBJECT_SIZE_OFFSET, size);
+        if (leaf_seek>0) {
+            leaf_count++;
+            shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("strings="+data_seek);
+    }
+
+    //����������֣���Ҫ���ƿ������ֿ�
+    //left,top,width,height: ���Ͽ��
+    //text: ����
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddString(int left, int top, int width, int height, String text, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime, int color, int fontset) {
+        AddStrings(left, top, width, height);
+        AddChildString(text, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime, color, fontset);
+    }
+
+    //��ӵ���ͼƬ
+    //left,top,width,height: ���Ͽ��
+    //buffer: ͼƬ��������
+    //buffer_size: ���ݳ���
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddWindow(int left, int top, int width, int height, int[] buffer, int buffer_size, int dib_width, int dib_height, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        AddWindows(left, top, width, height);
+        AddChildWindow(buffer, buffer_size, dib_width, dib_height, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime);
+    }
+
+    //���ͼƬ�ļ�
+    //left,top,width,height: ���Ͽ��
+    //filename: ͼƬ�ļ���
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddPicture(int left, int top, int width, int height, String filename, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        AddWindows(left, top, width, height);
+        AddChildPicture(filename, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime);
+    }
+
+    //��ӵ�������
+    //left,top,width,height: ���Ͽ��
+    //text: ����
+    //fontname: ��������
+    //fontsize: �����С
+    //bkcolor: ����ɫ����Ч����0��
+    //fontcolor: ������ɫ
+    //fontstyle: ������������0��
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddText(int left, int top, int width, int height, String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        AddWindows(left, top, width, height);
+        AddChildText(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, wordwrap, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime);
+    }
+
+    //��ӵ�������
+    //left,top,width,height: ���Ͽ��
+    //text: ����
+    //halign: ������뷽ʽ 0����1���У�2����
+    //valign: ������뷽ʽ 0���ϣ�1���У�2����
+    //fontname: ��������
+    //fontsize: �����С
+    //bkcolor: ����ɫ����Ч����0��
+    //fontcolor: ������ɫ
+    //fontstyle: ������������0��
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddTextEx(int left, int top, int width, int height, String text, int halign, int valign, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        int textwidth, textheight;
+        AddWindows(left, top, width, height);
+        AddChildText(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, false, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime);
+
+        textwidth=GetTextPixelsWidth(text, fontname, fontsize, fontstyle);
+        if (textwidth<width){
+            switch(halign){
+                case ALIGN_CENTER:
+                    intFill(data_stream, windows_seek+OBJECT_LEFT_OFFSET, left+((width-textwidth)>>1));
+                    break;
+                case ALIGN_RIGHT:
+                    intFill(data_stream, windows_seek+OBJECT_LEFT_OFFSET, left+width-textwidth);
+                    break;
+            }
+        }
+        textheight=GetTextPixelsHeight(text, fontname, fontsize, fontstyle);
+        if (textheight<height){
+            switch(valign){
+                case ALIGN_CENTER:
+                    intFill(data_stream, windows_seek+OBJECT_TOP_OFFSET, top+((height-textheight)>>1));
+                    break;
+                case ALIGN_BOTTOM:
+                    intFill(data_stream, windows_seek+OBJECT_TOP_OFFSET, top+height-textheight);
+                    break;
+            }
+        }
+    }
+
+    //��ӵ�������
+    //left,top,width,height: ���Ͽ��
+    //text: ����
+    //fontname: ��������
+    //fontsize: �����С
+    //bkcolor: ����ɫ����Ч����0��
+    //fontcolor: ������ɫ
+    //fontstyle: ������������0��
+    //inmethod: ���뷽ʽ
+    //inspeed: �����ٶ�
+    //outmethod: ������ʽ
+    //outspeed: �����ٶ�
+    //stopmethod: ͣ����ʽ
+    //stopspeed: ͣ���ٶ�
+    //stoptime: ͣ��ʱ�䣨���룩
+    public void AddTextJuhao(int left, int top, int width, int height, String text, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle, int halign, boolean wordwrap, int inmethod, int inspeed, int outmethod, int outspeed, int stopmethod, int stopspeed, int stoptime) {
+        AddWindows(left, top, width, height);
+        AddChildTextJuhao(text, fontname, fontsize, bkcolor, fontcolor, fontstyle, halign, wordwrap, inmethod, inspeed, outmethod, outspeed, stopmethod, stopspeed, stoptime);
+    }
+
+    //����ʱ����ʾ��ʽ������
+    private int DClockFormat(byte[] stream, int index, String format){
+        if (format=="#y"){
+            stream[index]=DF_USER;
+            stream[index+1]=2;
+            stream[index+2]=DF_USER;
+            stream[index+3]=0;
+            stream[index+4]=DF_YEAR;
+            stream[index+5]=0;
+            stream[index+6]=DF_YEAR;
+            stream[index+7]=1;
+            return 8;
+        }else if (format=="#m"){
+            stream[index]=DF_MONTH;
+            stream[index+1]=0;
+            stream[index+2]=DF_MONTH;
+            stream[index+3]=1;
+            return 4;
+        }else if (format=="#w"){
+            stream[index]=DF_WEEK;
+            stream[index+1]=10;
+            return 2;
+        }else if (format=="#d"){
+            stream[index]=DF_DAY;
+            stream[index+1]=0;
+            stream[index+2]=DF_DAY;
+            stream[index+3]=1;
+            return 4;
+        }else if (format=="#h"){
+            stream[index]=DF_HOUR;
+            stream[index+1]=0;
+            stream[index+2]=DF_HOUR;
+            stream[index+3]=1;
+            return 4;
+        }else if (format=="#n"){
+            stream[index]=DF_MINUTE;
+            stream[index+1]=0;
+            stream[index+2]=DF_MINUTE;
+            stream[index+3]=1;
+            return 4;
+        }else if (format=="#s"){
+            stream[index]=DF_SECOND;
+            stream[index+1]=0;
+            stream[index+2]=DF_SECOND;
+            stream[index+3]=1;
+            return 4;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=17;
+            return 2;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=18;
+            return 2;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=19;
+            return 2;
+        }else if (format=="ʱ"){
+            stream[index]=DF_USER;
+            stream[index+1]=20;
+            return 2;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=21;
+            return 2;
+        }else if (format=="��"){
+            stream[index]=DF_USER;
+            stream[index+1]=22;
+            return 2;
+        }else if (format=="����"){
+            stream[index]=DF_USER;
+            stream[index+1]=23;
+            return 2;
+        }else if (format=="-"){
+            stream[index]=DF_USER;
+            stream[index+1]=24;
+            return 2;
+        }else if (format==":"){
+            stream[index]=DF_USER;
+            stream[index+1]=25;
+            return 2;
+        }else if (format==" "){
+            stream[index]=DF_USER;
+            stream[index+1]=26;
+            return 2;
+        }
+        return 0;
+    }
+
+    public void AddDateTime(int left, int top, int width, int height, String[] formats, int formats_count, String fontname, int fontsize, Color bkcolor, Color fontcolor, int fontstyle)
+    {
+        int seek, format_seek, size;
+        int i;
+        int pixels_size;
+        int pixelset_size;
+
+        seek=data_seek;
+        size=DCLOCK_STRUCT_SIZE;
+        blockFill(data_stream, seek, size, (byte)0);
+        shortFill(data_stream, seek, (short)OBJECT_DCLOCK);
+        blockFill(data_stream, seek+OBJECT_TRANSPARENT_OFFSET, 1, (byte)1);
+        intFill(data_stream, seek+OBJECT_LEFT_OFFSET, left);
+        intFill(data_stream, seek+OBJECT_TOP_OFFSET, top);
+        intFill(data_stream, seek+OBJECT_RIGHT_OFFSET, left+width);
+        intFill(data_stream, seek+OBJECT_BOTTOM_OFFSET, top+height);
+        format_seek=OBJECT_STRUCT_SIZE+DCLOCK_FORMAT_OFFSET;
+        for (i=0; i<formats_count; i++){
+            format_seek+=DClockFormat(data_stream, seek+format_seek, formats[i]);
+        }
+
+        pixelset_size=PIXELSET_STRUCT_SIZE;
+        shortFill(data_stream, seek+DCLOCK_STRUCT_SIZE, (short)OBJECT_PIXELSET);
+        shortFill(data_stream, seek+DCLOCK_STRUCT_SIZE+PIXELSET_COUNT_OFFSET, (short)27);
+
+        data_seek+=(DCLOCK_STRUCT_SIZE+PIXELSET_STRUCT_SIZE);
+        pixels_size=AddTextPixels("0", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("1", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("2", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("3", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("4", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("5", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("6", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("7", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("8", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("9", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("һ", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("ʱ", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("��", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("����", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels("-", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels(":", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+        pixels_size=AddTextPixels(" ", fontname, fontsize, bkcolor, fontcolor, fontstyle, 0, false, 0);
+        data_seek+=pixels_size;
+        pixelset_size+=pixels_size;
+
+        intFill(data_stream, seek+DCLOCK_STRUCT_SIZE+PIXELSET_SIZE_OFFSET, pixelset_size);
+
+        size+=pixelset_size;
+
+        intFill(data_stream, seek+OBJECT_SIZE_OFFSET, size);
+        if (leaf_seek>0) {
+            leaf_count++;
+            shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+    }
+
+    //interval ������������ʱ����
+    //times �ظ����� =0ʱ������ѭ���ظ�����
+    //speeker �ʶ��� 0-5
+    //volumn ���� 0-9
+    //speed ���� 0-9
+    //tone ��� 0-9
+    public void AddVoice(String text, int interval, int times, int speaker, int volumn, int speed, int tone)
+    {
+        int seek, size;
+        int len=0;
+        byte[] gb2312;
+        try {
+            byte[] s=text.getBytes("GB2312");
+            print_stream(s, s.length);
+            len=s.length+1;
+            if ((len&0x3)>0) len=((len+0x3)&(~0x3));
+            gb2312=new byte[len];
+            blockFill(gb2312, 0, len, (byte)0);
+            blockCopy(gb2312, 0, s, 0, s.length);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            gb2312=new byte[0];
+        }
+        seek=data_seek;
+        size=VOICE_STRUCT_SIZE+len;
+        size=((size+0x3)&(~0x3));
+        blockFill(data_stream, seek, size, (byte)0);
+        shortFill(data_stream, seek, (short)OBJECT_VOICE);
+        intFill(data_stream, seek+OBJECT_SIZE_OFFSET, size);
+        intFill(data_stream, seek+VOICE_INTERVAL_OFFSET, interval);
+        intFill(data_stream, seek+VOICE_TIMES_OFFSET, times);
+        byteFill(data_stream, seek+VOICE_SPEAKER_OFFSET, (byte)speaker);
+        byteFill(data_stream, seek+VOICE_VOLUMN_OFFSET, (byte)volumn);
+        byteFill(data_stream, seek+VOICE_SPEED_OFFSET, (byte)speed);
+        byteFill(data_stream, seek+VOICE_TONE_OFFSET, (byte)tone);
+        blockCopy(data_stream, seek+VOICE_STRUCT_SIZE, gb2312, 0, len);
+
+        if (leaf_seek>0) {
+            leaf_count++;
+            shortFill(data_stream, leaf_seek+LEAF_COUNT_OFFSET, (short)leaf_count);
+            leaf_size+=size;
+            intFill(data_stream, leaf_seek+LEAF_SIZE_OFFSET, leaf_size);
+        }
+        if (region_seek>0) {
+            region_size+=size;
+            intFill(data_stream, region_seek+REGION_SIZE_OFFSET, region_size);
+        }
+        if (chapter_seek>0) {
+            chapter_size+=size;
+            intFill(data_stream, chapter_seek+CHAPTER_SIZE_OFFSET, chapter_size);
+        }
+        root_size+=strings_size;
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=seek+size;
+        //System.out.println("strings="+data_seek);
+    }
+
+    // ��ʼ��
+    public int pkg_begin(byte[] packet, int addr) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_BEGIN);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ������
+    public int pkg_end(byte[] packet, int addr, int serial_no) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_END);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        intFill(cmd_stream, PKG_HEADER_SERIALNO_OFFSET, serial_no);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ���ݰ�
+    public int pkg_data(byte[] packet, int addr, int serial_no, int pkg_length) {
+        int size;
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_DATA);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        intFill(cmd_stream, PKG_HEADER_SERIALNO_OFFSET, serial_no);
+        size=(data_seek-(serial_no-1)*pkg_length);
+        if (size>0){
+            if (size>pkg_length) size=pkg_length;
+            blockCopy(cmd_stream, PKG_HEADER_STRUCT_SIZE, data_stream, (serial_no-1)*pkg_length, size);
+            return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+size);
+        }
+        else{
+            return 0;
+        }
+    }
+
+    // ��ȡ���ݰ�����
+    public int get_pkg_count(int pkg_length){
+        if ((data_seek%pkg_length)>0){
+            return data_seek/pkg_length+1;
+        }
+        else{
+            return data_seek/pkg_length;
+        }
+    }
+
+    public int parse_trans_respond(byte[] packet, int size, int command, int serialno){
+        size=Depack(respond_stream, packet, size);
+        if (size>=RESPOND_STRUCT_SIZE && asShort(respond_stream, 0)==PKC_RESPOND &&
+                asShort(respond_stream, PKG_HEADER_STRUCT_SIZE+RESPOND_COMMAND_OFFSET)==command){
+            switch (command){
+                case PKC_DATA:
+                    if (asShort(respond_stream, PKG_HEADER_STRUCT_SIZE+RESPOND_RESULT_OFFSET)==1)
+                    {
+                        if (serialno==asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET))
+                            return 1;
+                    }
+                    else
+                    {
+                        fix_serialno=asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET);
+                        return 2;
+                    }
+                    break;
+                default:
+                    if (serialno==asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET))
+                        return 1;
+                    break;
+            }
+        }
+        return 0;
+    }
+
+    public int parse_notify(byte[] packet, int size){
+        size=Depack(respond_stream, packet, size);
+        if (size>=PKG_HEADER_STRUCT_SIZE && asShort(respond_stream, PKG_HEADER_COMMAND_OFFSET)==PKC_NOTIFY){
+            return asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET);
+        }
+        return 0;
+    }
+
+    // ��λ���ƿ���Ŀ��ʾ
+    public int pkg_reset_display(byte[] packet, int addr, int power) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_POWER);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ��ȡ��Դ״̬
+    public int pkg_get_power(byte[] packet, int addr) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_GET_POWER);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ���õ�Դ״̬��power=0�رյ�Դ��power=1�򿪵�Դ
+    public int pkg_set_power(byte[] packet, int addr, int power) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_POWER);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        intFill(cmd_stream, PKG_HEADER_SERIALNO_OFFSET, power);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ��ȡ����
+    public int pkg_get_bright(byte[] packet, int addr) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_GET_BRIGHT);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // �������ȣ�bright=0��7
+    public int pkg_set_bright(byte[] packet, int addr, int bright) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_BRIGHT);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        intFill(cmd_stream, PKG_HEADER_SERIALNO_OFFSET, bright);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // У��ʱ��
+    public int pkg_adjust_time_ex(byte[] packet, int addr, int year, int month, int week, int day, int hour, int minute, int second) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_ADJUST_TIME);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_YEAR_OFFSET, (short)year);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_MONTH_OFFSET, (short)month);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_WEEK_OFFSET, (short)week);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_DAY_OFFSET, (short)day);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_HOUR_OFFSET, (short)hour);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_MINUTE_OFFSET, (short)minute);
+        shortFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_SECOND_OFFSET, (short)second);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+SYSTEMTIME_SIZE);
+    }
+
+    // У��ʱ��
+    public int pkg_adjust_time(byte[] packet, int addr) {
+        Calendar c = Calendar.getInstance();
+        //12Сʱ��
+        //return pkg_adjust_time_ex(packet, addr, c.get(Calendar.YEAR), c.get(Calendar.MONTH)+1, c.get(Calendar.DAY_OF_WEEK)-1,
+        //		c.get(Calendar.DAY_OF_MONTH), c.get(Calendar.HOUR), c.get(Calendar.MINUTE), c.get(Calendar.SECOND));
+        //24Сʱ��
+        return pkg_adjust_time_ex(packet, addr, c.get(Calendar.YEAR), c.get(Calendar.MONTH)+1, c.get(Calendar.DAY_OF_WEEK)-1,
+                c.get(Calendar.DAY_OF_MONTH), c.get(Calendar.HOUR_OF_DAY), c.get(Calendar.MINUTE), c.get(Calendar.SECOND));
+    }
+
+    // ����5V���״̬��value=0�ر�5V�����value=1����5V���
+    public int pkg_set_switch(byte[] packet, int addr, int value) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_SWITCH);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        intFill(cmd_stream, PKG_HEADER_SERIALNO_OFFSET, value);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ��ȡ���ƿ�����
+    public int pkg_get_boardparam(byte[] packet, int addr) {
+        get_boardparam_respond_size = 0;
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_GET_PARAM);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE);
+    }
+
+    // ���ÿ��ƿ�����_IP
+    public int pkg_set_boardparam_ip(byte[] packet, int addr, byte[] ip) {
+        int boart_param_size;
+        if (get_boardparam_respond_size>0)
+        {
+            boart_param_size=get_boardparam_respond_size-RESPOND_STRUCT_SIZE;
+            get_boardparam_respond_size = 0;
+            blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE+boart_param_size, (byte)0);
+            shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_PARAM);
+            byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+            blockCopy(cmd_stream, PKG_HEADER_STRUCT_SIZE, respond_stream, RESPOND_STRUCT_SIZE, boart_param_size);
+            blockCopy(cmd_stream, PKG_HEADER_STRUCT_SIZE + BOARDPARAM_IP_OFFSET, ip, 0, 4);
+            return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+boart_param_size);
+        }
+        return 0;
+    }
+
+    // ���ö�ʱ�������ƻ�  -- ��һ��7��ÿ�ն�ʱ��������ÿ�տ��Զ���3��ʱ��
+    public int pkg_power_schedule_weekday(byte[] packet, int addr, boolean enabled) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_POWER_SCHEDULE);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        if (enabled){
+            intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_ENABLED_OFFSET, 0x55AAAA55);
+        }else{
+            intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_ENABLED_OFFSET, 0);
+        }
+        intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_MODE_OFFSET, 0);
+
+        //���գ�3��������ʱ�Σ���1����6ͬ��
+        //   ʱ��1
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_OPENTIME_OFFSET, 2015, 9, 30, 9, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_CLOSETIME_OFFSET, 2015, 9, 30, 12, 0, 0);
+        //   ʱ��2
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_OPENTIME_OFFSET+8, 2015, 9, 30, 13, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_CLOSETIME_OFFSET+8, 2015, 9, 30, 18, 22, 0);
+        //   ʱ��3
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_OPENTIME_OFFSET+16, 2015, 9, 30, 18, 23, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_CLOSETIME_OFFSET+16, 2015, 9, 30, 21, 0, 0);
+        //��һ
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_MONDAY_OPENTIME_OFFSET, 2015, 9, 30, 8, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_MONDAY_CLOSETIME_OFFSET, 2015, 9, 30, 17, 0, 0);
+        //�ܶ�
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_TUESDAY_OPENTIME_OFFSET, 2015, 9, 30, 8, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_TUESDAY_CLOSETIME_OFFSET, 2015, 9, 30, 17, 0, 0);
+        //����
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_WEDNESDAY_OPENTIME_OFFSET, 2015, 9, 30, 8, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_WEDNESDAY_CLOSETIME_OFFSET, 2015, 9, 30, 17, 0, 0);
+        //����
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_THURSDAY_OPENTIME_OFFSET, 2015, 9, 30, 8, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_THURSDAY_CLOSETIME_OFFSET, 2015, 9, 30, 17, 0, 0);
+        //����
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_FRIDAY_OPENTIME_OFFSET, 2015, 9, 30, 8, 30, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_FRIDAY_CLOSETIME_OFFSET, 2015, 9, 30, 17, 0, 0);
+        //����
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SATURDAY_OPENTIME_OFFSET, 2015, 9, 30, 9, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SATURDAY_CLOSETIME_OFFSET, 2015, 9, 30, 12, 0, 0);
+
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SIZE);
+    }
+
+    // ���ö�ʱ�������ƻ�  -- ��ָ������ֹ����ʱ�䲥�ţ�һ�����Զ���21��ʱ��
+    public int pkg_power_schedule_period(byte[] packet, int addr, boolean enabled) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_SET_POWER_SCHEDULE);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        if (enabled){
+            intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_ENABLED_OFFSET, 0x55AAAA55);
+        }else{
+            intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_ENABLED_OFFSET, 0);
+        }
+        intFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_MODE_OFFSET, 1);
+
+        //һ��21��ʱ�Σ�ÿ��ʱ��ƫ�������8���ֽ�
+        //��������Ϊ����һ����3�죬��һ����һ����һ������1��
+        //   ʱ��1
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_OPENTIME_OFFSET, 2015, 5, 1, 0, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SUNDAY_CLOSETIME_OFFSET, 2015, 5, 3, 23, 59, 59);
+        //   ʱ��2
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_OPENTIME_OFFSET+8, 2015, 6, 1, 0, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_CLOSETIME_OFFSET+8, 2015, 6, 1, 23, 59, 59);
+        //   ʱ��3
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_OPENTIME_OFFSET+16, 2015, 7, 1, 0, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_CLOSETIME_OFFSET+16, 2015, 7, 1, 23, 59, 59);
+        //   ʱ��4
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_OPENTIME_OFFSET+24, 2015, 8, 1, 0, 0, 0);
+        timestampFill(cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_CLOSETIME_OFFSET+24, 2015, 8, 1, 23, 59, 59);
+        //   ......
+
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+PWOERSCHEDULE_SIZE);
+    }
+
+    // ����ת��
+    public int pkg_com_transfer(byte[] packet, int addr, byte[] buffer, int size) {
+        blockFill(cmd_stream, 0, PKG_HEADER_STRUCT_SIZE, (byte)0);
+        shortFill(cmd_stream, PKG_HEADER_COMMAND_OFFSET, (short)PKC_COM_TRANSFER);
+        byteFill(cmd_stream, PKG_HEADER_DSTADDR_OFFSET, (byte)addr);
+        blockCopy(cmd_stream, PKG_HEADER_STRUCT_SIZE, buffer, 0, size);
+        return Pack(packet, cmd_stream, PKG_HEADER_STRUCT_SIZE+size);
+    }
+
+    private void Encrypt(byte[] src, byte[] dst, int start, int size){
+        int key=57943;
+        int key1=36028;
+        int key2=47926;
+        int vsrc, vdst;
+        int i;
+        for (i=0; i<=((size>>1)-1); i++)
+        {
+            vsrc=asShort(src, (i+(start>>1))<<1);
+            if (vsrc<0) vsrc=65536+vsrc;
+            vdst=vsrc^key;
+            shortFill(dst, (i+(start>>1))<<1, (short)vdst);
+            key=key*key1+key2;
+        }
+    }
+
+    private int DecryptToStream(String filename, byte[] stream, int start){
+        InputStream in = null;
+        int seek=start;
+        int crc1, crc2;
+        try {
+            // һ�ζ�����ֽ�
+            byte[] buffer = new byte[130];
+            int rsize = 0;
+            in = new FileInputStream(filename);
+            // �������ֽڵ��ֽ������У�bytereadΪһ�ζ�����ֽ���
+            while ((rsize = in.read(buffer)) != -1) {
+                if (rsize!=0){
+                    crc1=CreateCRC(buffer, rsize-2);
+                    crc2=asShort(buffer, rsize - 2);
+                    if (crc2<0) crc2=65536+crc2;
+                    if (crc1==crc2){
+                        blockCopy(stream, seek, buffer, 0, rsize-2);
+                        seek+=(rsize-2);
+                    }
+                }
+            }
+            Encrypt(stream, stream, start, seek-start);
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e1) {
+                }
+            }
+        }
+        return seek;
+    }
+
+    public void Upgrade(String filename) {
+        root_seek=0;
+        root_count=0;
+        root_size=12;
+        blockFill(data_stream, root_seek, root_size, (byte)0);
+        shortFill(data_stream, root_seek, (short)0x13);
+        root_size=DecryptToStream(filename, data_stream, root_size);
+        intFill(data_stream, root_seek+ROOT_SIZE_OFFSET, root_size);
+        data_seek=root_seek+root_size;
+    }
+
+    // ������ȡ��Դ״̬��Ӧ��
+    public int parse_cmd_respond(byte[] packet, int size){
+        size=Depack(respond_stream, packet, size);
+        if (size>=RESPOND_STRUCT_SIZE && asShort(respond_stream, 0)==PKC_RESPOND){
+            switch(asShort(respond_stream, PKG_HEADER_STRUCT_SIZE+RESPOND_COMMAND_OFFSET)){
+                case PKC_GET_POWER:
+                    if (asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET)==0){
+                        System.out.println("��ȡ��Դ״̬��ɣ���Դ�ر�");
+                    }else{
+                        System.out.println("��ȡ��Դ״̬��ɣ���Դ����");
+                    }
+                    break;
+                case PKC_SET_POWER:
+                    if (asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET)==0){
+                        System.out.println("���õ�Դ״̬��ɣ���Դ�ر�");
+                    }else{
+                        System.out.println("���õ�Դ״̬��ɣ���Դ����");
+                    }
+                    break;
+                case PKC_GET_BRIGHT:
+                    System.out.println("��ȡ������ɣ�����="+asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET));
+                    break;
+                case PKC_SET_BRIGHT:
+                    System.out.println("����������ɣ�����="+asInt(respond_stream, PKG_HEADER_SERIALNO_OFFSET));
+                    break;
+                case PKC_ADJUST_TIME:
+                    System.out.println("У��ʱ�����");
+                    break;
+                case PKC_SET_POWER_SCHEDULE:
+                    System.out.println("���ö�ʱ���������");
+                    break;
+                case PKC_GET_PARAM:
+                    System.out.println("��ȡ���ƿ�������ɡ�" +
+                            "  ���="+asShort(respond_stream, RESPOND_STRUCT_SIZE+BOARDPARAM_WIDTH_OFFSET) +
+                            "  �߶�="+asShort(respond_stream, RESPOND_STRUCT_SIZE+BOARDPARAM_HEIGHT_OFFSET) +
+                            "  ��ɫ="+asShort(respond_stream, RESPOND_STRUCT_SIZE+BOARDPARAM_COLORMODE_OFFSET)
+                    );
+                    get_boardparam_respond_size=size;
+                    break;
+                case PKC_SET_PARAM:
+                    System.out.println("���ÿ��ƿ��������");
+                    break;
+            }
+            return 1;
+        }
+        return 0;
+    }
+
+    public void Compress(){
+        Lzss lzss = new Lzss();
+        byte[] lzss_buf = new byte[root_size + 1024];
+        int lzss_size;
+        blockCopy(lzss_buf, 0, data_stream, 0, ROOT_STRUCT_SIZE);
+        lzss_size = lzss.Encode(data_stream, ROOT_STRUCT_SIZE, root_size-ROOT_STRUCT_SIZE, lzss_buf, ROOT_STRUCT_SIZE);
+        intFill(lzss_buf, ROOT_SIZE_OFFSET, lzss_size+ROOT_STRUCT_SIZE);
+        shortFill(lzss_buf, ROOT_FLAG_OFFSET, (short)(asShort(lzss_buf, ROOT_FLAG_OFFSET) | 1));
+        blockCopy(data_stream, 0, lzss_buf, 0, lzss_size+ROOT_STRUCT_SIZE);
+        data_seek=lzss_size+ROOT_STRUCT_SIZE;
+    }
+
+    public int GetDataSize(){
+        return data_seek;
+    }
+
+    public LEDSender2010() {
+        data_stream = new byte[1<<24];
+        cmd_stream = new byte[1024];
+        respond_stream = new byte[1024];
+        packet_stream = new byte[1280];
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/Lzss.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/Lzss.java
new file mode 100644
index 0000000..586ac6f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/Lzss.java
@@ -0,0 +1,164 @@
+package com.ruoyi.Dzp;
+
+public class Lzss {
+
+    static int N = 4096;
+    static int F = 18;
+    static int THRESHOLD = 2;
+    static int NIL = N;
+
+    static int textsize = 0;
+    static int codesize = 0;
+    static int printcount = 0;
+    static int text_buf[];
+    static int match_position, match_length;
+    static int	lson[], rson[], dad[];
+
+    public Lzss() {
+        lson = new int[N + 1];
+        rson = new int[N + 257];
+        dad = new int[N + 1];
+        text_buf = new int[N + F - 1];
+    }
+
+    private static void InitTree()  /* initialize trees */
+    {
+        int  i;
+        textsize = 0; codesize = 0; printcount = 0;
+        for (i = N + 1; i <= N + 256; i++) rson[i] = NIL;
+        for (i = 0; i < N; i++) dad[i] = NIL;
+    }
+
+    private static void InsertNode(int r)
+    {
+        int  i, p, cmp;
+        //unsigned char  *key;
+
+        //key = &text_buf[r];
+        cmp = 1;  p = N + 1 + text_buf[r];
+        rson[r] = NIL; lson[r] = NIL; match_length = 0;
+        for ( ; ; ) {
+            if (cmp >= 0) {
+                if (rson[p] != NIL) p = rson[p];
+                else {  rson[p] = r;  dad[r] = p;  return;  }
+            } else {
+                if (lson[p] != NIL) p = lson[p];
+                else {  lson[p] = r;  dad[r] = p;  return;  }
+            }
+            for (i = 1; i < F; i++)
+                if ((cmp = text_buf[r + i] - text_buf[p + i]) != 0)  break;
+            if (i > match_length) {
+                match_position = p;
+                if ((match_length = i) >= F)  break;
+            }
+        }
+        dad[r] = dad[p];  lson[r] = lson[p];  rson[r] = rson[p];
+        dad[lson[p]] = r;  dad[rson[p]] = r;
+        if (rson[dad[p]] == p) rson[dad[p]] = r;
+        else                   lson[dad[p]] = r;
+        dad[p] = NIL;
+    }
+
+    private static void DeleteNode(int p)
+    {
+        int  q;
+
+        if (dad[p] == NIL) return;
+        if (rson[p] == NIL) q = lson[p];
+        else if (lson[p] == NIL) q = rson[p];
+        else {
+            q = lson[p];
+            if (rson[q] != NIL) {
+                do {  q = rson[q];  } while (rson[q] != NIL);
+                rson[dad[q]] = lson[q];  dad[lson[q]] = dad[q];
+                lson[q] = lson[p];  dad[lson[p]] = q;
+            }
+            rson[q] = rson[p];  dad[rson[p]] = q;
+        }
+        dad[q] = dad[p];
+        if (rson[dad[p]] == p) rson[dad[p]] = q;  else lson[dad[p]] = q;
+        dad[p] = NIL;
+    }
+
+    public int Encode(byte[] ibuf, int istart, int isize, byte[] obuf, int ostart)
+    {
+        int i, c, len, r, s, last_match_length, code_buf_ptr;
+        int[] code_buf = new int[17];
+        int mask;
+        int x, x1;
+
+        x=x1=0;
+        InitTree();
+        code_buf[0] = 0;
+        code_buf_ptr = mask = 1;
+        s = 0;  r = N - F;
+        for (i = s; i < r; i++) text_buf[i] = ' ';
+        for (len = 0, c = 0; len < F && c < isize; len++, c++)
+        {
+            if (ibuf[istart + x] >= 0)
+                text_buf[r + len] = ibuf[istart + x];
+            else
+                text_buf[r + len] = 0x100 + ibuf[istart + x];
+            x++;
+        }
+        if ((textsize = len) == 0) return 0;
+        for (i = 1; i <= F; i++) InsertNode(r - i);
+        InsertNode(r);
+        do {
+            if (match_length > len) match_length = len;
+            if (match_length <= THRESHOLD) {
+                match_length = 1;
+                code_buf[0] |= mask;
+                code_buf[code_buf_ptr++] = text_buf[r];
+            } else {
+                code_buf[code_buf_ptr++] = match_position & 0xff;
+                code_buf[code_buf_ptr++] = ((((match_position >> 4) & 0xf0) | (match_length - (THRESHOLD + 1))) & 0xff);
+            }
+            mask <<= 1;
+            mask &= 0xff;
+            if (mask == 0) {
+                if (codesize + code_buf_ptr > isize) return 0;
+                for (i = 0; i < code_buf_ptr; i++)
+                {
+                    obuf[ostart + x1] = (byte)code_buf[i];
+                    x1++;
+                }
+                codesize += code_buf_ptr;
+                code_buf[0] = 0;  code_buf_ptr = mask = 1;
+            }
+            last_match_length = match_length;
+            for (i = 0; i < last_match_length && c < isize; i++, c++) {
+                DeleteNode(s);		/* Delete old strings and */
+                if (ibuf[istart + x] >= 0)
+                    text_buf[s] = ibuf[istart + x];
+                else
+                    text_buf[s] = 0x100 + ibuf[istart + x];
+                if (s < F - 1)
+                {
+                    if (ibuf[istart + x] >= 0)
+                        text_buf[s + N] = ibuf[istart + x];
+                    else
+                        text_buf[s + N] = 0x100 + ibuf[istart + x];
+                }
+                s = (s + 1) & (N - 1);  r = (r + 1) & (N - 1);
+                InsertNode(r);	/* Register the string in text_buf[r..r+F-1] */
+                x++;
+            }
+            while (i++ < last_match_length) {
+                DeleteNode(s);
+                s = (s + 1) & (N - 1);  r = (r + 1) & (N - 1);
+                len--;
+                if (len > 0) InsertNode(r);
+            }
+        } while (len > 0);
+        if (code_buf_ptr > 1) {
+            for (i = 0; i < code_buf_ptr; i++)
+            {
+                obuf[ostart + x1] = (byte)(code_buf[i]&0xff);
+                x1++;
+            }
+            codesize += code_buf_ptr;
+        }
+        return x1;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/MyUdpSocket.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/MyUdpSocket.java
new file mode 100644
index 0000000..76527fb
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/MyUdpSocket.java
@@ -0,0 +1,93 @@
+package com.ruoyi.Dzp;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.Set;
+
+public class MyUdpSocket {
+    private DatagramChannel channel;
+    private Selector selector;
+    private final int MAX_SIZE = 1280;
+    private static int client_port;
+    private static String client_ip;
+    ByteBuffer receive_buffer = ByteBuffer.allocate(MAX_SIZE);
+
+    public MyUdpSocket(int port) throws IOException {
+        channel = DatagramChannel.open();
+        selector = Selector.open();
+        try {
+            //������ͨ��Ϊ������ģʽ
+            channel.configureBlocking(false);
+            //��ȡ���׽���ͨ���������׽��֣��������׽��ְ󶨵�����ָ���˿�
+            channel.socket().bind(new InetSocketAddress(port));
+            //Ϊͨ��ѡ����ע��ͨ������ָ��������ѡ�����
+            channel.register(selector, SelectionKey.OP_READ);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public final void send(String ip, int port, byte[] buffer, int size) throws IOException {
+        InetSocketAddress client = new InetSocketAddress(ip, port);
+        channel.send(ByteBuffer.wrap(buffer, 0, size), client);  //��EchoClient�ظ�һ�����ݱ�
+    }
+
+    public final void close() throws IOException {
+        selector.close();
+        channel.close();
+    }
+
+    public final int get_client_port() {
+        return client_port;
+    }
+
+    public final String get_client_ip() {
+        return client_ip;
+    }
+
+    public final void get_receive_buffer(byte[] buffer) {
+        receive_buffer.get(buffer);
+    }
+
+    public final int receive() {
+        try {
+            receive_buffer.clear();
+            if (selector.select(10) != 0) {
+                Set<SelectionKey> readyKeys = selector.selectedKeys();
+                for (SelectionKey key : readyKeys) {
+                    readyKeys.remove(key);
+                    if (key.isReadable()) {
+                        DatagramChannel dc = (DatagramChannel) key.channel();
+                        InetSocketAddress client = (InetSocketAddress) dc.receive(receive_buffer); //������������һ��Client�����ݱ�
+                        if (client != null) {
+                            client_ip = client.getAddress().getHostAddress();
+                            client_port = client.getPort();
+                            //System.out.println(client_ip+":"+client_port+" size="+receive_buffer.position());
+                            key.interestOps(SelectionKey.OP_READ);
+                            return receive_buffer.position();
+                        } else {
+                            return 0;
+                        }
+                    } else {
+                        return 0;
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    public final void get_receive_packet(byte[] packet, int size) {
+        int i;
+        for (i = 0; i < size; i++) {
+            packet[i] = receive_buffer.array()[i];
+        }
+    }
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/ProtocolDemo.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/ProtocolDemo.java
new file mode 100644
index 0000000..0d91377
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/ProtocolDemo.java
@@ -0,0 +1,995 @@
+package com.ruoyi.Dzp;
+
+
+
+import java.awt.*;
+//import java.util.Calendar;
+
+public class ProtocolDemo {
+
+    // ====���붯����ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '���',
+    // 1 = '������ʾ',
+    // 2 = '�����ʾ',
+    // 3 = '�Ϲ���ʾ',
+    // 4 = '�ҹ���ʾ',
+    // 5 = '�¹���ʾ',
+    // 6 = '���������ʾ',
+    // 7 = '�����Ϲ���ʾ',
+    // 8 = '�����ҹ�',
+    // 9 = '�����¹�',
+    // 10 = '�м�������չ��',
+    // 11 = '�м�������չ��',
+    // 12 = '�м�������չ��',
+    // 13 = '������������',
+    // 14 = '������������',
+    // 15 = '��������չ��',
+    // 16 = '��������չ��',
+    // 17 = '�����Ͻ�����',
+    // 18 = '�����½�����',
+    // 19 = '�����Ͻ�����',
+    // 20 = '�����½�����',
+    // 21 = '������������',
+    // 22 = '������������',
+    // 23 = '�����Ҷ��',
+    // 24 = '�����Ҷ��',
+    // =====================================
+
+    // ====����������ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '���',
+    // 1 = '����ʧ',
+    // 2 = '������ʧ',
+    // 3 = '�������м��£',
+    // 4 = '�������м��£',
+    // 5 = '�������м��£',
+    // 6 = '���������Ƴ�',
+    // 7 = '���������Ƴ�',
+    // 8 = '���������£',
+    // 9 = '�������Һ�£',
+    // 10 = '�����Ͻ��Ƴ�',
+    // 11 = '�����½��Ƴ�',
+    // 12 = '�����Ͻ��Ƴ�',
+    // 13 = '�����½��Ƴ�',
+    // 14 = '���������Ƴ�',
+    // 15 = '���������Ƴ�',
+    // 16 = '�����Ҷ��',
+    // 17 = '�����Ҷ��'
+    // =====================================
+
+    // ====ͣ��������ʽ�б�(��ֵ��0��ʼ)====
+    // 0 = '��̬��ʾ',
+    // 1 = '��˸��ʾ'
+    // =====================================
+
+    public static MyUdpSocket my_udp;
+    public static LEDSender2010 ledsender = new LEDSender2010();
+    //public static String ledhost = "127.0.0.1";
+    public static String ledhost = "10.170.23.237";
+    public static int ledport = 6666;
+    public static int addr = 0;
+
+    public static void mysleep(int msec) {
+        try {
+            Thread.sleep(msec);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //����UDP����bufferΪ�������ݣ�sizeΪ�������ݳ���
+    public static void udp_send(byte[] buffer, int size) {
+        byte[] packet = new byte[size];
+        ledsender.blockCopy(packet, 0, buffer, 0, size);
+        ledsender.print_stream(packet, size);
+        try {
+            my_udp.send(ledhost, ledport, packet, size);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public static void udp_send1(String ip, byte[] buffer, int size) {
+        byte[] packet = new byte[size];
+        ledsender.blockCopy(packet, 0, buffer, 0, size);
+        ledsender.print_stream(packet, size);
+        try {
+            my_udp.send(ip, ledport, packet, size);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    //����UDP����bufferΪ�������ݣ�sizeΪ�������ݳ���
+    public static int udp_receive(byte[] buffer) {
+        int size = 0;
+        size = my_udp.receive();
+        if (size > 0) {
+            my_udp.get_receive_packet(buffer, size);
+        }
+        return size;
+    }
+
+    public static int do_command(byte[] buffer, int size) {
+        byte[] packet = new byte[1280];
+        int tx, tx_repeat = 5;
+        int isize = 0;
+        int i;
+
+        for (tx = 0; tx < tx_repeat; tx++) {
+            udp_send(buffer, size);
+            for (i = 0; i < 50; i++) {
+                isize = udp_receive(packet);
+                if (isize > 0 && ledsender.parse_cmd_respond(packet, isize) == 1) {
+                    return 1;
+                }
+            }
+        }
+        System.out.println("��ʱ");
+        return 0;
+    }
+
+    public static void demo_reset_display() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_reset_display(packet, (byte) addr, 1);
+        System.out.println("��λ��Ŀ��ʾ...");
+        do_command(packet, size);
+    }
+
+    public static void demo_power_on() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_set_power(packet, (byte) addr, 1);
+        System.out.println("�򿪵�Դ...");
+        do_command(packet, size);
+    }
+
+    public static void demo_power_off() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_set_power(packet, (byte) addr, 0);
+        System.out.println("�رյ�Դ...");
+        do_command(packet, size);
+    }
+
+    public static void demo_get_power() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_get_power(packet, (byte) addr);
+        System.out.println("��ȡ��Դ״̬...");
+        do_command(packet, size);
+    }
+
+    public static void demo_set_bright() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_set_bright(packet, (byte) addr, 7);
+        System.out.println("��������...");
+        do_command(packet, size);
+    }
+
+    public static void demo_get_bright() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_get_bright(packet, (byte) addr);
+        System.out.println("��ȡ����...");
+        do_command(packet, size);
+    }
+
+    public static void demo_adjust_time() {
+        int size;
+        byte[] packet = new byte[1280];
+        //Calendar calendar = Calendar.getInstance();
+        //ָ��ʱ��Уʱ��12Сʱ��
+        //size=ledsender.pkg_adjust_time_ex(packet, (byte)addr, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DAY_OF_WEEK)-1, calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.HOUR), calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND));
+        //ָ��ʱ��Уʱ��24Сʱ��
+        //size=ledsender.pkg_adjust_time_ex(packet, (byte)addr, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DAY_OF_WEEK)-1, calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND));
+        //�Ե�ǰϵͳʱ��Уʱ
+        size = ledsender.pkg_adjust_time(packet, (byte) addr);
+        System.out.println("У��ʱ��...");
+        do_command(packet, size);
+    }
+
+    public static void demo_switch_on() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_set_switch(packet, (byte) addr, 1);
+        System.out.println("����5V���...");
+        do_command(packet, size);
+    }
+
+    public static void demo_switch_off() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_set_switch(packet, (byte) addr, 0);
+        System.out.println("�ر�5V���...");
+        do_command(packet, size);
+    }
+
+    public static void demo_get_boardparam() {
+        int size;
+        byte[] packet = new byte[1280];
+        size = ledsender.pkg_get_boardparam(packet, (byte) addr);
+        System.out.println("��ȡ���ƿ�����...");
+        do_command(packet, size);
+    }
+
+    public static void demo_set_boardparam_ip(String ip) {
+        int size;
+        byte[] packet = new byte[1280];
+        byte[] ips = new byte[4];
+        int i, k, k1, x;
+        size = ledsender.pkg_get_boardparam(packet, (byte) addr);
+        System.out.println("��ȡ���ƿ�����...");
+        if (do_command(packet, size) == 1) {
+            k = 0;
+            x = 0;
+            ip = ip + '.';
+            for (i = 0; i < 4; i++) {
+                k1 = ip.indexOf('.', k);
+                if (k1 > k) {
+                    ips[i] = (byte) Integer.parseInt(ip.substring(k, k1));
+                    k = k1 + 1;
+                    x++;
+                }
+            }
+            if (x == 4) {
+                size = ledsender.pkg_set_boardparam_ip(packet, (byte) addr, ips);
+                if (size > 0) {
+                    do_command(packet, size);
+                }
+            }
+        }
+    }
+
+    public static void demo_power_schedule() {
+        int size;
+        byte[] packet = new byte[1280];
+        //��һ��7��ÿ�ն�ʱ��������ÿ�տ��Զ���3��ʱ��
+        size = ledsender.pkg_power_schedule_weekday(packet, (byte) addr, true);
+        //��ָ������ֹ����ʱ�䲥�ţ�һ�����Զ���21��ʱ��
+        //size=ledsender.pkg_power_schedule_period(packet, (byte)addr, true);
+        System.out.println("���ö�ʱ�������ƻ�...");
+        do_command(packet, size);
+    }
+
+    //dib_bufferΪ����ͼƬ��RGB���飬����Ϊ�������飬�����ÿ����Ԫ����һ�����ص��RGBֵ
+    //  ���ص�(X,Y)��RGBֵ����һ��һ��˳�����У������64����32����
+    //    (0,0),(0,1),(0,2),...(0,31)  (1,0),(1,1),(1,2),...(1,31)  (2,0),(2,1),(2,2),...(2,31)  ... (63,0),(63,1),(63,2),...(63,31)
+    //    ���ص��RGBֵ��������ʾ��0-7λ��ʾ��ɫ��8-15λ��ʾ��ɫ��16-23��ʾ��ɫ��24-31λ������0
+    //    ����dib_buffer[n]&0xFF ��ʾ��ɫ
+    //        (dib_buffer[n]>>8)&0xFF ��ʾ��ɫ
+    //        (dib_buffer[n]>>16)&0xFF ��ʾ��ɫ
+    public static int dib_width = 64;
+    public static int dib_height = 64;
+    public static int dib_buffer_size = dib_width * dib_height;
+    public static int[] dib_buffer = new int[dib_buffer_size];
+
+    public static void draw_dib() {
+        int x, y, z = 0;
+        int seek = 0;
+        int color = 0xFF;
+        for (x = 0; x < dib_width; x++) {
+            for (y = 0; y < dib_height; y++) {
+                dib_buffer[seek++] = color;
+            }
+            z++;
+            if (z >= 4) {
+                switch (color) {
+                    case 0xFF:
+                        color = 0xFF00;
+                        break;
+                    case 0xFF00:
+                        color = 0xFFFF;
+                        break;
+                    case 0xFFFF:
+                        color = 0xFF;
+                        break;
+                    default:
+                        color = 0xFF;
+                        break;
+                }
+                z = 0;
+            }
+        }
+    }
+
+    public static void send_data() {
+        int size = 0;
+        byte[] packet = new byte[1280];
+        int i, j, k, x, r;
+        int tx, tx_repeat = 5;
+        boolean ok;
+        //����ΪͨѶ���룬�������ݵIJ�ִ��������
+        //    ������UDPͨѶ������
+
+        //�������������
+        if (ledsender.GetDataSize() > (1 << 21)) {
+            System.out.println("LED��Ŀ���ݳ��ȳ�����ʾ���洢�ռ�");
+            return;
+        }
+
+        System.out.println("LED��Ŀѹ��ǰ���ݳ���" + ledsender.GetDataSize() + "�����ݰ�����" + ledsender.get_pkg_count(512));
+        ledsender.Compress();
+        System.out.println("LED��Ŀѹ�������ݳ���" + ledsender.GetDataSize() + "�����ݰ�����" + ledsender.get_pkg_count(512));
+
+        //��ʼ��
+        ok = false;
+        //System.out.println("������ʼ��...�����к�=0");
+        for (tx = 0; tx < tx_repeat; tx++) {
+            size = ledsender.pkg_begin(packet, addr);
+            udp_send(packet, size);
+            for (x = 0; x < 50; x++) {
+                size = udp_receive(packet);
+                if (size > 0 && ledsender.parse_trans_respond(packet, size, LEDSender2010.PKC_BEGIN, 0) > 0) {
+                    //System.out.println("��ʼ��������ɣ����к�=0");
+                    ok = true;
+                    break;
+                }
+            }
+            if (ok) break;
+        }
+        if (!ok) {
+            System.out.println("��ʱ");
+            return;
+        }
+
+        //���ݰ�
+        k = ledsender.get_pkg_count(512);
+        i = 1;
+        while (i <= k) {
+            ok = false;
+            //System.out.println("�������ݰ�...�����к�="+i);
+            for (tx = 0; tx < tx_repeat; tx++) {
+                j = i;
+                size = ledsender.pkg_data(packet, addr, i, 512);
+                udp_send(packet, size);
+                for (x = 0; x < 50; x++) {
+                    size = udp_receive(packet);
+                    if (size > 0) {
+                        r = ledsender.parse_trans_respond(packet, size, LEDSender2010.PKC_DATA, i);
+                        switch (r) {
+                            case 0x1:
+                                //System.out.println("���ݰ�������ɣ����к�="+i);
+                                ok = true;
+                                j = i + 1;
+                                break;
+                            case 0x2:
+                                //System.out.println("���ݰ����к�У�Դ���Ӧ��="+i+"��ʵ��="+ledsender.fix_serialno);
+                                j = ledsender.fix_serialno;
+                                break;
+                        }
+                        //ok=true;
+                        //break;
+                    }
+                    if (ok) break;
+                }
+                i = j;
+                if (ok) break;
+            }
+            if (!ok) {
+                System.out.println("��ʱ");
+                return;
+            }
+        }
+
+        //������
+        ok = false;
+        //System.out.println("���ͽ�����...�����к�="+i);
+        for (tx = 0; tx < tx_repeat; tx++) {
+            size = ledsender.pkg_end(packet, addr, i);
+            udp_send(packet, size);
+            for (x = 0; x < 50; x++) {
+                size = udp_receive(packet);
+                if (size > 0 && ledsender.parse_trans_respond(packet, size, LEDSender2010.PKC_END, i) > 0) {
+                    //System.out.println("������������ɣ����к�="+i);
+                    ok = true;
+                    break;
+                }
+            }
+            if (ok) break;
+        }
+        if (!ok) {
+            System.out.println("��ʱ");
+            return;
+        }
+
+        /*
+        ok=false;
+        for (x=0; x<100; x++){
+        	size=udp_receive(packet);
+        	switch (ledsender.parse_notify(packet, size)){
+        	case LEDSender2010.NOTIFY_ROOT_PLAY:
+                System.out.println("���ͽ�Ŀ����У��ɹ�");
+                ok=true;
+                break;
+        	case LEDSender2010.NOTIFY_ROOT_DOWNLOAD:
+                System.out.println("���ؽ�Ŀ����У��ɹ�");
+        		ok=true;
+                break;
+        	}
+        	if (ok) break;
+        }
+        if (!ok) System.out.println("��Ŀ����У����󣬷���/����ʧ��");
+        */
+    }
+
+    public static boolean send_data1(String ip) {
+        int size = 0;
+        byte[] packet = new byte[1280];
+        int i, j, k, x, r;
+        int tx, tx_repeat = 5;
+        boolean ok;
+        // 下面为通讯代码，包括数据的拆分打包、发送
+        // 由于是UDP通讯，增加
+
+        // 如果数据量大于上限，直接返回失败
+        if (ledsender.GetDataSize() > (1 << 21)) {
+            System.out.println("LED节目数据长度超出显示屏存储空间");
+            return false;
+        }
+
+        ledsender.Compress();
+
+        // 起始包发送
+        ok = false;
+        for (tx = 0; tx < tx_repeat; tx++) {
+            size = ledsender.pkg_begin(packet, addr);
+            udp_send1(ip, packet, size);
+            for (x = 0; x < 50; x++) {
+                size = udp_receive(packet);
+                if (size > 0 && ledsender.parse_trans_respond(packet, size, LEDSender2010.PKC_BEGIN, 0) > 0) {
+                    ok = true;
+                    break;
+                }
+            }
+            if (ok) break;
+        }
+        // 起始包超时，返回失败
+        if (!ok) {
+            System.out.println("起始包发送超时");
+            return false;
+        }
+
+        // 数据包发送
+        k = ledsender.get_pkg_count(512);
+        i = 1;
+        while (i <= k) {
+            ok = false;
+            for (tx = 0; tx < tx_repeat; tx++) {
+                j = i;
+                size = ledsender.pkg_data(packet, addr, i, 512);
+                udp_send1(ip, packet, size);
+                for (x = 0; x < 50; x++) {
+                    size = udp_receive(packet);
+                    if (size > 0) {
+                        r = ledsender.parse_trans_respond(packet, size,LEDSender2010.PKC_DATA, i);
+                        switch (r) {
+                            case 0x1:
+                                ok = true;
+                                j = i + 1;
+                                break;
+                            case 0x2:
+                                j = ledsender.fix_serialno;
+                                break;
+                        }
+                    }
+                    if (ok) break;
+                }
+                i = j;
+                if (ok) break;
+            }
+            // 数据包超时，返回失败
+            if (!ok) {
+                System.out.println("数据包发送超时");
+                return false;
+            }
+        }
+
+        // 结束包发送
+        ok = false;
+        for (tx = 0; tx < tx_repeat; tx++) {
+            size = ledsender.pkg_end(packet, addr, i);
+            udp_send1(ip, packet, size);
+            for (x = 0; x < 50; x++) {
+                size = udp_receive(packet);
+                if (size > 0 && ledsender.parse_trans_respond(packet, size, LEDSender2010.PKC_END, i) > 0) {
+                    ok = true;
+                    break;
+                }
+            }
+            if (ok) break;
+        }
+        // 结束包超时，返回失败
+        if (!ok) {
+            System.out.println("结束包发送超时");
+            return false;
+        }
+
+        // 所有步骤执行成功，返回true
+        System.out.println("数据发送全部完成");
+        return true;
+    }
+
+    public static void demo_upgrade() {
+        ledsender.Upgrade("d:\\vsd.bin");
+        send_data();
+    }
+
+    public static void demo_play() {
+        //String[] formats={"#y", "��", "#m", "��", "#d", "��", " ", "#h", ":", "#n", ":", "#s"};
+        //String[] formats={"#h", ":", "#n", ":", "#s"};
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+        //ledsender.MakeRoot(LEDSender2010.ROOT_PLAY, LEDSender2010.COLOR_TYPE_THREE);
+        //ledsender.MakeRoot(LEDSender2010.ROOT_PLAY, LEDSender2010.COLOR_TYPE_FULL);
+        ledsender.AddChapter(1, 1000);
+        ledsender.AddRegion(0, 0, 256, 64);
+
+        /*
+        //����ͼƬ
+        ledsender.AddLeaf(1, 2000);
+        //draw_dib();
+        //ledsender.AddDib(0, 0, 64, 64, dib_buffer, dib_buffer_size, dib_width, dib_height, 1, 5, 2, 5, 0, 0, 1000);
+        BufferedImage bi;
+        try {
+            bi = LEDSender2010.createImageEx("�л����񹲺͹�", new Font("����", Font.BOLD, 24), Color.BLACK, Color.CYAN, 0, false, 64);
+            System.out.println("width:"+bi.getWidth()+"height:"+bi.getHeight());
+            ledsender.AddWindow(0, 0, 64, 64, LEDSender2010.getBufferedImageRGB(bi), bi.getWidth() * bi.getHeight(), bi.getWidth(), bi.getHeight(), 2, 0, 2, 0, 0, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        */
+
+        //�������֣����У�֧�ֶ��뷽ʽ��
+        ledsender.AddLeaf(1, 2000);
+        //ledsender.AddTextJuhao(0, 0, 64, 32, "��ӭ���١�лл�ݹˡ�", "����", 24, Color.BLACK, Color.RED, 0, 2, true, 2, 0, 2, 0, 0, 0, 0);
+        ledsender.AddTextEx(0, 0, 128, 32, "��ӭ����",LEDSender2010.ALIGN_LEFT,LEDSender2010.ALIGN_TOP, "����", 16, Color.BLACK, new Color(255, 0, 0), 0, 1, 0, 2, 0, 0, 0, 0);
+        //ledsender.AddTextEx(128, 0, 160, 32, "лл�ݹ�", LEDSender2010.ALIGN_LEFT, LEDSender2010.ALIGN_TOP, "����", 16, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+
+        //ledsender.AddLeaf(1, 2000);
+        //ledsender.AddTextEx(0, 0, 128, 32, "ͬһ���й�", LEDSender2010.ALIGN_LEFT, LEDSender2010.ALIGN_TOP, "����", 16, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        //ledsender.AddTextEx(128, 0, 160, 32, "ͬһ������", LEDSender2010.ALIGN_LEFT, LEDSender2010.ALIGN_TOP, "����", 16, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+
+        /*
+        //24������������
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddString(0, 0, 64, 32, "��ӭ����abc", 2, 0, 2, 0, 0, 0, 0, 0xFF, 1);
+        //24��������ʱ�䣬��ʽyyyy��mm��dd��
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddStringDateTime(0, 0, 256, 32, 0xFFFF, 1, formats, 6);
+        */
+
+        send_data();
+    }
+
+    public static void demo_play2() {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_DOWNLOAD,LEDSender2010.COLOR_TYPE_DOUBLE);
+        //ledsender.MakeRoot(LEDSender2010.ROOT_PLAY, LEDSender2010.COLOR_TYPE_THREE);
+        ledsender.AddChapter(1, 1000000);
+        ledsender.AddRegion(0, 0, 256, 64);
+
+        //�������֣����У�֧�ֶ��뷽ʽ��
+        ledsender.AddLeaf(1, 200000);
+        ledsender.AddWindows(0, 0, 64, 32);
+        ledsender.AddChildText("��ӭ����", "����", 16, Color.BLACK, Color.RED, 0, 0, false, 6, 0, 2, 0, 0, 0, 0);
+        ledsender.AddChildText("лл�ݹ�", "����", 16, Color.BLACK, Color.RED, 0, 0, false, 6, 0, 2, 0, 0, 0, 0);
+
+        send_data();
+    }
+
+    public static void demo_play_chapterschedule() {
+        //String[] formats={"#y", "��", "#m", "��", "#d", "��", " ", "#h", ":", "#n", ":", "#s"};
+        //String[] formats={"#h", ":", "#n", ":", "#s"};
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 64, 64);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(0, 0, 64, 32, "��ӭ����abc", "����", 14, Color.BLACK, Color.RED, 0, 2, true, 3, 0, 2, 0, 0, 0, 0);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 4, 28, 10, 10, 0, 2016, 12, 27, 23, 15, 0);
+        ledsender.AddRegion(0, 0, 64, 64);
+
+        //�������֣����У�֧�ֶ��뷽ʽ��
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddTextEx(0, 0, 64, 32, "лл�ݹ�abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 14, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+
+        send_data();
+    }
+
+    public static void demo_play_picture() {
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+        ledsender.AddChapter(1, 1000);
+        ledsender.AddRegion(0, 0, 64, 64);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddPicture(0, 0, 64, 64, "c:\\demo.bmp", 1, 0, 2, 0, 0, 0, 0);
+        send_data();
+    }
+
+    public static void demo_play_voice() {
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+        ledsender.AddChapter(1, 1000);
+        ledsender.AddRegion(0, 0, 64, 64);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddTextEx(0, 0, 64, 32, "��ӭ����",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 16, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        ledsender.AddVoice("��ӭ����", 5000, 10, 0, 5, 5, 1);
+        send_data();
+    }
+
+    public static void demo_datetime_play() {
+        String[] formats_datetime = {"#y", "��", "#m", "��", "#d", "��", " ", "#h", ":", "#n", ":", "#s"};
+        String[] formats_date = {"#y", "��", "#m", "��", "#d", "��"};
+        String[] formats_time = {"#h", ":", "#n", ":", "#s"};
+        String[] formats_week = {"����", "#w"};
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+        //ledsender.MakeRoot(LEDSender2010.ROOT_PLAY, LEDSender2010.COLOR_TYPE_THREE);
+        ledsender.AddChapter(1, 10000);
+        ledsender.AddRegion(0, 0, 64, 64);
+
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddDateTime(0, 0, 64, 32, formats_datetime, 12, "����", 14, Color.BLACK, Color.YELLOW, 0);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddDateTime(0, 0, 64, 32, formats_date, 6, "����", 14, Color.BLACK, Color.RED, 0);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddDateTime(0, 0, 64, 32, formats_time, 5, "����", 14, Color.BLACK, Color.GREEN, 0);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddDateTime(0, 0, 64, 32, formats_week, 2, "����", 14, Color.BLACK, Color.RED, 0);
+
+        send_data();
+    }
+
+    public static void demo_schedule_child_play() {
+        //���ɽ�Ŀ����
+        //String[] formats_datetime={"#y", "��", "#m", "��", "#d", "��", " ", "#h", ":", "#n", ":", "#s"};
+
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+        ledsender.AddChapter(1, 10000);
+        ledsender.AddRegion(0, 0, 64, 64);
+
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddWindows(0, 0, 64, 32);
+        //ledsender.AddChildText("abc", "����", 14, Color.BLACK, Color.RED, 0, false, 1, 0, 2, 0, 0, 0, 0);
+        ledsender.AddChildScheduleText("��ӭ����", "����", 14, Color.BLACK, Color.RED, 0, 0, false, 1, 0, 2, 0, 0, 0, 2000, 2, 0x0, 2018, 2, 5, 7, 10, 0, 2018, 2, 6, 23, 15, 0);
+        ledsender.AddChildScheduleText("лл�ݹ�", "����", 14, Color.BLACK, Color.RED, 0, 0, false, 1, 0, 2, 0, 0, 0, 2000, 2, 0x0, 2018, 2, 5, 7, 10, 0, 2018, 2, 6, 23, 15, 0);
+        ledsender.AddChildScheduleText("ͬһ������", "����", 14, Color.BLACK, Color.RED, 0, 0, false, 1, 0, 2, 0, 0, 0, 2000, 2, 0x0, 2018, 2, 8, 7, 10, 0, 2018, 2, 9, 23, 15, 0);
+        ledsender.AddChildScheduleText("ͬһ������", "����", 14, Color.BLACK, Color.RED, 0, 0, false, 1, 0, 2, 0, 0, 0, 2000, 2, 0x0, 2018, 2, 8, 7, 10, 0, 2018, 2, 9, 23, 15, 0);
+
+        send_data();
+    }
+
+    public static void demo_fontset_import(MyUdpSocket udp, String ip, int num, String text) {
+        byte[] packet = new byte[1024];
+        byte[] s;
+        int i, size;
+        int c;
+
+        size = 0;
+        try {
+            s = text.getBytes("GB2312");
+            size = 0;
+            packet[size++] = 0x55;
+            packet[size++] = 0x25;
+            packet[size++] = 0x3E;
+            packet[size++] = (byte) (((num / 100) % 10) + 0x30);
+            packet[size++] = (byte) (((num / 10) % 10) + 0x30);
+            packet[size++] = (byte) ((num % 10) + 0x30);
+            for (i = 0; i < s.length; i++) {
+                if (s[i] >= 0) c = s[i];
+                else c = (256 + s[i]);
+                switch (c >> 4) {
+                    case 0:
+                        packet[size++] = 0x30;
+                        break;
+                    case 1:
+                        packet[size++] = 0x31;
+                        break;
+                    case 2:
+                        packet[size++] = 0x32;
+                        break;
+                    case 3:
+                        packet[size++] = 0x33;
+                        break;
+                    case 4:
+                        packet[size++] = 0x34;
+                        break;
+                    case 5:
+                        packet[size++] = 0x35;
+                        break;
+                    case 6:
+                        packet[size++] = 0x36;
+                        break;
+                    case 7:
+                        packet[size++] = 0x37;
+                        break;
+                    case 8:
+                        packet[size++] = 0x38;
+                        break;
+                    case 9:
+                        packet[size++] = 0x39;
+                        break;
+                    case 10:
+                        packet[size++] = 0x61;
+                        break;
+                    case 11:
+                        packet[size++] = 0x62;
+                        break;
+                    case 12:
+                        packet[size++] = 0x63;
+                        break;
+                    case 13:
+                        packet[size++] = 0x64;
+                        break;
+                    case 14:
+                        packet[size++] = 0x65;
+                        break;
+                    case 15:
+                        packet[size++] = 0x66;
+                        break;
+                    default:
+                        packet[size++] = 0x30;
+                        break;
+                }
+                switch (c & 0xF) {
+                    case 0:
+                        packet[size++] = 0x30;
+                        break;
+                    case 1:
+                        packet[size++] = 0x31;
+                        break;
+                    case 2:
+                        packet[size++] = 0x32;
+                        break;
+                    case 3:
+                        packet[size++] = 0x33;
+                        break;
+                    case 4:
+                        packet[size++] = 0x34;
+                        break;
+                    case 5:
+                        packet[size++] = 0x35;
+                        break;
+                    case 6:
+                        packet[size++] = 0x36;
+                        break;
+                    case 7:
+                        packet[size++] = 0x37;
+                        break;
+                    case 8:
+                        packet[size++] = 0x38;
+                        break;
+                    case 9:
+                        packet[size++] = 0x39;
+                        break;
+                    case 10:
+                        packet[size++] = 0x61;
+                        break;
+                    case 11:
+                        packet[size++] = 0x62;
+                        break;
+                    case 12:
+                        packet[size++] = 0x63;
+                        break;
+                    case 13:
+                        packet[size++] = 0x64;
+                        break;
+                    case 14:
+                        packet[size++] = 0x65;
+                        break;
+                    case 15:
+                        packet[size++] = 0x66;
+                        break;
+                    default:
+                        packet[size++] = 0x30;
+                        break;
+                }
+            }
+            packet[size++] = 0x23;
+            packet[size++] = (byte) 0xAA;
+        } catch (Exception e) {
+        }
+
+        if (size > 0) {
+            try {
+                udp = new MyUdpSocket(8868);
+                udp.send(ip, 6666, packet, size);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    //ֻ����һ����Ŀ
+    public static void demo_play_sub_chapter() {
+        ledsender.MakeChapter(LEDSender2010.ROOT_PLAY_CHAPTER,LEDSender2010.COLOR_TYPE_DOUBLE, 1, 0, 1, 1000);
+        ledsender.AddRegion(0, 0, 64, 64);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddTextEx(0, 0, 64, 32, "abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 14, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        send_data();
+    }
+
+    public static void demo_play_sub_chapter_ex() {
+        ledsender.MakeChapterEx(LEDSender2010.ROOT_PLAY_CHAPTER,LEDSender2010.COLOR_TYPE_DOUBLE, 1, 0, 1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 64, 64);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddTextEx(0, 0, 64, 32, "abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 14, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        send_data();
+    }
+
+    //ֻ����һ������
+    public static void demo_play_sub_region() {
+        ledsender.MakeRegion(LEDSender2010.ROOT_PLAY_REGION,LEDSender2010.COLOR_TYPE_DOUBLE, 1, 0, 1, 0, 16, 128, 16);
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddTextEx(0, 0, 64, 32, "abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 14, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        send_data();
+    }
+
+    //ֻ����һ��ҳ��
+    public static void demo_play_sub_leaf() {
+        String[] formats_datetime = {"#h", ":", "#n", ":", "#s"};
+        ledsender.MakeLeaf(LEDSender2010.ROOT_PLAY_LEAF,LEDSender2010.COLOR_TYPE_DOUBLE, 1, 0, 0, 1, 1, 1000);
+        ledsender.AddTextEx(0, 0, 64, 16, "abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 14, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        ledsender.AddDateTime(0, 16, 64, 16, formats_datetime, 12, "����", 14, Color.BLACK, Color.YELLOW, 0);
+        send_data();
+    }
+
+    //ֻ����һ������
+    public static void demo_play_sub_object() {
+        ledsender.MakeObject(LEDSender2010.ROOT_PLAY_OBJECT,LEDSender2010.COLOR_TYPE_DOUBLE, 1, 0, 0, 0, 1);
+        //�˴�ֻ�����һ������
+        ledsender.AddTextEx(0, 0, 64, 32, "abc",LEDSender2010.ALIGN_CENTER,LEDSender2010.ALIGN_TOP, "����", 12, Color.BLACK, Color.RED, 0, 1, 0, 2, 0, 0, 0, 0);
+        send_data();
+    }
+
+    //�Զ��巽��  ��̬��ʾ������Ϣ
+    public static void demo_play_chapterschedule1(String ip, String msg) {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 192, 64);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(8, 24, 192, 64, msg, "����", 16, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+
+        send_data1(ip);
+    }
+
+    //�Զ��巽�� ��̬��ʾ������Ϣ
+    public static boolean demo_play_chapterschedule2(String ip, String msg1, String msg2) {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 192, 64);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(0, 11, 192, 32, msg1, "����", 16, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 37, 192, 32, msg2, "����", 16, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+
+      return send_data1(ip);
+    }
+
+    //�Զ��巽����ʾ��������
+    public static void demo_play_chapterschedule3(String ip, String msg1, String msg2, String msg3, String msg4, String msg5, String msg) {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 400, 300);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(0, 0, 192, 21, msg, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 12, 192, 21, msg1, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 24, 192, 21, msg2, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 36, 192, 22, msg3, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+//        ledsender.AddText(0, 48, 192, 22, msg4, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+//        ledsender.AddText(0, 50, 192, 22, msg5, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+
+        send_data1(ip);
+    }
+
+
+
+    //�Զ��巽����ʾ��������
+    public static void demo_play_chapterschedule4(String ip, String msg1, String msg2, String msg3, String msg, String msgSpec, String msgProduct, String ms7, String msg8) {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 400, 300);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(0, 0, 192, 21, msg, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 15, 192, 21, msg1, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 30, 192, 21, msg2, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 45, 192, 22, msg3, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+//        ledsender.AddText(0, 48, 192, 22, msg4, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+//        ledsender.AddText(0, 50, 192, 22, msg5, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+
+        send_data1(ip);
+    }
+
+
+    public static boolean demo_play_chapterschedule4(String ip, String msg1, String msg2, String msg3, String msg,String msg5,String msg6,String msg7,String msg8, String msgQuantity) {
+
+        //���ɽ�Ŀ����
+        ledsender.MakeRoot(LEDSender2010.ROOT_PLAY,LEDSender2010.COLOR_TYPE_DOUBLE);
+
+        ledsender.AddChapterEx(1, 1000, 1, 1, 0x7F, 2016, 8, 17, 0, 0, 0, 2016, 12, 27, 23, 59, 59);
+        ledsender.AddRegion(0, 0, 400, 300);
+
+        //�������֣��Զ����У�
+        ledsender.AddLeaf(1, 2000);
+        ledsender.AddText(0, 0, 192, 21, msg, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(0, 15, 192, 21, msg1, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(65, 15, 192, 21, msg6, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 7, 0, 0, 5, 3000);
+        ledsender.AddText(0, 30, 192, 21, msg2, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(65, 30, 192, 21, msg5, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 7, 0, 0, 5, 3000);
+        ledsender.AddText(0, 45, 192, 22, msg3, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(65, 45, 192, 22, msgQuantity, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 7, 0, 0, 5, 3000);
+        ledsender.AddText(0, 60, 192, 21, msg7, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 2, 0, 0, 5, 10000);
+        ledsender.AddText(65, 60, 192, 21, msg8, "����", 13, Color.BLACK, Color.YELLOW, 0, 2, false, 1, 0, 7, 0, 0, 5, 3000);
+
+
+        return  send_data1(ip);
+    }
+
+
+
+
+
+    public static void main(String[] args) {
+
+        // TODO Auto-generated method stub
+
+        try {
+            my_udp = new MyUdpSocket(8818);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+        //demo_play();
+        //demo_play_voice();
+        //demo_fontset_import(my_udp, "192.168.1.99", 0, "�������123");
+        //demo_reset_display();
+        //demo_play_chapterschedule();
+        //demo_upgrade();
+        //demo_datetime_play();
+        //demo_play_picture();
+        //demo_schedule_child_play();
+        demo_get_boardparam();
+        //demo_set_boardparam_ip("192.168.1.99");
+        //demo_power_off();
+        //demo_power_on();
+        //demo_get_power();
+        //demo_set_bright();
+        //demo_get_bright();
+        //demo_adjust_time();
+        //demo_switch_on();
+        //demo_switch_off();
+        //demo_power_schedule();
+
+        System.out.println("�����.");
+    }
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/domain/basLed.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/domain/basLed.java
new file mode 100644
index 0000000..175af47
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/domain/basLed.java
@@ -0,0 +1,27 @@
+package com.ruoyi.Dzp.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class basLed extends BaseEntity {
+
+    private int id;
+    private String product_id;
+    private String spec;
+    private String quantity;
+    private String sendFlag;
+    private String ipAddress;
+    private String trayCode;
+    private String model;
+    private String productName;
+    private String errorMsg;
+
+
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/Dzp/mapper/BasLedMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/mapper/BasLedMapper.java
new file mode 100644
index 0000000..2f134e2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/Dzp/mapper/BasLedMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.Dzp.mapper;
+
+import com.ruoyi.Dzp.domain.basLed;
+
+import java.util.List;
+
+public interface BasLedMapper {
+
+
+    List<basLed> selectBasLedList(basLed BasLed);
+
+    void updateBasLed(basLed BasLed);
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
index fce45dc..212e2d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
@@ -5,12 +5,15 @@ import com.ruoyi.api.moveMsg.domain.MoveMsg;
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.log.service.IRequestLogService;
+import com.ruoyi.pda.mapper.PdaMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import com.ruoyi.api.domain.DeliveryNoticeVo;
 
+import java.util.HashMap;
+
 /**
  * 作业统计 Controller
  */
@@ -22,6 +25,8 @@ public class ToErpApiController {
     private IToErpService toErpService;
     @Autowired
     private IRequestLogService requestLogService;
+    @Autowired
+    private PdaMapper pdaMapper;
 
     /**
      * 接收入出库通知单
@@ -52,7 +57,7 @@ public class ToErpApiController {
     /**
      * 回传出库单(新)
      */
-            @Scheduled(fixedDelay = 1500)
+    @Scheduled(fixedDelay = 1500)
     @RequestMapping("/callbackOutDeliveryNotice")
     @ResponseBody
     public void callbackDeliveryOutNoticeNew() {
@@ -60,6 +65,17 @@ public class ToErpApiController {
     }
 
 
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackOutDeliveryNotice")
+//    @ResponseBody
+//    public void callbackDeliveryOutNoticeNewS() {
+//        toErpService.callbackDeliveryOutNoticeNews();
+//    }
+
+
+
+
+
 //    /**
 //     * 回传其他入库单
 //     */
@@ -79,14 +95,56 @@ public class ToErpApiController {
 //    public void callbackDeliveryOutNotice() {
 //        toErpService.callbackoutDeliveryNotice();
 //    }
+
     /**
      * 移库回调接口
      */
-   @Scheduled(fixedDelay = 1500)
+    @Scheduled(fixedDelay = 1500)
     @RequestMapping("/moveCargoSpace")
     @ResponseBody
-    public void moveCargoSpace(){
+    public void moveCargoSpace() {
         toErpService.moveCargoSpace();
     }
 
+    /**
+     * 自动确认入库单据
+     */
+    @Scheduled(fixedDelay = 10000)
+//    @RequestMapping("/FillFinishAllot")
+    @ResponseBody
+    public void FillFinishAllot() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_result", null);
+        map.put("v_result_msg", null);
+        pdaMapper.FillFinishAllot(map);
+        String result = map.get("v_result").toString();
+        String msg = map.get("v_result_msg").toString();
+        if ("10".equals(result)) {
+            System.err.println(msg);
+        } else {
+//            System.err.println(msg);
+        }
+    }
+    /**
+     * 自动确认出库单据
+     */
+    @Scheduled(fixedDelay = 10000)
+//    @RequestMapping("/FillFinishAllot")
+    @ResponseBody
+    public void FillFinishAllotOut() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_result", null);
+        map.put("v_result_msg", null);
+        pdaMapper.FillFinishAllotOut(map);
+        String result = map.get("v_result").toString();
+        String msg = map.get("v_result_msg").toString();
+        if ("10".equals(result)) {
+            System.err.println(msg);
+        } else {
+//            System.err.println(msg);
+        }
+    }
+
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
index 93b0481..a92c5cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.api.controller;
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.api.domain.ErpProduct;
 import com.ruoyi.api.domain.ReMaterialParam;
@@ -11,6 +12,10 @@ import com.ruoyi.bas.BasProduct.service.IBasProductService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.device.agv.domain.AgvContainerTask;
+import com.ruoyi.device.agv.service.IAgvContainerTaskService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
 import com.ruoyi.log.domain.RequestLog;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
@@ -19,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.*;
 
 /**
  * 作业统计 Controller
@@ -36,6 +41,10 @@ public class ToWmsApiController {
     private IOutStockoutService outStockoutService;
     @Autowired
     private IBasProductService basProductService;
+    @Autowired
+    private MydoJobMapper mapper;
+    @Autowired
+    private IAgvContainerTaskService agvContainerTaskService;
 
     /**
      * 入库请求生成作业
@@ -43,26 +52,50 @@ public class ToWmsApiController {
     @PostMapping("/requestEnterByTrayCode")
     public AjaxResult requestEnterByTrayCode(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.requestEnterByTrayCode(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
+
+    // 入库分货位
     @PostMapping("/sendCargoSpace")
     public AjaxResult sendCargoSpace(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.requestEnterByTaskNo(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库请求分配货位", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
 
+    // 出库到位更新LED显示屏
+    @PostMapping("/updateLed")
+    public AjaxResult updateLed(@RequestBody RequestEnter requestEnter) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_task_no", requestEnter.getTaskNo());
+        map.put("v_code", requestEnter.getDeviceCode());
+        mapper.updateLed(map);
+        return AjaxResult.success();
+    }
+
+
+    // 线体报警更新报警信息
+    @PostMapping("/updateLedError")
+    public AjaxResult updateLedError(@RequestBody RequestEnter requestEnter) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_code", requestEnter.getDeviceCode());
+        map.put("v_error_code", requestEnter.getErrorCode());
+        mapper.updateLedError(map);
+        return AjaxResult.success();
+    }
+
+
     /**
      * 请求补码作业
      */
     @RequestMapping("/requestByNoTrayCode")
     public AjaxResult requestByNoTrayCode(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.selectMydoJobByEntranceId(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -73,7 +106,7 @@ public class ToWmsApiController {
     @RequestMapping("/requestEnterByTrayCodeAndEntranceId")
     public AjaxResult requestEnterByTrayCodeAndEntranceId(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.requestEnterByTrayCodeAndEntranceId(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -82,18 +115,17 @@ public class ToWmsApiController {
     /**
      * 入库、出库 任务完成回传
      * Map<String, String>
-     *     "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
-     *      taskNo：出库 入库任务号
-     *      trayCode:托盘码
-     *      positionCode1：起点
-     *      positionCode2：终点
-     *      containerCode：容器编码
-     *
+     * "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
+     * taskNo：出库 入库任务号
+     * trayCode:托盘码
+     * positionCode1：起点
+     * positionCode2：终点
+     * containerCode：容器编码
      */
     @PostMapping("/jobFinish")
     public AjaxResult jobFinish(@RequestBody WmsJobRequest wmsJobRequest) {
         AjaxResult ajaxResult = toWmsService.jobFinish(wmsJobRequest);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -104,7 +136,7 @@ public class ToWmsApiController {
     @PostMapping("/reAssign")
     public AjaxResult reAssign(@RequestBody ReMaterialParam reMaterialParam) {
         AjaxResult ajaxResult = toWmsService.reAssign(reMaterialParam);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -115,13 +147,12 @@ public class ToWmsApiController {
     @PostMapping("/reMaterial")
     public AjaxResult reMaterial(@RequestBody ReMaterialParam reMaterialParam) {
         AjaxResult ajaxResult = toWmsService.reMaterial(reMaterialParam);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
 
-
     /**
      * 出库单据保存
      *
@@ -145,8 +176,7 @@ public class ToWmsApiController {
      */
     @Log(title = "接收物料", businessType = BusinessType.INSERT)
     @PutMapping("/receiveProduct")
-    public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.receiveProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "接收物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
@@ -158,8 +188,7 @@ public class ToWmsApiController {
      */
     @Log(title = "修改物料管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateProduct")
-    public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.updateProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "修改物料管理", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
@@ -171,12 +200,76 @@ public class ToWmsApiController {
      */
     @Log(title = "作废物料", businessType = BusinessType.UPDATE)
     @PutMapping("/InvalidProduct")
-    public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.InvalidProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "作废物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
+    /**
+     * 请求AGV执行队列
+     */
+//    @Log(title = "请求未下发的AGV执行队列", businessType = BusinessType.OTHER)
+    @RequestMapping("/queryAgvQuene")
+    public AjaxResult queryAgvQuene() {
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setStatus("0");
+        List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(""), "请求未下发的AGV执行队列", AjaxResult.success(agvContainerTasks));
+        requestLogService.insertRequestLog(requestLog);
+        if (agvContainerTasks != null && agvContainerTasks.size() > 0) {
+            for (AgvContainerTask containerTask : agvContainerTasks) {
+                containerTask.setStatus("1");
+                agvContainerTaskService.updateAgvContainerTask(containerTask);
+            }
+            return AjaxResult.success(agvContainerTasks.get(0));
+        } else {
+            return AjaxResult.error("无队列");
+        }
+    }
+
+
+    /**
+     * 请求AGV执行队列
+     */
+    @Log(title = "完成AGV执行队列", businessType = BusinessType.UPDATE)
+    @RequestMapping("/finishAgvQuene")
+    public AjaxResult finishAgvQuene(@RequestBody JSONObject jsonObject) {
+        String order = (String) jsonObject.get("order");
+        agvContainerTaskService.deleteAgvJobByOrder(order);
+        return AjaxResult.success();
+
+    }
+
+
+    @Log(title = "自动生成Agv搬运队列到线边", businessType = BusinessType.INSERT)
+    @PutMapping("/insertAgvQuene")
+    public AjaxResult insertAgvQuene(@RequestBody WmsJobRequest wmsJobRequest) {
+        String taskNo = wmsJobRequest.getTaskNo();// 到位任务号
+        String code = wmsJobRequest.getCode();// 线体号
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setTaskNo(taskNo);
+        List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
+        if (Objects.isNull(agvContainerTasks)) {
+            MydoJob mydoJob = new MydoJob();
+            mydoJob.setTaskNo(taskNo);
+            List<MydoJob> mydoJobs = mapper.selectMydoJobList(mydoJob);
+            AgvContainerTask agvContainerTask1 = new AgvContainerTask();
+            agvContainerTask1.setContainer(UUID.randomUUID().toString());
+            agvContainerTask1.setTaskNo(taskNo);
+            agvContainerTask1.setStartPoint(code);
+            agvContainerTask1.setEndPoint(mydoJobs.get(0).getEndPoint());//TODO 需要修改
+            agvContainerTask1.setSpare2(mydoJobs.get(0).getTrayCode());
+            // 10缓存区到线边 11立库到线边 12 立库到缓存区 13 缓存到立库
+            agvContainerTask1.setSpare1("11");
+            agvContainerTask1.setStatus("0");
+            agvContainerTaskService.insertAgvContainerTask(agvContainerTask1);
+        }
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "自动生成Agv搬运队列到线边", AjaxResult.success());
+        requestLogService.insertRequestLog(requestLog);
+        return AjaxResult.success();
+    }
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
index 26785de..ac2a858 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
@@ -14,50 +14,55 @@ import java.util.List;
 @Getter
 @Setter
 public class CallBackErpItems implements Serializable {
-    /**
-     * | 方向    | 字段名        | 对应方向 | 字段名    |
-     * | ------- | ------------- | -------- | --------- |
-     * | ERP→WMS | lineNo        | WMS→ERP  | srcrowno  |
-     * | ERP→WMS | sourceLineId  | WMS→ERP  | srcids    |
-     * | ERP→WMS | oldProjectNo  | WMS→ERP  | cxmh      |
-     * | ERP→WMS | projectNo     | WMS→ERP  | cnewxmh   |
-     * | ERP→WMS | isBatchManage | WMS→ERP  | binvbatch |
-     * | ERP→WMS | lotNo         | WMS→ERP  | cbatch    |
-     */
+        /**
+         *
+         * | 方向    | 字段名        | 对应方向 | 字段名    |
+         * | ------- | ------------- | -------- | --------- |
+         * | ERP→WMS | lineNo        | WMS→ERP  | srcrowno  |
+         * | ERP→WMS | sourceLineId  | WMS→ERP  | srcids    |
+         * | ERP→WMS | oldProjectNo  | WMS→ERP  | cxmh      |
+         * | ERP→WMS | projectNo     | WMS→ERP  | cnewxmh   |
+         * | ERP→WMS | isBatchManage | WMS→ERP  | binvbatch |
+         * | ERP→WMS | lotNo         | WMS→ERP  | cbatch    |
+         */
 
-    @JsonProperty("cinvcode")
-    private String cinvcode;
-    @JsonProperty("cinvname")
-    private String cinvname;
-    @JsonProperty("cinvstd")
-    private String cinvstd;
-    @JsonProperty("cinvm_unit")
-    private String cinvm_unit;
-    @JsonProperty("cposcode")
-    private String cposcode;
-    @JsonProperty("cposname")
-    private String cposname;
-    @JsonProperty("ctrayname")
-    private String ctrayname;
-    @JsonProperty("cbatch")
-    private String cbatch;
-    @JsonProperty("iquantity")
-    private Integer iquantity;
-    @JsonProperty("cxmh")
-    private String cxmh;
-    @JsonProperty("cnewxmh")
-    private String cnewxmh;
-    @JsonProperty("srccode")
-    private String srccode;
-    @JsonProperty("srcids")
-    private Integer srcids;
-    @JsonProperty("srcrowno")
-    private String srcrowno;
-    @JsonProperty("binvbatch")
-    private Integer binvbatch;
-    @JsonProperty("jobid")
-    private String jobid;
-    @JsonProperty("stg_location")
-    private String stg_location;
-}
+        @JsonProperty("cinvcode")
+        private String cinvcode;
+        @JsonProperty("cinvname")
+        private String cinvname;
+        @JsonProperty("cinvstd")
+        private String cinvstd;
+        @JsonProperty("cinvm_unit")
+        private String cinvm_unit;
+        @JsonProperty("cposcode")
+        private String cposcode;
+        @JsonProperty("cposname")
+        private String cposname;
+        @JsonProperty("ctrayname")
+        private String ctrayname;
+        @JsonProperty("cbatch")
+        private String cbatch;
+        @JsonProperty("iquantity")
+        private Integer iquantity;
+        @JsonProperty("cxmh")
+        private String cxmh;
+        @JsonProperty("cnewxmh")
+        private String cnewxmh;
+        @JsonProperty("srccode")
+        private String srccode;
+        @JsonProperty("srcids")
+        private Integer srcids;
+        @JsonProperty("srcrowno")
+        private String srcrowno;
+        @JsonProperty("binvbatch")
+        private Integer binvbatch;
+        @JsonProperty("jobid")
+        private String jobid;
+        @JsonProperty("stg_location")
+        private String stg_location;
+        @JsonProperty("groupNum")
+        private String groupNum;
+
+
+    }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
index 8e0a4d1..24f52b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
@@ -71,11 +71,12 @@ public class DeliveryNoticeItemVo {
 
     /**旧项目号**/
     private String oldProjectNo;
+    /**组件号**/
+    private String groupNum;
+
 
     /**存放地点  1 立库 2平库*/
     private String stg_location;
 
 
-
-
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
index 0ae16ff..8638acf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
@@ -21,4 +21,7 @@ public class RequestEnter {
 
     private String flag;
     private String taskNo;
+    private String deviceCode;
+    private String code;
+    private String errorCode;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
index 4b0ec5f..079124f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
@@ -24,4 +24,6 @@ public class WmsJobRequest {
     private String positionCode2;
     //任务id
     private String jobId;
+    //线体号
+    private String code;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
index 783a377..8519c47 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
@@ -24,4 +24,6 @@ public interface IToErpService {
     void callbackInDeliveryNoticeNew();
 
     void callbackDeliveryOutNoticeNew();
+
+    void callbackDeliveryOutNoticeNews();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index 9364bf6..01d44e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -23,6 +23,7 @@ import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
 import com.ruoyi.in.stockindeatilback.service.IInStockinDetailBackService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
@@ -32,20 +33,29 @@ import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.domain.OutStockout;
 import com.ruoyi.out.outStockout.service.IOutStockoutService;
 import com.ruoyi.out.outStockoutBack.domain.OutStockoutBack;
+import com.ruoyi.out.outStockoutBack.mapper.OutStockoutBackMapper;
 import com.ruoyi.out.outStockoutBack.service.IOutStockoutBackService;
 import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
+import com.ruoyi.out.outStockoutDetail.mapper.OutStockoutDetailMapper;
+import com.ruoyi.out.outStockout.mapper.OutStockoutMapper;
 import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
 import com.ruoyi.out.outStockoutDetailBack.service.IOutStockoutDetailBackService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.service.IBasStockService;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.apache.pdfbox.pdmodel.interactive.viewerpreferences.PDViewerPreferences;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.math.BigDecimal;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
@@ -209,7 +219,7 @@ public class ToErpServiceImpl implements IToErpService {
 //                    if (item.getIsBatchManage().equals("1") && (item.getLotNo().equals("") || item.getLotNo() == null)) {
 //                        // 获取流水号
 //                        detail.setLotNo(BatchNoGenerator.generateBatchNo());
-//                    }else {
+//                    } else {
 //                        detail.setLotNo(item.getLotNo());
 //                    }
 //                    detail.setSpare1(item.getLevelRelation());
@@ -224,7 +234,7 @@ public class ToErpServiceImpl implements IToErpService {
 //                    detail.setBarCode(item.getBarCode());
 //                    detail.setIsBatchManage(item.getIsBatchManage());
 //                    detail.setOldProjectNo(item.getOldProjectNo());
-//                    item.getStg_location()
+//                    detail.setCargoNo(item.getGroupNum());
 //                    inStockinDetailService.insertInStockinDetail(detail);
 //
 //                }
@@ -331,6 +341,7 @@ public class ToErpServiceImpl implements IToErpService {
 //                    d.setSpare6(item.getLineNo());
 //                    d.setRemark(item.getRemark());
 //                    d.setSourceLineId(item.getSourceLineId());
+//                    d.setCargoNo(item.getGroupNum());
 //                    d.setBarCode(item.getBarCode());
 //                    d.setIsBatchManage(item.getIsBatchManage());
 //                    d.setOldProjectNo(item.getOldProjectNo());
@@ -371,7 +382,9 @@ public class ToErpServiceImpl implements IToErpService {
         if (type >= 1 && type <= 4) {
             InStockin param = new InStockin();
             param.setErpBill(deliveryNoticeVo.getBillNo());
-            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+            List<InStockin> existList = inStockinService.selectInStockinListBill(param);
+//            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
             InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null;
 
             // 删除操作（操作类型3）
@@ -432,10 +445,12 @@ public class ToErpServiceImpl implements IToErpService {
                     inStockinDetailService.deleteInStockinDetailByStockinGuid(inStockin.getStockinGuid());
                 }
                 List<DeliveryNoticeItemVo> items = deliveryNoticeVo.getDetailList();
+                int a = 0;
                 for (DeliveryNoticeItemVo item : items) {
+                    a += 1;
                     InStockinDetail detail = new InStockinDetail();
                     detail.setStockinGuid(inStockin.getStockinGuid());
-                    detail.setStockinDetailId(item.getBarCode());
+                    detail.setStockinDetailId(inStockin.getStockinId() + '-' + a);
                     detail.setStockinId(inStockin.getStockinId());
                     detail.setProductId(item.getInventoryCode());
                     detail.setProductName(item.getInventoryName());
@@ -459,6 +474,7 @@ public class ToErpServiceImpl implements IToErpService {
                     detail.setBarCode(item.getBarCode());
                     detail.setIsBatchManage(item.getIsBatchManage());
                     detail.setOldProjectNo(item.getOldProjectNo());
+                    detail.setCargoNo(item.getGroupNum());
                     inStockinDetailService.insertInStockinDetail(detail);
                 }
                 return AjaxResult.success();
@@ -469,6 +485,7 @@ public class ToErpServiceImpl implements IToErpService {
         else if (type >= 5 && type <= 7) {
             OutStockout param = new OutStockout();
             param.setErpStockoutId(deliveryNoticeVo.getBillNo());
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
             List<OutStockout> outList = outStockoutService.selectOutStockoutList(param);
             OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null;
             String billNo = deliveryNoticeVo.getBillNo();
@@ -523,13 +540,18 @@ public class ToErpServiceImpl implements IToErpService {
                 if (exist == null) {
                     mainOut.setStockoutGuid(UUID.randomUUID().toString());
                 }
-                String ckdId = iBasJobIdService.getJobId("CKD");
-                fillOutStockout(mainOut, deliveryNoticeVo, ckdId);
+                if (liKuList.size() > 0) {
+                    String ckdId = iBasJobIdService.getJobId("CKD");
+                    fillOutStockout(mainOut, deliveryNoticeVo, ckdId);
+                }
+
 
                 if (exist == null) {
+                    String ckdId = iBasJobIdService.getJobId("CKD");
+                    fillOutStockout(mainOut, deliveryNoticeVo, ckdId);
                     outStockoutService.insertOutStockout(mainOut);
                 } else {
-                    outStockoutService.updateOutStockout(mainOut);
+                    outStockoutService.updateOutStockouts(mainOut);
                     // 修改先删旧明细
                     OutStockoutDetail q2 = new OutStockoutDetail();
                     q2.setStockoutId(billNo);
@@ -541,21 +563,27 @@ public class ToErpServiceImpl implements IToErpService {
                         outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
                     }
                 }
+                if (liKuList.size() > 0) {
+                    // 保存所有立库明细到主单
+                    saveOutDetailList(mainOut, liKuList, "1");
+                }
 
-                // 保存所有立库明细到主单
-                saveOutDetailList(mainOut, liKuList, "1");
 
                 // ========== 处理平库：新建一张独立主单 + 所有平库明细 ==========
                 if (CollUtil.isNotEmpty(pingKuList)) {
                     OutStockout pingKuOut = new OutStockout();
                     pingKuOut.setStockoutGuid(UUID.randomUUID().toString());
-                    String pingCkdId = iBasJobIdService.getJobId("CKD");
-                    fillOutStockout(pingKuOut, deliveryNoticeVo, pingCkdId);
-                    // 插入平库主单
-                    outStockoutService.insertOutStockout(pingKuOut);
-                    // 平库所有明细挂到这个新主单
-                    saveOutDetailList(pingKuOut, pingKuList, "2");
-                    log.info("平库分组生成独立出库单：{}，明细条数：{}", pingCkdId, pingKuList.size());
+                    if (pingKuList.size() > 0) {
+                        String pingCkdId = iBasJobIdService.getJobId("CKD");
+                        fillOutStockout(pingKuOut, deliveryNoticeVo, pingCkdId);
+                        // 插入平库主单
+                        outStockoutService.insertOutStockout(pingKuOut);
+                        log.info("平库分组生成独立出库单：{}，明细条数：{}", pingCkdId, pingKuList.size());
+                        // 平库所有明细挂到这个新主单
+                        saveOutDetailList(pingKuOut, pingKuList, "2");
+                    }
+
+
                 }
                 return AjaxResult.success();
             }
@@ -576,7 +604,7 @@ public class ToErpServiceImpl implements IToErpService {
         out.setStatus("2");
         out.setWarehouseId(vo.getWarehouseId());
         out.setStockoutSource("1");
-        out.setSpare6("1");
+        out.setSpare6(vo.getOutType());  // 搬运方式  1人工 2agv
         out.setCarNumber(vo.getIsProjectOut());
         out.setDepartmentNo(vo.getProjectNo());
         out.setCustomerNo(vo.getCustomerId());
@@ -586,10 +614,11 @@ public class ToErpServiceImpl implements IToErpService {
         out.setSpare3(vo.getApproveDate());
         out.setSpare4(vo.getApproveMan());
         out.setSpare5(vo.getRemark());
-        out.setSpare7(vo.getDestination());
-        out.setSpare8("2");
+        out.setSpare7(vo.getDestination());  // 配送终点
+        out.setSpare8("2");  // 配送去向  1 缓存 2 线边 默认线边
         out.setCompanyShortName(vo.getCompanyShortName());
         out.setAccountSetNo(vo.getAccountSetNo());
+        out.setFID(vo.getIsProjectOut()); // 是否按项目出 1是 0否
     }
 
     /**
@@ -622,6 +651,7 @@ public class ToErpServiceImpl implements IToErpService {
             d.setIsBatchManage(item.getIsBatchManage());
             d.setOldProjectNo(item.getOldProjectNo());
             d.setProductGuid(item.getStg_location());
+            d.setEntryid(item.getGroupNum());
             try {
                 d.setQuantity(new BigDecimal(item.getQuantity()));
                 d.setAllotQuantity(BigDecimal.ZERO);
@@ -635,7 +665,6 @@ public class ToErpServiceImpl implements IToErpService {
         outStockoutService.updateOutStockout(out);
     }
 
-
     @Override
     public void callbackInDeliveryNotice() {
 
@@ -988,12 +1017,13 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setCinvm_unit(detail.getUnit());
                 // 货位编码
                 item.setCposcode(detail.getSpare9());
+                item.setJobid(detail.getStockinGuid());
                 // 货位名称
                 item.setCposname("");
                 // 托盘号
                 item.setCtrayname(detail.getSpare8());
                 //jobid
-                item.setJobid(detail.getSpare7());
+//                item.setJobid(detail.getSpare7());
                 // 批号
                 item.setCbatch(detail.getLotNo());
                 // 数量
@@ -1012,7 +1042,11 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
                 // 仓库选择 1立库 2 平库
                 item.setStg_location(detail.getProductGuid());
+                // 组件号
 
+                System.err.println("组件号赋值  " + detail.getCargoNo());
+                item.setGroupNum(detail.getCargoNo());
+                System.err.println("组件号赋值  结束");
                 detailList.add(item);
             }
         }
@@ -1023,7 +1057,7 @@ public class ToErpServiceImpl implements IToErpService {
         try {
             //todo 发送给erp  成功失败改状态
             // http://192.168.188.235/app1/api?type=1&key=1
-            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo());
+            RequestLog requestLog = requestLogService.getRequestLog("https://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo());
             if ("1".equals(requestLog.getIsSuccessful())) {
                 inStockin.setSendStatus("1");
                 inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -1040,8 +1074,6 @@ public class ToErpServiceImpl implements IToErpService {
                 inStockinDetailParam.setSendStatus("2");
                 inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 inStockinDetailParam.setMsg(requestLog.getErrorDetails());
-//                inStockinDetailBackService.insertInStockInDetailBackFinish(inStockinDetails);
-//                inStockinDetailBackService.deleteInStockInDetailList(inStockinDetails);
             }
             inStockinBackService.updateInStockinBack(inStockin);
             inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
@@ -1105,7 +1137,7 @@ public class ToErpServiceImpl implements IToErpService {
                 // 批号
                 item.setCbatch(detail.getLotNo());
 
-                item.setJobid(detail.getSpare7());
+                item.setJobid(detail.getStockoutGuid());
 //                item.setLotNo(detail.getLotNo());
                 // 数量
                 item.setIquantity(Integer.parseInt(String.valueOf(detail.getAssignNum())));
@@ -1121,8 +1153,10 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setSrcrowno(detail.getSpare6());
                 // 是否批次管理
                 item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
-                // 仓库选择 1立库 2平库
+                // 仓库选择 1立库 2 平库
                 item.setStg_location(detail.getProductGuid());
+                // TODO 暂时未启用 等甲方后续通知
+                item.setGroupNum(detail.getEntryid());
 
                 detailList.add(item);
             }
@@ -1132,7 +1166,7 @@ public class ToErpServiceImpl implements IToErpService {
 
         try {
             //todo 发送给erp  成功失败改状态
-            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp", outStockoutBack.getOutType(), outStockoutBack.getAccountSetNo());
+            RequestLog requestLog = requestLogService.getRequestLog("https://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp", outStockoutBack.getOutType(), outStockoutBack.getAccountSetNo());
             if ("1".equals(requestLog.getIsSuccessful())) {
                 outStockoutBack.setSendStatus("1");
                 outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -1167,6 +1201,11 @@ public class ToErpServiceImpl implements IToErpService {
 
     }
 
+    @Override
+    public void callbackDeliveryOutNoticeNews() {
+
+    }
+
 
     public AjaxResult createOtherInOutboundOrder(TransferBillCallback transferBillCallback) {
         ErpInterfaceParam<ErpInOutBoundOrder> param = new ErpInterfaceParam<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index 5c1bdc8..718ca63 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -401,6 +401,7 @@ public class ToWmsServiceImpl implements IToWmsService {
     @Override
     public AjaxResult requestEnterByTaskNo(RequestEnter requestEnter) {
         String taskNo = requestEnter.getTaskNo();
+        String deviceCode = requestEnter.getDeviceCode();
         MydoJob inJob = mydoJobMapper.selectInJobByTaskNo(taskNo);
         if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
             if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
@@ -410,6 +411,7 @@ public class ToWmsServiceImpl implements IToWmsService {
                 HashMap<String, Object> map = new HashMap<>();
 
                 map.put("v_tray_code", inJob.getTrayCode());
+                map.put("v_code", deviceCode);
                 mydoJobMapper.allotInJobSpace(map);
                 if (!"10".equals(map.get("v_result").toString())) {
                     return AjaxResult.error(map.get("v_resultmsg").toString());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvTask.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvTask.java
new file mode 100644
index 0000000..e6a75c6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvTask.java
@@ -0,0 +1,22 @@
+package com.ruoyi.bas.agvPoint.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@lombok.Data
+@Getter
+@Setter
+public class AgvTask implements Serializable {
+
+    private String startPoint;
+    private String endPoint;
+    private String type;
+    private String trayCode;
+
+
+
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
index 8aca668..7e08309 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
@@ -182,8 +182,8 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
                 CheckStockinDetail checkStockinDetail = detailList.get(i);
                 checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
                 checkStockinDetail.setStockCheckId(stockCheckId);
-                BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
-                checkStockinDetail.setProductGuid(basProduct.getProductGuid());
+//                BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
+//                checkStockinDetail.setProductGuid(basProduct.getProductGuid());
                 checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid());
                 checkStockinDetail.setScanNum("0");
                 checkStockinDetail.setAssignNum("0");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/mapper/AgvContainerTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/mapper/AgvContainerTaskMapper.java
index 7306baa..fdb6f30 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/mapper/AgvContainerTaskMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/mapper/AgvContainerTaskMapper.java
@@ -60,4 +60,6 @@ public interface AgvContainerTaskMapper
     public int deleteAgvContainerTaskByIds(Long[] ids);
 
     void insertHistory(Long id);
+
+    void deleteAgvJobByOrder(String order);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/IAgvContainerTaskService.java b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/IAgvContainerTaskService.java
index 7df0984..8dba646 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/IAgvContainerTaskService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/IAgvContainerTaskService.java
@@ -60,4 +60,6 @@ public interface IAgvContainerTaskService
     public int deleteAgvContainerTaskById(Long id);
 
     void insertHistory(Long id);
+
+    void deleteAgvJobByOrder(String order);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/impl/AgvContainerTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/impl/AgvContainerTaskServiceImpl.java
index b8307cb..075c419 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/impl/AgvContainerTaskServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/impl/AgvContainerTaskServiceImpl.java
@@ -97,4 +97,9 @@ public class AgvContainerTaskServiceImpl implements IAgvContainerTaskService
     public void insertHistory(Long id) {
         agvContainerTaskMapper.insertHistory(id);
     }
+
+    @Override
+    public void deleteAgvJobByOrder(String order) {
+        agvContainerTaskMapper.deleteAgvJobByOrder(order);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
index 2d84e9e..802c4e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
@@ -102,10 +102,37 @@ public class InStockin extends BaseEntity
 
     private String lotNo;
     private String materialDesc;
+    private String productId;
     private String startDate;
 
     private String companyShortName;
     private String accountSetNo;
+    private String cargoNo;
+    private String stockinDetailId;
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
 
     public String getCompanyShortName() {
         return companyShortName;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
index 3be6e24..39f2f58 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
@@ -66,4 +66,6 @@ public interface InStockinMapper
     void insertInStockinHistory(InStockin inStockin);
 
     List<InStockin> selectStockinByDetail(String stockinDetailId);
+
+    List<InStockin> selectInStockinListBill(InStockin param);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
index c579194..a73599a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
@@ -74,5 +74,5 @@ public interface IInStockinService
 
     public List<InStockin> selectStockinByDetail(String stockinDetailId);
 
-
+    List<InStockin> selectInStockinListBill(InStockin param);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
index 0448f63..d9545af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -255,4 +255,9 @@ public class InStockinServiceImpl implements IInStockinService
     public List<InStockin> selectStockinByDetail(String stockinDetailId) {
         return inStockinMapper.selectStockinByDetail(stockinDetailId);
     }
+
+    @Override
+    public List<InStockin> selectInStockinListBill(InStockin param) {
+        return inStockinMapper.selectInStockinListBill(param);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
index e4f41a0..c6080e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
@@ -7,7 +7,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.data.annotation.Transient;
 
 /**
  * 入库单据子表对象 in_stockin_detail
@@ -144,6 +143,7 @@ public class InStockinDetail extends BaseEntity
     private String status;
 
     private ExtraField extraField;
+    private String erpBill;
 
     private String warehouseName;
 
@@ -152,6 +152,4 @@ public class InStockinDetail extends BaseEntity
     private String barCode;
     private String isBatchManage;
     private String oldProjectNo;
-    @Transient
-    private String erpBill;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java
index 340a94c..ef1507d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java
@@ -89,6 +89,15 @@ public class InStockinFinish extends BaseEntity
     /** 备用字段5 */
     @Excel(name = "备用字段5")
     private String spare5;
+    private String stockinDetailId;
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
 
     public void setStockinGuid(String stockinGuid)
     {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
index 8648241..8caa432 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
@@ -124,6 +124,9 @@ public class MydoJob extends BaseEntity
     /** 重分标记 */
     @Excel(name = "重分标记")
     private String faultFlag;
+    private String endPoint;
+
+
 
     private String inOut;
 
@@ -133,6 +136,23 @@ public class MydoJob extends BaseEntity
     private String createRightTime;
 
     private String productId;
+    private String stockinDetailId;
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
 
     public String getProductId() {
         return productId;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
index 38e07d1..d6be1f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
@@ -88,4 +88,8 @@ public interface MydoJobMapper
     void allotInJobSpace(HashMap<String, Object> map);
 
     void ykCompleted(HashMap<String, Object> map);
+
+    void updateLed(HashMap<String, Object> map);
+
+    void updateLedError(HashMap<String, Object> map);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java
index 226575a..339e569 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java
@@ -85,6 +85,34 @@ public class RequestLogController extends BaseController
         return toAjax(requestLogService.updateRequestLog(requestLog));
     }
 
+
+
+
+
+    @GetMapping("/getMethod")
+    public AjaxResult getMethod()
+    {
+        List<String> strings=requestLogService.getMethod();
+        return AjaxResult.success(requestLogService.getMethod());
+    }
+
+    // 获取原系统
+    @GetMapping("/getSource")
+    public AjaxResult getSource()
+    {
+        List<String> strings=requestLogService.getSource();
+        return AjaxResult.success(requestLogService.getSource());
+    }
+    // 获取目标系统
+    @GetMapping("/getTarget")
+    public AjaxResult getTarget()
+    {
+        List<String> strings=requestLogService.getTarget();
+        return AjaxResult.success(requestLogService.getTarget());
+    }
+
+
+
     /**
      * 删除接口记录
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java
index ba0c60a..34d1da1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java
@@ -59,4 +59,10 @@ public interface RequestLogMapper
      * @return 结果
      */
     public int deleteRequestLogByRequestIds(Long[] requestIds);
+
+    List<String> getMethod();
+
+    List<String> getSource();
+
+    List<String> getTarget();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
index 01b3669..1a40a4c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
@@ -81,4 +81,9 @@ public interface IRequestLogService
 
     public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult);
 
+    List<String> getMethod();
+
+    List<String> getSource();
+
+    List<String> getTarget();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
index 92a27fb..7c91349 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
@@ -3,10 +3,8 @@ package com.ruoyi.log.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.net.URLEncodeUtil;
 import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,7 +14,7 @@ import com.ruoyi.log.service.IRequestLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.hutool.core.net.URLEncoder;
+
 import java.util.Date;
 import java.util.List;
 
@@ -247,6 +245,22 @@ public class RequestLogServiceImpl implements IRequestLogService
         return requestLog;
     }
 
+    @Override
+    public List<String> getMethod() {
+
+        return requestLogMapper.getMethod();
+    }
+
+    @Override
+    public List<String> getSource() {
+        return requestLogMapper.getSource();
+    }
+
+    @Override
+    public List<String> getTarget() {
+        return requestLogMapper.getTarget();
+    }
+
     public static void main(String[] args) {
         String aa = "{\"code\":\"200,\"success\":true,\"msg\":\"请求成功\"}";
         System.out.println(JSONUtil.isJsonObj(aa));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java
index 1378ddb..471961e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java
@@ -42,6 +42,9 @@ public class ViewHandAllotStockController extends BaseController
     public TableDataInfo list(ViewHandAllotStock viewHandAllotStock)
     {
         startPage();
+        if (viewHandAllotStock.getWarehouseCode()==null||viewHandAllotStock.getWarehouseCode().equals("")){
+            viewHandAllotStock.setWarehouseCode("1");
+        }
         List<ViewHandAllotStock> list = viewHandAllotStockService.selectViewHandAllotStockList(viewHandAllotStock);
         return getDataTable(list);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
index ede42a8..006e27f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 手动分配库存对象 view_hand_allot_stock
@@ -187,7 +188,38 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位锁")
     private String locked;
 
-    public void setStockId(String stockId) 
+    @Transient
+    private String ktpType;
+    @Transient
+    private String productType;
+    @Transient
+    private String warehouseCode;
+
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getKtpType() {
+        return ktpType;
+    }
+
+    public void setKtpType(String ktpType) {
+        this.ktpType = ktpType;
+    }
+
+    public String getProductType() {
+        return productType;
+    }
+
+    public void setProductType(String productType) {
+        this.productType = productType;
+    }
+
+    public void setStockId(String stockId)
     {
         this.stockId = stockId;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
index f86ae4f..007188b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
@@ -35,7 +35,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 查询出库主单列表
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:list')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:list')")
     @GetMapping("/list")
     public TableDataInfo list(OutStockout outStockout) {
         startPage();
@@ -51,7 +51,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 导出出库主单列表
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:export')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:export')")
     @Log(title = "出库主单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, OutStockout outStockout) {
@@ -63,7 +63,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 获取出库主单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:query')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:query')")
     @GetMapping(value = "/{stockoutGuid}")
     public AjaxResult getInfo(@PathVariable("stockoutGuid") String stockoutGuid) {
         return success(outStockoutService.selectOutStockoutByStockoutGuid(stockoutGuid));
@@ -72,7 +72,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 新增出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:add')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:add')")
     @Log(title = "出库主单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody OutStockout outStockout) {
@@ -82,7 +82,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 修改出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:edit')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:edit')")
     @Log(title = "出库主单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody OutStockout outStockout) {
@@ -92,7 +92,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 删除出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:remove')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:remove')")
     @Log(title = "出库主单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{stockoutGuids}")
     public AjaxResult remove(@PathVariable String[] stockoutGuids) {
@@ -107,7 +107,7 @@ public class OutStockoutController extends BaseController {
      */
     @Log(title = "出库主单保存", businessType = BusinessType.OTHER)
     @PostMapping("/saveBill")
-    @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')")
     @ResponseBody
     public AjaxResult saveBill(@RequestBody OutStockoutVo outStockoutVo) {
         String stockOutId = outStockoutService.saveBill(outStockoutVo);
@@ -117,7 +117,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 出库单据状态改变
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:changeStatus')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:changeStatus')")
     @Log(title = "出库主单状态改变", businessType = BusinessType.OTHER)
     @RequestMapping("/changeStatus")
     @ResponseBody
@@ -132,22 +132,24 @@ public class OutStockoutController extends BaseController {
      * @param stockoutId
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
     @Log(title = "出库单自动分配", businessType = BusinessType.OTHER)
-    @PostMapping("/autoAllot")
-    public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId,@RequestParam("spare8") String spare8) {
+    @GetMapping("/autoAllot")
+    public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
         // 修改出库方向
 //        OutStockout outStockout = new OutStockout();
 //        outStockout.setStockoutId(stockoutId);
 //        outStockout.setSpare8(spare8);
 //        outStockoutService.updateOutStockout(outStockout);
+        System.out.println(stockoutId);
+//        System.out.println(spare8);
         return outStockoutService.autoAllot(stockoutId);
     }
 
     /**
      * 手动分配
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:manualAllot')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:manualAllot')")
     @Log(title = "出库单手动分配", businessType = BusinessType.OTHER)
     @GetMapping("/manualAllot")
     public AjaxResult manualAllot(@RequestParam("stockList") String[] stockList, @RequestParam("stockoutDetailId") String stockoutDetailId) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/mapper/OutStockoutMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/mapper/OutStockoutMapper.java
index c5c4496..451f337 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/mapper/OutStockoutMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/mapper/OutStockoutMapper.java
@@ -68,4 +68,6 @@ public interface OutStockoutMapper
     OutStockout selectOutStockoutByStockoutId(String stockoutId);
 
     void manualAllot(HashMap<String, String> map);
+
+    void updateOutStockouts(OutStockout mainOut);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java
index cb1c1eb..0a97a3f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java
@@ -74,4 +74,5 @@ public interface IOutStockoutService
 
     AjaxResult manualAllot(String[] stockList,String stockoutDetailId);
 
+    void updateOutStockouts(OutStockout mainOut);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
index 862c0c7..8033931 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
@@ -220,4 +220,9 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         }
         return AjaxResult.success();
     }
+
+    @Override
+    public void updateOutStockouts(OutStockout mainOut) {
+       outStockoutMapper.updateOutStockouts(mainOut);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
index e536960..90f41d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
@@ -35,7 +35,7 @@ public class ViewProductAndStockController extends BaseController
     private IViewProductAndStockService viewProductAndStockService;
 
     /**
-     * 查询库存物资列表
+//     * 查询库存物资列表
      */
     @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
     @GetMapping("/list")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
index 4f4d077..21167df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -2,13 +2,20 @@ package com.ruoyi.pda.controller;
 
 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
+import com.ruoyi.bas.agvPoint.domain.AgvPoint;
+import com.ruoyi.bas.agvPoint.domain.AgvTask;
+import com.ruoyi.bas.agvPoint.service.impl.AgvPointServiceImpl;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.agv.domain.AgvContainerTask;
+import com.ruoyi.device.agv.service.IAgvContainerTaskService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.out.outStockout.domain.OutStockout;
 import com.ruoyi.out.outStockout.service.impl.OutStockoutServiceImpl;
@@ -16,10 +23,11 @@ import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.out.outStockoutDetail.service.impl.OutStockoutDetailServiceImpl;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
+import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pdfbox.contentstream.operator.graphics.BeginInlineImage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 @Controller
 @RequestMapping("/pda")
@@ -43,6 +52,16 @@ public class PdaController extends BaseController {
     private OutStockoutServiceImpl outStockoutService;
     @Autowired
     private OutStockoutDetailServiceImpl outStockoutDetailService;
+    @Autowired
+    private AgvPointServiceImpl agvPointService;
+    @Autowired
+    private IAgvContainerTaskService agvContainerTaskService;
+    @Autowired
+    private PdaMapper pdaMapper;
+    @Autowired
+    private IMydoJobService mydoJobService;
+    @Autowired
+    private IBasStockService basStockService;
 
     /**
      * 查询是否有半满托盘
@@ -54,6 +73,30 @@ public class PdaController extends BaseController {
         return AjaxResult.success(basStocks);
     }
 
+    /**
+     * 通过单据码查询物料详情
+     */
+    @RequestMapping("/selectDetailByIds")
+    @ResponseBody
+    public AjaxResult selectDetailByIds(String inStockinDetailId) {
+        InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
+        if (inStockinDetail != null) {
+            inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
+        }
+        return AjaxResult.success(inStockinDetail);
+    }
+
+    /**
+     * 半盘出库
+     */
+
+    @RequestMapping("/halfTrayOut")
+    @ResponseBody
+    public AjaxResult halfTrayOut(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.halfTrayOut(trayCodeMsg);
+    }
+
+
     /**
      * 通过单据码查询物料详情  TODO 修改单据码为barCode  前端需同步修改
      */
@@ -69,16 +112,6 @@ public class PdaController extends BaseController {
         return AjaxResult.success(stockinDetails);
     }
 
-    /**
-     * 半盘出库
-     */
-
-    @RequestMapping("/halfTrayOut")
-    @ResponseBody
-    public AjaxResult halfTrayOut(@RequestBody TrayCodeMsg trayCodeMsg) {
-        return pdaService.halfTrayOut(trayCodeMsg);
-    }
-
 
     /**
      * 通过托盘码查询作业或trayMsg
@@ -98,6 +131,13 @@ public class PdaController extends BaseController {
         return pdaService.bindTray(trayCodeMakeSure);
     }
 
+    @RequestMapping("/bindTray2")
+    @ResponseBody
+    public AjaxResult bindTray2(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.bindTray2(trayCodeMakeSure);
+    }
+
+
     /**
      * 空托盘入库
      */
@@ -168,7 +208,7 @@ public class PdaController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pda:check:checkMakeSure')")
     @PostMapping("/checkMakeSure")
-    @Log(title = "手持机盘点出库确认", businessType = BusinessType.INSERT)
+    @Log(title = "手持机盘点出库确认", businessType = BusinessType.OTHER)
     @ResponseBody
     public AjaxResult checkMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
         return pdaService.checkMakeSure(trayCodeMakeSure);
@@ -211,7 +251,7 @@ public class PdaController extends BaseController {
     @ResponseBody
     public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
 
-        return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode()));
+        return pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode());
     }
 
     /**
@@ -252,10 +292,13 @@ public class PdaController extends BaseController {
             for (MydoJobDetail m : mydoJobDetailList) {
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("v_tray_code", trayCode);
-                map.put("v_out_stockout_detail_id", m.getStockinDetailId());
+                map.put("v_out_stockout_detail_id", trayCodeMakeSure.getStockoutDetailId());
                 map.put("v_quantity", m.getOutQuantity());
+                map.put("v_stock_id", m.getStockId());
                 pdaService.completeOutPk(map);
-                if (!map.get("v_result").equals("10")) {
+                Integer vResult = (Integer) map.get("v_result");
+                if (vResult != 10) {
+                    System.err.println(map.get("v_result_msg").toString());
                     return AjaxResult.error(map.get("v_result_msg").toString());
                 }
             }
@@ -275,9 +318,11 @@ public class PdaController extends BaseController {
     @RequestMapping("/OutFillPk")
     @ResponseBody
 
-    public List<OutStockout> OutFillPk(@RequestBody OutStockout outStockout) {
-
-        return outStockoutService.selectOutStockoutList(outStockout);
+    public AjaxResult OutFillPk() {
+        OutStockout outStockout = new OutStockout();
+        outStockout.setWarehouseId("2");
+        outStockoutService.selectOutStockoutList(outStockout);
+        return AjaxResult.success(outStockoutService.selectOutStockoutList(outStockout));
     }
 
 
@@ -289,10 +334,11 @@ public class PdaController extends BaseController {
      */
     @RequestMapping("/OutFillPkDetail")
     @ResponseBody
-    public List<OutStockoutDetail> OutFillPkDetail(@RequestBody OutStockout outStockout) {
+    public AjaxResult OutFillPkDetail(@RequestBody OutStockout outStockout) {
+
         List<OutStockout> outStockouts = outStockoutService.selectOutStockoutList(outStockout);
 
-        return outStockoutDetailService.selectOutStockoutDetailByStockoutGuid(outStockouts.get(0).getStockoutId());
+        return AjaxResult.success(outStockoutDetailService.selectOutStockoutDetailByStockoutGuid(outStockouts.get(0).getStockoutGuid()));
     }
 
 
@@ -307,15 +353,113 @@ public class PdaController extends BaseController {
     @RequestMapping("/queryBasStockHc")
     @ResponseBody
     public AjaxResult queryBasStockHc(@RequestBody TrayCodeMsg trayCodeMsg) {
-        String trayCode = trayCodeMsg.getTrayCode();
-        String stockinDetailId = trayCodeMsg.getStockinDetailId();
-        OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(stockinDetailId);
-        String productId = outStockoutDetail.getProductId();
-        Integer integer = pdaService.selectBasStockHcCount(trayCode, productId);
-        if (integer > 0) {
-            return AjaxResult.success();
+        return pdaService.selectBasStockHcs(trayCodeMsg.getTrayCode(), trayCodeMsg.getStockoutDetailId());
+    }
+
+    // 立库扫码规则校验
+    @RequestMapping("/validateMaterial")
+    @ResponseBody
+    public AjaxResult validateMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_stockin_detail_id", trayCodeMakeSure.getInStockinDetailId());
+        map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
+        map.put("v_quantity", trayCodeMakeSure.getQuantity());
+        pdaMapper.bindTray(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
         } else {
-            return AjaxResult.error("无该物料");
+            return AjaxResult.success(map.get("v_result").toString());
+        }
+    }
+
+
+    /**
+     * 平库出库信息校验
+     *
+     * @param trayCodeMakeSure TODO 要校验项目号，批号，以及其他条件，要复合查询，待修改
+     * @return
+     */
+    @RequestMapping("/verifypkTrayMaterials")
+    @ResponseBody
+    public AjaxResult verifypkTrayMaterials(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        String trayCode = trayCodeMakeSure.getTrayCode();
+        List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+        for (MydoJobDetail m : mydoJobDetailList) {
+            String productId = m.getProductId();
+            Integer integer = pdaService.selectBasStockHcCount(trayCode, productId);
+            if (integer == 0) {
+                return AjaxResult.error(m.getProductId() + ",物料不是出库物料");
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
+    // 查询AGV的起点和终点
+    @RequestMapping("/selectAgvPointByType")
+    @ResponseBody
+    public AjaxResult selectAgvPointByType(String type) {
+        AgvPoint agvPoint = new AgvPoint();
+        agvPoint.setType(type);
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+        return AjaxResult.success(agvPoints);
+    }
+
+    // 保存agv执行队列
+    @RequestMapping("/insertAgvJob")
+    @ResponseBody
+    public AjaxResult insertAgvJob(@RequestBody AgvTask agvTask) {
+        AgvPoint agvPoint = new AgvPoint();
+        agvPoint.setStation(agvTask.getEndPoint());
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+        if (!agvPoints.get(0).getStation().equals("K1-1") && !agvPoints.get(0).getStation().equals("K2-1") && agvPoints.get(0).getSpare1().equals("2")) {
+            return AjaxResult.error("该点位被占用，请检查!");
+        }
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setContainer(UUID.randomUUID().toString());
+        agvContainerTask.setEndPoint(agvTask.getEndPoint());
+        agvContainerTask.setStartPoint(agvTask.getStartPoint());
+        agvContainerTask.setSpare1(agvTask.getType());
+        agvContainerTask.setSpare2(agvTask.getTrayCode());
+        agvContainerTask.setStatus("0");
+        agvContainerTaskService.insertAgvContainerTask(agvContainerTask);
+        return AjaxResult.success();
+    }
+
+
+    // 保存agv执行队列
+    @GetMapping("/selectAgvPointByType")
+    @ResponseBody
+    public AjaxResult selectAgvPointByType(String type, String position) {
+        System.out.println(type + "  " + position);
+        AgvPoint agvPoint = new AgvPoint();
+//        agvPoint.setType(type);
+        agvPoint.setStation(position);
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+
+
+        return AjaxResult.success(agvPoints);
+    }
+
+
+//    // 查询子单据的明细信息
+//    @RequestMapping("/selectDetailById")
+//    public AjaxResult selectDetailById(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+//        String inStockinDetailId = trayCodeMakeSure.getInStockinDetailId();
+//        InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
+//        return AjaxResult.success(inStockinDetail);
+//
+//    }
+
+    @RequestMapping("/selectByTrayCode")
+    public AjaxResult selectByTrayCode(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode());
+        if (mydoJob != null && mydoJob.getInOrOut().equals("26")) {
+            BasStock basStock = basStockService.selectBasStockListTopOne(trayCodeMakeSure.getTrayCode());
+            return AjaxResult.success(basStock);
+        } else {
+            return AjaxResult.error("该托盘无盘任务");
         }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
index 0e1751e..566b676 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
@@ -32,4 +32,7 @@ public class TrayCodeMakeSure {
     private List<MydoJobDetail> materialDetails;
     private String quantity;
     private String stockinDetailId;
+    private String inStockinDetailId;
+    private String stockoutDetailId;
+    private String cargoSpaceId;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
index f4c9ccd..71cb587 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
@@ -1,5 +1,7 @@
 package com.ruoyi.pda.domain;
 
+import java.util.List;
+
 public class TrayCodeMsg {
 
 private String trayCode;
@@ -18,8 +20,18 @@ private String stockinDetailId;
 
 private String inOut;
 private String status;
+private String stockoutDetailId;
 
-private String trayType;
+
+    public String getStockoutDetailId() {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    private String trayType;
 
     public String getTrayType() {
         return trayType;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
index 3b2024a..4721310 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
@@ -1,7 +1,5 @@
 package com.ruoyi.pda.mapper;
 
-import org.apache.ibatis.annotations.Param;
-
 import java.util.HashMap;
 
 public interface PdaMapper {
@@ -43,11 +41,15 @@ public interface PdaMapper {
 
     void hcoutMakesure(HashMap<String, Object> map);
 
-    void completeInPk(HashMap<String, Object> map);
-
-    Integer selectByTrayCodeAndProduct(@Param("trayCode") String trayCode, @Param("productId") String productId);
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
 
     void completeOutPk(HashMap<String, Object> map);
 
-    Integer selectBasStockHcCount(String trayCode);
+    void completeInPk(HashMap<String, Object> map);
+
+    void FillFinishAllot(HashMap<String, Object> map);
+
+    void FillFinishAllotOut(HashMap<String, Object> map);
+
+    void bindTrayCheck(HashMap<String, Object> map);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
index 65f6463..2b29890 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
@@ -67,5 +67,9 @@ public interface PdaService {
 
     void completeOutPk(HashMap<String, Object> map);
 
-    Integer selectBasStockHcCount(String trayType, String productId);
+    Integer selectBasStockHcCount(String trayCode, String productId);
+
+    AjaxResult selectBasStockHcs(String trayCode, String stockoutDetailId);
+
+    AjaxResult bindTray2(TrayCodeMakeSure trayCodeMakeSure);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
index f9bfa2b..e2c5705 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -11,7 +11,6 @@ import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
 
-import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.service.IInStockinService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -19,7 +18,8 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
-import com.ruoyi.job.mydojobdetail.service.impl.MydoJobDetailServiceImpl;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
+import com.ruoyi.out.outStockoutDetail.service.impl.OutStockoutDetailServiceImpl;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -60,7 +61,8 @@ public class PdaServiceImp implements PdaService {
     private BasStockMapper basStockMapper;
     @Autowired
     private IInStockinService inStockinService;
-
+    @Autowired
+    private OutStockoutDetailServiceImpl outStockoutDetailService;
 
     @Override
     public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
@@ -112,8 +114,6 @@ public class PdaServiceImp implements PdaService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure) {
         StringBuilder errorbulider = new StringBuilder();
-
-
         for (MydoJobDetail mydoJobDetail : trayCodeMakeSure.getMydoJobDetailList()) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
@@ -125,9 +125,7 @@ public class PdaServiceImp implements PdaService {
                 errorbulider.append(mydoJobDetail.getStockinDetailId() + map.get("v_resultmsg").toString());
                 return AjaxResult.error(errorbulider.toString());
             }
-
         }
-
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
         map.put("v_is_full", trayCodeMakeSure.getIsFull());
@@ -135,7 +133,6 @@ public class PdaServiceImp implements PdaService {
         if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(errorbulider.toString());
         }
-
         return AjaxResult.success();
     }
 
@@ -200,9 +197,10 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+//        mydoJob.setExitId(trayCodeMakeSure.getExitId());
         mydoJob.setStatus("3");
         mydoJob.setInOrOut("28");
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         return AjaxResult.success(mydoJobDetails);
     }
@@ -240,9 +238,9 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         if (mydoJobDetails.isEmpty()) {
             return AjaxResult.error("该物料没有盘点出库作业，请检查");
@@ -252,7 +250,7 @@ public class PdaServiceImp implements PdaService {
         if (CollUtil.isNotEmpty(mydoJobDetailList)) {
             boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
             if (flag) {
-                return AjaxResult.warn(MessageUtils.message("warn.message8"));
+                return AjaxResult.warn(MessageUtils.message("盘点数量不可为0"));
             }
             for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
                 //插入盘点提交表
@@ -304,12 +302,14 @@ public class PdaServiceImp implements PdaService {
         }
     }
 
+
     @Override
     public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
         map.put("v_in_stockin_detail_id", trayCodeMakeSure.getStockinDetailId());
         map.put("v_quantity", trayCodeMakeSure.getQuantity());
+        map.put("v_cargo_space_id", trayCodeMakeSure.getCargoSpaceId());
         pdaMapper.completeInPk(map);
         String result = map.get("v_result").toString();
         if ("10".equals(result)) {
@@ -324,7 +324,11 @@ public class PdaServiceImp implements PdaService {
         BasStock basStock = new BasStock();
         basStock.setTrayCode(trayCode);
         List<BasStock> stocks = basStockMapper.selectBasStockListHc(basStock);
-        return AjaxResult.success(stocks);
+        if (stocks.size() > 0) {
+            return AjaxResult.success(stocks);
+        } else {
+            return AjaxResult.error("无库存信息");
+        }
     }
 
     @Override
@@ -339,7 +343,45 @@ public class PdaServiceImp implements PdaService {
 
     @Override
     public Integer selectBasStockHcCount(String trayCode, String productId) {
-        List<BasStock> basStocks = basStockMapper.selectBasStockHcCount(trayCode, productId);
+        BasStock basStock = new BasStock();
+        basStock.setTrayCode(trayCode);
+        basStock.setProductId(productId);
+        List<BasStock> basStocks = basStockMapper.selectBasStockHcCount(basStock);
         return basStocks.size();
     }
+
+    @Override
+    public AjaxResult selectBasStockHcs(String trayCode, String stockoutDetailId) {
+        OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(stockoutDetailId);
+        List<BasStock> stocks = basStockMapper.selectBasStockHcs(trayCode, outStockoutDetail);
+        if (stocks.size() > 0) {
+            return AjaxResult.success(stocks);
+        }
+        {
+            return AjaxResult.error("该托盘无对应库存，请检查！");
+        }
+    }
+
+    @Override
+    public AjaxResult bindTray2(TrayCodeMakeSure trayCodeMakeSure) {
+        String collect = trayCodeMakeSure.getMydoJobDetailList().stream().map(detail -> detail.getStockinDetailId() + ":" + detail.getInQuantity()).collect(Collectors.joining(","));
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_string", collect);
+        map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
+        pdaMapper.bindTray(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
+        }
+        map.clear();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_is_full", trayCodeMakeSure.getIsFull());
+        pdaMapper.addInJob(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
+        }
+        return AjaxResult.success();
+    }
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java
deleted file mode 100644
index 4aa8a53..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.stock.hcstock.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.stock.hcstock.domain.BasStockHc;
-import com.ruoyi.stock.hcstock.service.IBasStockHcService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 缓存库存信息Controller
- * 
- * @author ruoyi
- * @date 2026-03-23
- */
-@RestController
-@RequestMapping("/hcstock/hcstock")
-public class BasStockHcController extends BaseController
-{
-    @Autowired
-    private IBasStockHcService basStockHcService;
-
-    /**
-     * 查询缓存库存信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(BasStockHc basStockHc)
-    {
-        startPage();
-        List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出缓存库存信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:export')")
-    @Log(title = "缓存库存信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, BasStockHc basStockHc)
-    {
-        List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
-        ExcelUtil<BasStockHc> util = new ExcelUtil<BasStockHc>(BasStockHc.class);
-        util.exportExcel(response, list, "缓存库存信息数据");
-    }
-
-    /**
-     * 获取缓存库存信息详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:query')")
-    @GetMapping(value = "/{stockId}")
-    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
-    {
-        return success(basStockHcService.selectBasStockHcByStockId(stockId));
-    }
-
-    /**
-     * 新增缓存库存信息
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:add')")
-    @Log(title = "缓存库存信息", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody BasStockHc basStockHc)
-    {
-        return toAjax(basStockHcService.insertBasStockHc(basStockHc));
-    }
-
-    /**
-     * 修改缓存库存信息
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:edit')")
-    @Log(title = "缓存库存信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody BasStockHc basStockHc)
-    {
-        return toAjax(basStockHcService.updateBasStockHc(basStockHc));
-    }
-
-    /**
-     * 删除缓存库存信息
-     */
-    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:remove')")
-    @Log(title = "缓存库存信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockIds}")
-    public AjaxResult remove(@PathVariable String[] stockIds)
-    {
-        return toAjax(basStockHcService.deleteBasStockHcByStockIds(stockIds));
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java
deleted file mode 100644
index 7c7a5c6..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java
+++ /dev/null
@@ -1,562 +0,0 @@
-package com.ruoyi.stock.hcstock.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 缓存库存信息对象 bas_stock_hc
- * 
- * @author ruoyi
- * @date 2026-03-23
- */
-public class BasStockHc extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 库存id */
-    private String stockId;
-
-    /** 货位id */
-    @Excel(name = "货位id")
-    private String cargoSpaceId;
-
-    /** 库存状态 1正常 2冻结 */
-    @Excel(name = "库存状态 1正常 2冻结")
-    private String stockStatus;
-
-    /** 物料状态 1正常 2盘点待审批 3异常 */
-    @Excel(name = "物料状态 1正常 2盘点待审批 3异常")
-    private String productStatus;
-
-    /** 546批号 */
-    @Excel(name = "546批号")
-    private String lotNo;
-
-    /** 入库时间 */
-    @Excel(name = "入库时间")
-    private String inDate;
-
-    /** 回流时间 */
-    @Excel(name = "回流时间")
-    private String backDate;
-
-    /** 物料GUID */
-    @Excel(name = "物料GUID")
-    private String productGuid;
-
-    /** 库存数量 */
-    @Excel(name = "库存数量")
-    private String quantity;
-
-    /** 作业ID */
-    @Excel(name = "作业ID")
-    private String jobId;
-
-    /** 托盘条码 */
-    @Excel(name = "托盘条码")
-    private String trayCode;
-
-    /** 出库数量 */
-    @Excel(name = "出库数量")
-    private String outQuantity;
-
-    /** 入库子单id */
-    @Excel(name = "入库子单id")
-    private String stockinDetailId;
-
-    /** 入库主单 */
-    @Excel(name = "入库主单")
-    private String stockinId;
-
-    /** 入库类型 */
-    @Excel(name = "入库类型")
-    private String inType;
-
-    /** 入库班组ID */
-    @Excel(name = "入库班组ID")
-    private String inClassId;
-
-    /** 仓库 */
-    @Excel(name = "仓库")
-    private String warehouseId;
-
-    /** 供应商名称546 */
-    @Excel(name = "供应商名称546")
-    private String stackingId;
-
-    /** 层级关系546 */
-    @Excel(name = "层级关系546")
-    private String spare1;
-
-    /** 上层物料546 */
-    @Excel(name = "上层物料546")
-    private String spare2;
-
-    /** 顶层物料546 */
-    @Excel(name = "顶层物料546")
-    private String spare3;
-
-    /** 项目号546 */
-    @Excel(name = "项目号546")
-    private String spare4;
-
-    /** 合同号546 */
-    @Excel(name = "合同号546")
-    private String spare5;
-
-    /** 销售订单号546 */
-    @Excel(name = "销售订单号546")
-    private String spare6;
-
-    /** 物料编码 */
-    @Excel(name = "物料编码")
-    private String productId;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String productName;
-
-    /** 供应商编码546 */
-    @Excel(name = "供应商编码546")
-    private String voltage;
-
-    /** 规格型号546 */
-    @Excel(name = "规格型号546")
-    private String power;
-
-    /** 计量单位546 */
-    @Excel(name = "计量单位546")
-    private String phase;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String netWeight;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String grossWeight;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String distribution;
-
-    /** 是否满盘546,0否1是 */
-    @Excel(name = "是否满盘546,0否1是")
-    private String model;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String orderId;
-
-    /** 盘点记录 0-未盘点 1-已盘点 */
-    @Excel(name = "盘点记录 0-未盘点 1-已盘点")
-    private String spare7;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare8;
-
-    public void setStockId(String stockId) 
-    {
-        this.stockId = stockId;
-    }
-
-    public String getStockId() 
-    {
-        return stockId;
-    }
-
-    public void setCargoSpaceId(String cargoSpaceId) 
-    {
-        this.cargoSpaceId = cargoSpaceId;
-    }
-
-    public String getCargoSpaceId() 
-    {
-        return cargoSpaceId;
-    }
-
-    public void setStockStatus(String stockStatus) 
-    {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getStockStatus() 
-    {
-        return stockStatus;
-    }
-
-    public void setProductStatus(String productStatus) 
-    {
-        this.productStatus = productStatus;
-    }
-
-    public String getProductStatus() 
-    {
-        return productStatus;
-    }
-
-    public void setLotNo(String lotNo) 
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo() 
-    {
-        return lotNo;
-    }
-
-    public void setInDate(String inDate) 
-    {
-        this.inDate = inDate;
-    }
-
-    public String getInDate() 
-    {
-        return inDate;
-    }
-
-    public void setBackDate(String backDate) 
-    {
-        this.backDate = backDate;
-    }
-
-    public String getBackDate() 
-    {
-        return backDate;
-    }
-
-    public void setProductGuid(String productGuid) 
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductGuid() 
-    {
-        return productGuid;
-    }
-
-    public void setQuantity(String quantity) 
-    {
-        this.quantity = quantity;
-    }
-
-    public String getQuantity() 
-    {
-        return quantity;
-    }
-
-    public void setJobId(String jobId) 
-    {
-        this.jobId = jobId;
-    }
-
-    public String getJobId() 
-    {
-        return jobId;
-    }
-
-    public void setTrayCode(String trayCode) 
-    {
-        this.trayCode = trayCode;
-    }
-
-    public String getTrayCode() 
-    {
-        return trayCode;
-    }
-
-    public void setOutQuantity(String outQuantity) 
-    {
-        this.outQuantity = outQuantity;
-    }
-
-    public String getOutQuantity() 
-    {
-        return outQuantity;
-    }
-
-    public void setStockinDetailId(String stockinDetailId) 
-    {
-        this.stockinDetailId = stockinDetailId;
-    }
-
-    public String getStockinDetailId() 
-    {
-        return stockinDetailId;
-    }
-
-    public void setStockinId(String stockinId) 
-    {
-        this.stockinId = stockinId;
-    }
-
-    public String getStockinId() 
-    {
-        return stockinId;
-    }
-
-    public void setInType(String inType) 
-    {
-        this.inType = inType;
-    }
-
-    public String getInType() 
-    {
-        return inType;
-    }
-
-    public void setInClassId(String inClassId) 
-    {
-        this.inClassId = inClassId;
-    }
-
-    public String getInClassId() 
-    {
-        return inClassId;
-    }
-
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId() 
-    {
-        return warehouseId;
-    }
-
-    public void setStackingId(String stackingId) 
-    {
-        this.stackingId = stackingId;
-    }
-
-    public String getStackingId() 
-    {
-        return stackingId;
-    }
-
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1() 
-    {
-        return spare1;
-    }
-
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2() 
-    {
-        return spare2;
-    }
-
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3() 
-    {
-        return spare3;
-    }
-
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4() 
-    {
-        return spare4;
-    }
-
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5() 
-    {
-        return spare5;
-    }
-
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6() 
-    {
-        return spare6;
-    }
-
-    public void setProductId(String productId) 
-    {
-        this.productId = productId;
-    }
-
-    public String getProductId() 
-    {
-        return productId;
-    }
-
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName() 
-    {
-        return productName;
-    }
-
-    public void setVoltage(String voltage) 
-    {
-        this.voltage = voltage;
-    }
-
-    public String getVoltage() 
-    {
-        return voltage;
-    }
-
-    public void setPower(String power) 
-    {
-        this.power = power;
-    }
-
-    public String getPower() 
-    {
-        return power;
-    }
-
-    public void setPhase(String phase) 
-    {
-        this.phase = phase;
-    }
-
-    public String getPhase() 
-    {
-        return phase;
-    }
-
-    public void setNetWeight(String netWeight) 
-    {
-        this.netWeight = netWeight;
-    }
-
-    public String getNetWeight() 
-    {
-        return netWeight;
-    }
-
-    public void setGrossWeight(String grossWeight) 
-    {
-        this.grossWeight = grossWeight;
-    }
-
-    public String getGrossWeight() 
-    {
-        return grossWeight;
-    }
-
-    public void setDistribution(String distribution) 
-    {
-        this.distribution = distribution;
-    }
-
-    public String getDistribution() 
-    {
-        return distribution;
-    }
-
-    public void setModel(String model) 
-    {
-        this.model = model;
-    }
-
-    public String getModel() 
-    {
-        return model;
-    }
-
-    public void setOrderId(String orderId) 
-    {
-        this.orderId = orderId;
-    }
-
-    public String getOrderId() 
-    {
-        return orderId;
-    }
-
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare7() 
-    {
-        return spare7;
-    }
-
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
-    }
-
-    public String getSpare8() 
-    {
-        return spare8;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockId", getStockId())
-            .append("cargoSpaceId", getCargoSpaceId())
-            .append("stockStatus", getStockStatus())
-            .append("productStatus", getProductStatus())
-            .append("lotNo", getLotNo())
-            .append("inDate", getInDate())
-            .append("backDate", getBackDate())
-            .append("productGuid", getProductGuid())
-            .append("quantity", getQuantity())
-            .append("jobId", getJobId())
-            .append("trayCode", getTrayCode())
-            .append("outQuantity", getOutQuantity())
-            .append("stockinDetailId", getStockinDetailId())
-            .append("stockinId", getStockinId())
-            .append("inType", getInType())
-            .append("inClassId", getInClassId())
-            .append("warehouseId", getWarehouseId())
-            .append("stackingId", getStackingId())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .append("productId", getProductId())
-            .append("productName", getProductName())
-            .append("voltage", getVoltage())
-            .append("power", getPower())
-            .append("phase", getPhase())
-            .append("netWeight", getNetWeight())
-            .append("grossWeight", getGrossWeight())
-            .append("distribution", getDistribution())
-            .append("model", getModel())
-            .append("orderId", getOrderId())
-            .append("spare7", getSpare7())
-            .append("spare8", getSpare8())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java
deleted file mode 100644
index 3e7b8c8..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.stock.hcstock.mapper;
-
-import java.util.List;
-import com.ruoyi.stock.hcstock.domain.BasStockHc;
-
-/**
- * 缓存库存信息Mapper接口
- * 
- * @author ruoyi
- * @date 2026-03-23
- */
-public interface BasStockHcMapper 
-{
-    /**
-     * 查询缓存库存信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 缓存库存信息
-     */
-    public BasStockHc selectBasStockHcByStockId(String stockId);
-
-    /**
-     * 查询缓存库存信息列表
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 缓存库存信息集合
-     */
-    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
-
-    /**
-     * 新增缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    public int insertBasStockHc(BasStockHc basStockHc);
-
-    /**
-     * 修改缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    public int updateBasStockHc(BasStockHc basStockHc);
-
-    /**
-     * 删除缓存库存信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 结果
-     */
-    public int deleteBasStockHcByStockId(String stockId);
-
-    /**
-     * 批量删除缓存库存信息
-     * 
-     * @param stockIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBasStockHcByStockIds(String[] stockIds);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java
deleted file mode 100644
index 6b9be5b..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.stock.hcstock.service;
-
-import java.util.List;
-import com.ruoyi.stock.hcstock.domain.BasStockHc;
-
-/**
- * 缓存库存信息Service接口
- * 
- * @author ruoyi
- * @date 2026-03-23
- */
-public interface IBasStockHcService 
-{
-    /**
-     * 查询缓存库存信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 缓存库存信息
-     */
-    public BasStockHc selectBasStockHcByStockId(String stockId);
-
-    /**
-     * 查询缓存库存信息列表
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 缓存库存信息集合
-     */
-    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
-
-    /**
-     * 新增缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    public int insertBasStockHc(BasStockHc basStockHc);
-
-    /**
-     * 修改缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    public int updateBasStockHc(BasStockHc basStockHc);
-
-    /**
-     * 批量删除缓存库存信息
-     * 
-     * @param stockIds 需要删除的缓存库存信息主键集合
-     * @return 结果
-     */
-    public int deleteBasStockHcByStockIds(String[] stockIds);
-
-    /**
-     * 删除缓存库存信息信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 结果
-     */
-    public int deleteBasStockHcByStockId(String stockId);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java
deleted file mode 100644
index 94fc4a0..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.stock.hcstock.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.stock.hcstock.mapper.BasStockHcMapper;
-import com.ruoyi.stock.hcstock.domain.BasStockHc;
-import com.ruoyi.stock.hcstock.service.IBasStockHcService;
-
-/**
- * 缓存库存信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2026-03-23
- */
-@Service
-public class BasStockHcServiceImpl implements IBasStockHcService 
-{
-    @Autowired
-    private BasStockHcMapper basStockHcMapper;
-
-    /**
-     * 查询缓存库存信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 缓存库存信息
-     */
-    @Override
-    public BasStockHc selectBasStockHcByStockId(String stockId)
-    {
-        return basStockHcMapper.selectBasStockHcByStockId(stockId);
-    }
-
-    /**
-     * 查询缓存库存信息列表
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 缓存库存信息
-     */
-    @Override
-    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc)
-    {
-        return basStockHcMapper.selectBasStockHcList(basStockHc);
-    }
-
-    /**
-     * 新增缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    @Override
-    public int insertBasStockHc(BasStockHc basStockHc)
-    {
-        return basStockHcMapper.insertBasStockHc(basStockHc);
-    }
-
-    /**
-     * 修改缓存库存信息
-     * 
-     * @param basStockHc 缓存库存信息
-     * @return 结果
-     */
-    @Override
-    public int updateBasStockHc(BasStockHc basStockHc)
-    {
-        return basStockHcMapper.updateBasStockHc(basStockHc);
-    }
-
-    /**
-     * 批量删除缓存库存信息
-     * 
-     * @param stockIds 需要删除的缓存库存信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBasStockHcByStockIds(String[] stockIds)
-    {
-        return basStockHcMapper.deleteBasStockHcByStockIds(stockIds);
-    }
-
-    /**
-     * 删除缓存库存信息信息
-     * 
-     * @param stockId 缓存库存信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBasStockHcByStockId(String stockId)
-    {
-        return basStockHcMapper.deleteBasStockHcByStockId(stockId);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java
index e67ac94..0381eb3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java
@@ -58,9 +58,10 @@ public class BasStockController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('stock:management:query')")
     @GetMapping(value = "/{stockId}")
-    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    public AjaxResult getInfo(@PathVariable("stockId") String stockId, @RequestParam(value = "warehouseCode", required = false) String warehouseCode)
     {
-        return success(basStockService.selectBasStockByStockId(stockId));
+        BasStock basStock = basStockService.selectBasStockByStockId2(stockId, warehouseCode);
+        return success(basStock);
     }
 
     /**
@@ -91,9 +92,10 @@ public class BasStockController extends BaseController
     @PreAuthorize("@ss.hasPermi('stock:management:remove')")
     @Log(title = "库存信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{stockIds}")
-    public AjaxResult remove(@PathVariable String[] stockIds)
+    public AjaxResult remove(@PathVariable String[] stockIds,@RequestParam(value = "warehouseCode",required = false) String warehouseCode)
     {
-        return toAjax(basStockService.deleteBasStockByStockIds(stockIds));
+        System.out.println(warehouseCode);
+        return toAjax(basStockService.deleteBasStockByStockIds2(stockIds,warehouseCode));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
index 10a23e8..98c34c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
@@ -11,6 +11,7 @@ import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.data.annotation.Transient;
 
 import java.util.List;
 
@@ -184,6 +185,8 @@ public class BasStock extends BaseEntity
     /** 仓库 */
 //     @Excel(name = "${stock.BasStock.warehouseId}")
     private String warehouseId;
+    @Transient
+    private String warehouseCode;
 
 
     /** 垛型ID */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
index c7bd54c..4211b88 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.stock.stock.mapper;
 
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.stock.stock.domain.BasStock;
 import org.apache.ibatis.annotations.Param;
 
@@ -74,7 +75,19 @@ public interface BasStockMapper
 
     List<BasStock> selectHasHalfTray(InStockinDetail inStockinDetail);
 
+    List<BasStock> selectBasStockHcCount(BasStock  basStock);
+
     List<BasStock> selectBasStockListHc(BasStock basStock);
 
-    List<BasStock> selectBasStockHcCount(String trayCode, String productId);
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int updateBasStock2(BasStock basStock);
+
+    int deleteBasStockByStockIds2(@Param("stockIds") String[] stockIds, @Param("warehouseCode")String warehouseCode);
+
+    List<BasStock> selectBasStockList2(BasStock basStock);
+
+    List<BasStock> selectBasStockHcs(@Param("trayCode") String trayCode, @Param("out") OutStockoutDetail outStockoutDetail);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
index c3ea57b..15b431c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
@@ -83,4 +83,10 @@ public interface IBasStockService
     AjaxResult resetPdRecord();
 
     List<BasStock> getStockBySerial(String serial);
+
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
index f9ff3f3..fd81cf8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
@@ -58,7 +58,7 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public List<BasStock> selectBasStockList(BasStock basStock)
     {
-        return basStockMapper.selectBasStockList(basStock);
+        return basStockMapper.selectBasStockList2(basStock);
     }
     /**
      * 无权限查询库存信息列表
@@ -115,10 +115,10 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public int updateBasStock(BasStock basStock)
     {
-        BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
+        BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(basStock.getStockId(),basStock.getWarehouseCode());
         insertMaintainRecord(oldBasStock,basStock,"2");
         insertFreezeRecord(oldBasStock,basStock);
-        return basStockMapper.updateBasStock(basStock);
+        return basStockMapper.updateBasStock2(basStock);
     }
 
     private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) {
@@ -194,6 +194,28 @@ public class BasStockServiceImpl implements IBasStockService
         return basStockMapper.getStockBySerial(trayCode);
     }
 
+    @Override
+    public BasStock selectBasStockByStockId2(String stockId, String warehouseCode) {
+        return basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode)
+    {
+        for (String stockId : stockIds) {
+            BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+            insertMaintainRecord(oldBasStock,oldBasStock,"3");
+        }
+        return basStockMapper.deleteBasStockByStockIds2(stockIds,warehouseCode);
+    }
+
+    @Override
+    public BasStock selectBasStockListTopOne(String trayCode) {
+
+        return basStockMapper.selectBasStockListTopOne(trayCode);
+    }
+
     /**
      * 新增库存信息（不记录维护记录）
      *
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f6355e6..2608eb5 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -133,7 +133,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 720
+  expireTime: 43800
 
 
 
@@ -175,4 +175,6 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 
-
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
index c4fe8ae..e3198e8 100644
--- a/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAgvContainerTaskVo">
-        select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
+        select top 1  id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
     </sql>
 
     <select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null  and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
             <if test="finishTime != null  and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
             <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
-            <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
         </where>
@@ -101,5 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteAgvJobByOrder" parameterType="string">
+        delete from agv_container_task where container = #{order}
+    </delete>
+
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
index 171a862..cedacf6 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAgvPointList" parameterType="AgvPoint" resultMap="AgvPointResult">
         <include refid="selectAgvPointVo"/>
         <where>  
-            <if test="station != null  and station != ''"> and station = #{station}</if>
+            <if test="station != null  and station != ''"> and station like concat('%',#{station},'%') </if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasLedMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasLedMapper.xml
new file mode 100644
index 0000000..eff3bdc
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasLedMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.Dzp.mapper.BasLedMapper">
+
+    <resultMap type="basLed" id="basLedResult">
+        <result property="id" column="id"/>
+        <result property="product_id" column="product_id"/>
+        <result property="spec" column="spec"/>
+        <result property="sendFlag" column="send_flag"/>
+        <result property="ipAddress" column="ip_address"/>
+        <result property="quantity" column="quantity"/>
+        <result property="trayCode" column="tray_code"/>
+        <result property="model" column="model"/>
+        <result property="productName" column="product_name"/>
+        <result property="errorMsg" column="error_msg"/>
+    </resultMap>
+
+    <sql id="selectBasContainerVo">
+        select id,
+               product_id,
+               spec,
+               quantity,
+               send_flag,
+               ip_address,
+               tray_code,
+               model,
+               product_name,
+               error_msg
+
+        from bas_led
+    </sql>
+
+    <select id="selectBasLedList" parameterType="basLed" resultMap="basLedResult">
+        <include refid="selectBasContainerVo"/>
+        <where>
+
+            <if test="sendFlag != null  and sendFlag != ''">and send_flag = #{sendFlag}
+            </if>
+            <if test="id != null  and id != ''">and id = #{id}
+            </if>
+        </where>
+    </select>
+
+
+
+
+
+
+
+    <update id="updateBasLed" parameterType="basLed">
+        update bas_led
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="product_id != null">product_id = #{product_id},</if>
+            <if test="sendFlag != null">send_flag = #{sendFlag},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+
+        </trim>
+        where id = #{id}
+    </update>
+
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index dcbfeb1..ce02176 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -202,12 +202,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcs.the_platoon,
             bcs.the_column,
             bcs.the_floor,
-            bcs.status,
-            bs.tray_code,
-            bs.product_id,
-            bs.product_name
+            bcs.status
         from bas_cargo_space bcs
-                 left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
         where bcs.status in ( '2')
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
index 48f196c..fd19718 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="productName"    column="product_name"    />
+        <result property="erpBill"    column="erp_bill"    />
 <!--        <association property="extraField" javaType="ExtraField">-->
 <!--            <result property="productId"    column="product_id"    />-->
 <!--            <result property="materialDesc"    column="product_name"    />-->
@@ -343,5 +344,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by ist.create_date desc
     </select>
+
+
+    <select id="selectStockInByDetailByBarCode" parameterType="string" resultMap="InStockinDetailResult">
+        select a.erp_bill,b.* from in_stockin a left join in_stockin_detail b on a.stockin_id=b.stockin_id where b.bar_code=#{barCode}
+
+
+    </select>
+
+
+
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
index fd8847e..81cad95 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInStockinFinishVo">
-        select is2.stockin_guid,
+        select distinct is2.stockin_guid,
                is2.stockin_id,
                is2.in_type,
                is2.create_date,
@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --                su.user_name
         from in_stockin_finish is2
                  left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
+        left join in_stockin_detail is3 on is2.stockin_id=is3.stockin_id
 --                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
 --                  left join sys_dept sd on is2.department_no = sd.dept_id
 --                  left join sys_user su on su.user_id = is2.create_man_id
@@ -104,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
             <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and is3.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
         </where>
     </select>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
index 3852cb3..fb655ab 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare3"    column="spare3"    />
         <result property="spare5"    column="spare5"    />
+        <result property="accountSetNo"    column="account_set_no"    />
     </resultMap>
 
     <sql id="selectInStockinVo">
-        select is2.stockin_guid,
+        select DISTINCT  is2.stockin_guid,
                is2.stockin_id,
                is2.in_type,
                is2.create_date,
@@ -53,11 +54,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bw.warehouse_name
         from in_stockin is2
                  left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
---                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
+--         LEFT JOIN in_stockin_detail is3 on is2.stockin_id=is3.stockin_id
+            --                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
 --                  left join sys_dept sd on is2.department_no = sd.dept_id
 --                  left join sys_user su on su.user_id = is2.create_man_id
+
     </sql>
 
+
+
+    <select id="selectInStockinListBill" parameterType="InStockin" resultMap="InStockinResult">
+        <include refid="selectInStockinVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
+            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
+            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
+            <if test="status != null  and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="startDate != null  and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
+            <if test="finishDate != null  and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
+            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill =#{erpBill}</if>
+            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
+            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
+            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
+            <!--            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>-->
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="accountSetNo != null  and accountSetNo != ''"> and is2.account_set_no = #{accountSetNo}</if>
+
+            <if test="materialDesc !=null and materialDesc!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                left join bas_product bp on isd.product_id = bp.product_id
+                where isd.product_name like concat('%',#{materialDesc},'%')
+                )
+            </if>
+            <if test="spare4 !=null and spare4 !=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.spare4 like concat('%',#{spare4},'%')
+                )
+            </if>
+            <if test="cargoNo !=null and cargoNo!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.cargo_no like concat('%',#{cargoNo},'%')
+                )
+            </if>
+            <if test="stockinDetailId !=null and stockinDetailId!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.stockin_detail_id like concat('%',#{stockinDetailId},'%')
+                )
+            </if>
+            <if test="lotNo !=null and lotNo!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail
+                where lot_no like concat('%',#{lotNo},'%')
+                )
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+            <if test="typeData != null and typeData.size()>0">
+                and bw.warehouse_type in
+                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by is2.create_date desc
+    </select>
+
     <select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
         <include refid="selectInStockinVo"/>
         <where>
@@ -77,9 +150,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
             <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
+<!--            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>-->
             <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
+
             <if test="materialDesc !=null and materialDesc!=''">
                 and is2.stockin_id in (
                 select distinct stockin_id from in_stockin_detail isd
@@ -87,6 +161,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 where isd.product_name like concat('%',#{materialDesc},'%')
                 )
             </if>
+            <if test="spare4 !=null and spare4 !=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.spare4 like concat('%',#{spare4},'%')
+                )
+            </if>
+            <if test="cargoNo !=null and cargoNo!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.cargo_no like concat('%',#{cargoNo},'%')
+                )
+            </if>
+            <if test="stockinDetailId !=null and stockinDetailId!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                where isd.stockin_detail_id like concat('%',#{stockinDetailId},'%')
+                )
+            </if>
             <if test="lotNo !=null and lotNo!=''">
                 and is2.stockin_id in (
                 select distinct stockin_id from in_stockin_detail
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
index 35b821b..4eac9a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
@@ -403,8 +403,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spare3,
                mjd.spare4,
                mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               bp.product_name,
+               mjd.out_quantity - mjd.pick_quantity as pick_quantity_real,
+               mjd.product_name,
                mjd.spare5,
                mjd.spare6,
                mjd.spare7,
@@ -415,12 +415,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mj.tray_code
 
         from mydo_job_detail mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
+
                  left join mydo_job mj on mjd.job_id = mj.job_id
-        where mj.exit_id=#{exitId}
-          and mj.status='3'
-          and mj.execution_phase=2
-          and mj.in_or_out like concat('%', #{inOrOut}, '%')
+        where mj.status = '3'
+          and mj.execution_phase = 2
+          and mj.tray_code = #{trayCode}
+          and mj.in_or_out = #{inOrOut}
     </select>
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index ae37714..63e01f3 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
         left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
         left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
+        left join mydo_job_detail_finish mjd on mj.job_id = mjd.job_id
 
         <where>
             <if test="jobId != null  and jobId != ''"> and mj.job_id like concat('%', #{jobId}, '%')</if>
@@ -138,8 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priority != null "> and mj.priority like concat('%', #{priority}, '%')</if>
             <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat('%', #{executionPhase}, '%')</if>
             <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat('%', #{inOrOut}, '%')</if>
-            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
+            <if test="startTime != null  and startTime != ''"> and mj.start_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.finish_time &lt;= #{finishTime}</if>
             <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat('%', #{entranceId}, '%')</if>
             <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
             <if test="classId != null  and classId != ''"> and mj.class_id like concat('%', #{classId}, '%')</if>
@@ -150,6 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
             <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and  mjd.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+
             order by mj.create_time desc
         </where>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index d3dcf38..3c2a8f1 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -104,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
             <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and  mjd.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
         </where>
         order by mj.create_time desc
     </select>
@@ -274,9 +275,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="allotInJobSpace" parameterType="java.util.Map"  statementType="CALLABLE">
         {call proc_allot_space(
                 #{v_tray_code,jdbcType=VARCHAR,mode=IN},
+                #{v_code,jdbcType=VARCHAR,mode=IN},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}
     </select>
+
+    <select id="updateLed" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_update_led(
+                #{v_code,jdbcType=VARCHAR,mode=IN},
+                #{v_task_no,jdbcType=VARCHAR,mode=IN},
+                #{v_result,jdbcType=VARCHAR,mode=OUT}
+              )}
+    </select>
+    <select id="updateLedError" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_update_led_error(
+                #{v_code,jdbcType=VARCHAR,mode=IN},
+                #{v_error_code,jdbcType=VARCHAR,mode=IN},
+                #{v_result,jdbcType=VARCHAR,mode=OUT}
+              )}
+    </select>
+
+
+
+
+
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml
deleted file mode 100644
index d77df5c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.device.agv.mapper.AgvContainerTaskMapper">
-
-    <resultMap type="AgvContainerTask" id="AgvContainerTaskResult">
-        <result property="id"    column="id"    />
-        <result property="container"    column="container"    />
-        <result property="startPoint"    column="start_point"    />
-        <result property="endPoint"    column="end_point"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="taskNo"    column="task_no"    />
-        <result property="status"    column="status"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-    </resultMap>
-
-    <sql id="selectAgvContainerTaskVo">
-        select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
-    </sql>
-
-    <select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
-        <include refid="selectAgvContainerTaskVo"/>
-        <where>
-            <if test="container != null  and container != ''"> and container like concat("%", #{container}, "%")</if>
-            <if test="startPoint != null  and startPoint != ''"> and start_point like concat("%", #{startPoint}, "%")</if>
-            <if test="endPoint != null  and endPoint != ''"> and end_point like concat("%", #{endPoint}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no like concat("%", #{taskNo}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectAgvContainerTaskById" parameterType="Long" resultMap="AgvContainerTaskResult">
-        <include refid="selectAgvContainerTaskVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertAgvContainerTask" parameterType="AgvContainerTask" useGeneratedKeys="true" keyProperty="id">
-        insert into agv_container_task
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="container != null">container,</if>
-            <if test="startPoint != null">start_point,</if>
-            <if test="endPoint != null">end_point,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="taskNo != null">task_no,</if>
-            <if test="status != null">status,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="container != null">#{container},</if>
-            <if test="startPoint != null">#{startPoint},</if>
-            <if test="endPoint != null">#{endPoint},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="taskNo != null">#{taskNo},</if>
-            <if test="status != null">#{status},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-         </trim>
-    </insert>
-    <insert id="insertHistory">
-        insert into agv_container_task_finish
-        select * from agv_container_task where id = #{id}
-    </insert>
-
-    <update id="updateAgvContainerTask" parameterType="AgvContainerTask">
-        update agv_container_task
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="container != null">container = #{container},</if>
-            <if test="startPoint != null">start_point = #{startPoint},</if>
-            <if test="endPoint != null">end_point = #{endPoint},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="taskNo != null">task_no = #{taskNo},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAgvContainerTaskById" parameterType="Long">
-        delete from agv_container_task where id = #{id}
-    </delete>
-
-    <delete id="deleteAgvContainerTaskByIds" parameterType="String">
-        delete from agv_container_task where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml
deleted file mode 100644
index 60d0853..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ai.message.mapper.ChatMessageMapper">
-
-    <resultMap type="ChatMessage" id="ChatMessageResult">
-        <result property="id"    column="id"    />
-        <result property="sessionId"    column="session_id"    />
-        <result property="conversationId"    column="conversation_id"    />
-        <result property="content"    column="content"    />
-        <result property="role"    column="role"    />
-        <result property="deductCost"    column="deduct_cost"    />
-        <result property="totalTokens"    column="total_tokens"    />
-        <result property="modelName"    column="model_name"    />
-        <result property="createDept"    column="create_dept"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectChatMessageVo">
-        select id, session_id, conversation_id, content, role, deduct_cost, total_tokens, model_name, create_dept, create_by, create_time, update_by, update_time, remark from chat_message
-    </sql>
-
-    <select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
-        <include refid="selectChatMessageVo"/>
-        <where>
-            <if test="sessionId != null "> and session_id like concat("%", #{sessionId}, "%")</if>
-            <if test="conversationId != null "> and conversation_id like concat("%", #{conversationId}, "%")</if>
-            <if test="content != null  and content != ''"> and content like concat("%", #{content}, "%")</if>
-            <if test="role != null  and role != ''"> and role like concat("%", #{role}, "%")</if>
-            <if test="deductCost != null "> and deduct_cost like concat("%", #{deductCost}, "%")</if>
-            <if test="totalTokens != null "> and total_tokens like concat("%", #{totalTokens}, "%")</if>
-            <if test="modelName != null  and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
-            <if test="createDept != null "> and create_dept like concat("%", #{createDept}, "%")</if>
-        </where>
-        order by create_time asc
-    </select>
-
-    <select id="selectChatMessageById" parameterType="Long" resultMap="ChatMessageResult">
-        <include refid="selectChatMessageVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertChatMessage" parameterType="ChatMessage">
-        insert into chat_message
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="sessionId != null">session_id,</if>
-            <if test="conversationId != null">conversation_id,</if>
-            <if test="content != null">content,</if>
-            <if test="role != null">role,</if>
-            <if test="deductCost != null">deduct_cost,</if>
-            <if test="totalTokens != null">total_tokens,</if>
-            <if test="modelName != null">model_name,</if>
-            <if test="createDept != null">create_dept,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="sessionId != null">#{sessionId},</if>
-            <if test="conversationId != null">#{conversationId},</if>
-            <if test="content != null">#{content},</if>
-            <if test="role != null">#{role},</if>
-            <if test="deductCost != null">#{deductCost},</if>
-            <if test="totalTokens != null">#{totalTokens},</if>
-            <if test="modelName != null">#{modelName},</if>
-            <if test="createDept != null">#{createDept},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateChatMessage" parameterType="ChatMessage">
-        update chat_message
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="sessionId != null">session_id = #{sessionId},</if>
-            <if test="conversationId != null">conversation_id = #{conversationId},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="role != null">role = #{role},</if>
-            <if test="deductCost != null">deduct_cost = #{deductCost},</if>
-            <if test="totalTokens != null">total_tokens = #{totalTokens},</if>
-            <if test="modelName != null">model_name = #{modelName},</if>
-            <if test="createDept != null">create_dept = #{createDept},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteChatMessageById" parameterType="Long">
-        delete from chat_message where id = #{id}
-    </delete>
-
-    <delete id="deleteChatMessageByIds" parameterType="String">
-        delete from chat_message where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    <delete id="deleteChatMessageByConversationId">
-        delete from chat_message where conversation_id = #{conversationId}
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml
deleted file mode 100644
index aedf6cb..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ai.conversation.mapper.ConversationsMapper">
-
-    <resultMap type="Conversations" id="ConversationsResult">
-        <result property="id"    column="id"    />
-        <result property="sessionId"    column="session_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="title"    column="title"    />
-        <result property="status"    column="status"    />
-        <result property="metadata"    column="metadata"    />
-        <result property="firstQuery"    column="first_query"    />
-        <result property="messageCount"    column="message_count"    />
-        <result property="tokenUsage"    column="token_usage"    />
-        <result property="createdAt"    column="created_at"    />
-        <result property="updatedAt"    column="updated_at"    />
-        <result property="lastInteractionAt"    column="last_interaction_at"    />
-    </resultMap>
-
-    <sql id="selectConversationsVo">
-        select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations
-    </sql>
-
-    <select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
-        <include refid="selectConversationsVo"/>
-        <where>
-            <if test="sessionId != null  and sessionId != ''"> and session_id like concat("%", #{sessionId}, "%")</if>
-            <if test="userId != null  and userId != ''"> and user_id like concat("%", #{userId}, "%")</if>
-            <if test="title != null  and title != ''"> and title like concat("%", #{title}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="metadata != null  and metadata != ''"> and metadata like concat("%", #{metadata}, "%")</if>
-            <if test="firstQuery != null  and firstQuery != ''"> and first_query like concat("%", #{firstQuery}, "%")</if>
-            <if test="messageCount != null "> and message_count like concat("%", #{messageCount}, "%")</if>
-            <if test="tokenUsage != null "> and token_usage like concat("%", #{tokenUsage}, "%")</if>
-            <if test="createdAt != null "> and created_at like concat("%", #{createdAt}, "%")</if>
-            <if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
-            <if test="lastInteractionAt != null "> and last_interaction_at like concat("%", #{lastInteractionAt}, "%")</if>
-             order by id desc
-        </where>
-    </select>
-
-    <select id="selectConversationsById" parameterType="Long" resultMap="ConversationsResult">
-        <include refid="selectConversationsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertConversations" parameterType="Conversations" useGeneratedKeys="true" keyProperty="id">
-        insert into conversations
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="sessionId != null and sessionId != ''">session_id,</if>
-            <if test="userId != null and userId != ''">user_id,</if>
-            <if test="title != null">title,</if>
-            <if test="status != null">status,</if>
-            <if test="metadata != null">metadata,</if>
-            <if test="firstQuery != null">first_query,</if>
-            <if test="messageCount != null">message_count,</if>
-            <if test="tokenUsage != null">token_usage,</if>
-            <if test="createdAt != null">created_at,</if>
-            <if test="updatedAt != null">updated_at,</if>
-            <if test="lastInteractionAt != null">last_interaction_at,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="sessionId != null and sessionId != ''">#{sessionId},</if>
-            <if test="userId != null and userId != ''">#{userId},</if>
-            <if test="title != null">#{title},</if>
-            <if test="status != null">#{status},</if>
-            <if test="metadata != null">#{metadata},</if>
-            <if test="firstQuery != null">#{firstQuery},</if>
-            <if test="messageCount != null">#{messageCount},</if>
-            <if test="tokenUsage != null">#{tokenUsage},</if>
-            <if test="createdAt != null">#{createdAt},</if>
-            <if test="updatedAt != null">#{updatedAt},</if>
-            <if test="lastInteractionAt != null">#{lastInteractionAt},</if>
-         </trim>
-    </insert>
-
-    <update id="updateConversations" parameterType="Conversations">
-        update conversations
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="sessionId != null and sessionId != ''">session_id = #{sessionId},</if>
-            <if test="userId != null and userId != ''">user_id = #{userId},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="metadata != null">metadata = #{metadata},</if>
-            <if test="firstQuery != null">first_query = #{firstQuery},</if>
-            <if test="messageCount != null">message_count = #{messageCount},</if>
-            <if test="tokenUsage != null">token_usage = #{tokenUsage},</if>
-            <if test="createdAt != null">created_at = #{createdAt},</if>
-            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
-            <if test="lastInteractionAt != null">last_interaction_at = #{lastInteractionAt},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteConversationsById" parameterType="Long">
-        delete from conversations where id = #{id}
-    </delete>
-
-    <delete id="deleteConversationsByIds" parameterType="String">
-        delete from conversations where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml
deleted file mode 100644
index ed4264c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.api.mapper.JobStatisticsMapper">
-
-    <!-- 查询当日入库数量 -->
-    <select id="selectDailyInCount" parameterType="String" resultType="Integer">
-        SELECT COUNT(1)
-        FROM mydo_job_finish
-        WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
-        AND in_or_out &lt; 20
-    </select>
-
-    <!-- 查询当日出库数量 -->
-    <select id="selectDailyOutCount" parameterType="String" resultType="Integer">
-        SELECT COUNT(1)
-        FROM mydo_job_finish
-        WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
-        AND in_or_out >= 20
-    </select>
-
-    <!-- 查询当月每日入库出库统计 -->
-    <select id="selectMonthlyStatistics" resultType="java.util.Map">
-        SELECT 
-            DAY(create_time) as date,
-            SUM(CASE WHEN in_or_out &lt; 20 THEN 1 ELSE 0 END) as '入库',
-            SUM(CASE WHEN in_or_out >= 20 THEN 1 ELSE 0 END) as '出库'
-        FROM mydo_job_finish
-        WHERE YEAR(create_time) = #{year}
-        AND MONTH(create_time) = #{month}
-        GROUP BY DAY(create_time)
-          ORDER BY date
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml
deleted file mode 100644
index 1e2fa32..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ai.vector.mapper.KnowledgeFileMapper">
-    
-    <resultMap type="KnowledgeFile" id="KnowledgeFileResult">
-        <result property="id"    column="id"    />
-        <result property="knowledgeBaseId"    column="knowledge_base_id"    />
-        <result property="fileName"    column="file_name"    />
-        <result property="filePath"    column="file_path"    />
-        <result property="fileSize"    column="file_size"    />
-        <result property="fileType"    column="file_type"    />
-        <result property="description"    column="description"    />
-        <result property="isVectorized"    column="is_vectorized"    />
-        <result property="vectorizedTime"    column="vectorized_time"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="updatedAt"    column="updated_at"    />
-        <result property="isDeleted"    column="is_deleted"    />
-    </resultMap>
-
-    <sql id="selectKnowledgeFileVo">
-        select id, knowledge_base_id, file_name, file_path, file_size, file_type, description, is_vectorized, vectorized_time, upload_time, updated_at, is_deleted from knowledge_file
-    </sql>
-
-    <select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
-        <include refid="selectKnowledgeFileVo"/>
-        <where>  
-            <if test="knowledgeBaseId != null "> and knowledge_base_id like concat("%", #{knowledgeBaseId}, "%")</if>
-            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
-            <if test="filePath != null  and filePath != ''"> and file_path like concat("%", #{filePath}, "%")</if>
-            <if test="fileSize != null "> and file_size like concat("%", #{fileSize}, "%")</if>
-            <if test="fileType != null  and fileType != ''"> and file_type like concat("%", #{fileType}, "%")</if>
-            <if test="description != null  and description != ''"> and description like concat("%", #{description}, "%")</if>
-            <if test="isVectorized != null "> and is_vectorized like concat("%", #{isVectorized}, "%")</if>
-            <if test="vectorizedTime != null "> and vectorized_time like concat("%", #{vectorizedTime}, "%")</if>
-            <if test="uploadTime != null "> and upload_time like concat("%", #{uploadTime}, "%")</if>
-            <if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
-            <if test="isDeleted != null "> and is_deleted like concat("%", #{isDeleted}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectKnowledgeFileById" parameterType="Long" resultMap="KnowledgeFileResult">
-        <include refid="selectKnowledgeFileVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertKnowledgeFile" parameterType="KnowledgeFile" useGeneratedKeys="true" keyProperty="id">
-        insert into knowledge_file
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="knowledgeBaseId != null">knowledge_base_id,</if>
-            <if test="fileName != null and fileName != ''">file_name,</if>
-            <if test="filePath != null and filePath != ''">file_path,</if>
-            <if test="fileSize != null">file_size,</if>
-            <if test="fileType != null">file_type,</if>
-            <if test="description != null">description,</if>
-            <if test="isVectorized != null">is_vectorized,</if>
-            <if test="vectorizedTime != null">vectorized_time,</if>
-            <if test="uploadTime != null">upload_time,</if>
-            <if test="updatedAt != null">updated_at,</if>
-            <if test="isDeleted != null">is_deleted,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="knowledgeBaseId != null">#{knowledgeBaseId},</if>
-            <if test="fileName != null and fileName != ''">#{fileName},</if>
-            <if test="filePath != null and filePath != ''">#{filePath},</if>
-            <if test="fileSize != null">#{fileSize},</if>
-            <if test="fileType != null">#{fileType},</if>
-            <if test="description != null">#{description},</if>
-            <if test="isVectorized != null">#{isVectorized},</if>
-            <if test="vectorizedTime != null">#{vectorizedTime},</if>
-            <if test="uploadTime != null">#{uploadTime},</if>
-            <if test="updatedAt != null">#{updatedAt},</if>
-            <if test="isDeleted != null">#{isDeleted},</if>
-         </trim>
-    </insert>
-
-    <update id="updateKnowledgeFile" parameterType="KnowledgeFile">
-        update knowledge_file
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="knowledgeBaseId != null">knowledge_base_id = #{knowledgeBaseId},</if>
-            <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
-            <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
-            <if test="fileSize != null">file_size = #{fileSize},</if>
-            <if test="fileType != null">file_type = #{fileType},</if>
-            <if test="description != null">description = #{description},</if>
-            <if test="isVectorized != null">is_vectorized = #{isVectorized},</if>
-            <if test="vectorizedTime != null">vectorized_time = #{vectorizedTime},</if>
-            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
-            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
-            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteKnowledgeFileById" parameterType="Long">
-        delete from knowledge_file where id = #{id}
-    </delete>
-
-    <delete id="deleteKnowledgeFileByIds" parameterType="String">
-        delete from knowledge_file where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml
deleted file mode 100644
index 16d85c4..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.api.moveMsg.mapper.MoveMsgMapper">
-    
-    <resultMap type="MoveMsg" id="MoveMsgResult">
-        <result property="id"    column="id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="oldSpace"    column="old_space"    />
-        <result property="newSpace"    column="new_space"    />
-        <result property="status"    column="status"    />
-        <result property="sendTime"    column="send_time"    />
-        <result property="msg"    column="msg"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-    </resultMap>
-
-    <sql id="selectMoveMsgVo">
-        select id, tray_code, old_space, new_space, status, send_time, msg, spare1, spare2, spare3, spare4, spare5 from move_msg
-    </sql>
-
-    <select id="selectMoveMsgList" parameterType="MoveMsg" resultMap="MoveMsgResult">
-        <include refid="selectMoveMsgVo"/>
-        <where>  
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="oldSpace != null  and oldSpace != ''"> and old_space like concat("%", #{oldSpace}, "%")</if>
-            <if test="newSpace != null  and newSpace != ''"> and new_space like concat("%", #{newSpace}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
-            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectMoveMsgById" parameterType="String" resultMap="MoveMsgResult">
-        <include refid="selectMoveMsgVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertMoveMsg" parameterType="MoveMsg">
-        insert into move_msg
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="oldSpace != null">old_space,</if>
-            <if test="newSpace != null">new_space,</if>
-            <if test="status != null">status,</if>
-            <if test="sendTime != null">send_time,</if>
-            <if test="msg != null">msg,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="oldSpace != null">#{oldSpace},</if>
-            <if test="newSpace != null">#{newSpace},</if>
-            <if test="status != null">#{status},</if>
-            <if test="sendTime != null">#{sendTime},</if>
-            <if test="msg != null">#{msg},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-         </trim>
-    </insert>
-
-    <update id="updateMoveMsg" parameterType="MoveMsg">
-        update move_msg
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="oldSpace != null">old_space = #{oldSpace},</if>
-            <if test="newSpace != null">new_space = #{newSpace},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="sendTime != null">send_time = #{sendTime},</if>
-            <if test="msg != null">msg = #{msg},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteMoveMsgById" parameterType="String">
-        delete from move_msg where id = #{id}
-    </delete>
-
-    <delete id="deleteMoveMsgByIds" parameterType="String">
-        delete from move_msg where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml
deleted file mode 100644
index 14345c0..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.containerDetails.mapper.BasContainerDetailsMapper">
-    
-    <resultMap type="BasContainerDetails" id="BasContainerDetailsResult">
-        <result property="id"    column="id"    />
-        <result property="containerId"    column="container_id"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="unit"    column="unit"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectBasContainerDetailsVo">
-        select id, container_id, product_id, product_name, quantity, unit, spare1, spare2, spare3 from bas_container_details
-    </sql>
-
-    <select id="selectBasContainerDetailsList" parameterType="BasContainerDetails" resultMap="BasContainerDetailsResult">
-        <include refid="selectBasContainerDetailsVo"/>
-        <where>  
-            <if test="containerId != null  and containerId != ''"> and container_id like concat("%", #{containerId}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasContainerDetailsById" parameterType="Long" resultMap="BasContainerDetailsResult">
-        <include refid="selectBasContainerDetailsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasContainerDetails" parameterType="BasContainerDetails">
-        insert into bas_container_details
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="containerId != null">container_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="containerId != null">#{containerId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasContainerDetails" parameterType="BasContainerDetails">
-        update bas_container_details
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="containerId != null">container_id = #{containerId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasContainerDetailsById" parameterType="Long">
-        delete from bas_container_details where id = #{id}
-    </delete>
-
-    <delete id="deleteBasContainerDetailsByIds" parameterType="String">
-        delete from bas_container_details where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml
deleted file mode 100644
index 5eb173b..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.container.mapper.BasContainerMapper">
-    
-    <resultMap type="BasContainer" id="BasContainerResult">
-        <result property="containerId"    column="container_id"    />
-        <result property="portName"    column="port_name"    />
-        <result property="status"    column="status"    />
-        <result property="productTypeQuantity"    column="product_type_quantity"    />
-        <result property="capacity"    column="capacity"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="operationMan"    column="operation_man"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectBasContainerVo">
-        select container_id, port_name, status, product_type_quantity, capacity, create_time, update_time, operation_man, spare1, spare2, spare3 from bas_container
-    </sql>
-
-    <select id="selectBasContainerList" parameterType="BasContainer" resultMap="BasContainerResult">
-        <include refid="selectBasContainerVo"/>
-        <where>  
-            <if test="containerId != null  and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
-            <if test="portName != null  and portName != ''"> and port_name like concat("%", #{portName}, "%")</if>
-            <if test="status != null "> and status like concat("%", #{status}, "%")</if>
-            <if test="productTypeQuantity != null "> and product_type_quantity like concat("%", #{productTypeQuantity}, "%")</if>
-            <if test="updateTime != null  and updateTime != ''"> and update_time like concat("%", #{updateTime}, "%")</if>
-            <if test="operationMan != null  and operationMan != ''"> and operation_man like concat("%", #{operationMan}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasContainerByContainerId" parameterType="String" resultMap="BasContainerResult">
-        <include refid="selectBasContainerVo"/>
-        where container_id = #{containerId}
-    </select>
-
-    <insert id="insertBasContainer" parameterType="BasContainer">
-        insert into bas_container
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="containerId != null">container_id,</if>
-            <if test="portName != null">port_name,</if>
-            <if test="status != null">status,</if>
-            <if test="productTypeQuantity != null">product_type_quantity,</if>
-            <if test="capacity != null">capacity,</if>
-            <if test="createTime != null">create_time,</if>
-<!--            <if test="updateTime != null">update_time,</if>-->
-            update_time,
-            <if test="operationMan != null">operation_man,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="containerId != null">#{containerId},</if>
-            <if test="portName != null">#{portName},</if>
-            <if test="status != null">#{status},</if>
-            <if test="productTypeQuantity != null">#{productTypeQuantity},</if>
-            <if test="capacity != null">#{capacity},</if>
-            <if test="createTime != null">#{createTime},</if>
-<!--            <if test="updateTime != null">#{updateTime},</if>-->
-            GETDATE(),
-            <if test="operationMan != null">#{operationMan},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasContainer" parameterType="BasContainer">
-        update bas_container
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="portName != null">port_name = #{portName},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="productTypeQuantity != null">product_type_quantity = #{productTypeQuantity},</if>
-            <if test="capacity != null">capacity = #{capacity},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = GETDATE(),</if>
-            <if test="operationMan != null">operation_man = #{operationMan},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where container_id = #{containerId}
-    </update>
-
-    <delete id="deleteBasContainerByContainerId" parameterType="String">
-        delete from bas_container where container_id = #{containerId}
-    </delete>
-
-    <delete id="deleteBasContainerByContainerIds" parameterType="String">
-        delete from bas_container where container_id in 
-        <foreach item="containerId" collection="array" open="(" separator="," close=")">
-            #{containerId}
-        </foreach>
-    </delete>
-
-    <select id="selectPortNames" resultType="string">
-        SELECT DISTINCT port_name FROM bas_product_port WHERE port_name != null or port_name != ''
-    </select>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml
deleted file mode 100644
index fb0f468..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper">
-    
-    <resultMap type="BasCustomer" id="BasCustomerResult">
-        <result property="id"    column="id"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="customerGroupNo"    column="customer_group_no"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="simpleName"    column="simple_name"    />
-        <result property="useable"    column="useable"    />
-        <result property="remark"    column="remark"    />
-        <result property="businessDepartment"    column="business_department"    />
-        <result property="salesman"    column="salesman"    />
-        <result property="mnemonicCode"    column="mnemonic_code"    />
-        <result property="type"    column="type"    />
-        <result property="taxpayerRegistrationNumber"    column="taxpayer_registration_number"    />
-        <result property="organization"    column="organization"    />
-        <result property="supCustomer"    column="sup_customer"    />
-        <result property="retailInvestor"    column="retail_investor"    />
-        <result property="country"    column="country"    />
-        <result property="timeZone"    column="time_zone"    />
-        <result property="dataFormat"    column="data_format"    />
-        <result property="contactName"    column="contact_name"    />
-        <result property="shipment"    column="shipment"    />
-        <result property="taxCategory"    column="tax_category"    />
-    </resultMap>
-
-    <sql id="selectBasCustomerVo">
-        select id, customer_no, customer_group_no, customer_name, simple_name, useable, remark, business_department, salesman, mnemonic_code, type, taxpayer_registration_number, organization, sup_customer, retail_investor, country, time_zone, data_format, contact_name, shipment, tax_category from bas_customer
-    </sql>
-
-    <select id="selectBasCustomerList" parameterType="BasCustomer" resultMap="BasCustomerResult">
-        <include refid="selectBasCustomerVo"/>
-        <where>  
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
-            <if test="customerGroupNo != null  and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="simpleName != null  and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
-            <if test="useable != null  and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
-            <if test="businessDepartment != null  and businessDepartment != ''"> and business_department like concat('%', #{businessDepartment}, '%')</if>
-            <if test="salesman != null  and salesman != ''"> and salesman like concat('%', #{salesman}, '%')</if>
-            <if test="mnemonicCode != null  and mnemonicCode != ''"> and mnemonic_code like concat('%', #{mnemonicCode}, '%')</if>
-            <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
-            <if test="taxpayerRegistrationNumber != null  and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
-            <if test="organization != null  and organization != ''"> and organization like concat('%', #{organization}, '%')</if>
-            <if test="supCustomer != null  and supCustomer != ''"> and sup_customer like concat('%', #{supCustomer}, '%')</if>
-            <if test="retailInvestor != null  and retailInvestor != ''"> and retail_investor like concat('%', #{retailInvestor}, '%')</if>
-            <if test="country != null  and country != ''"> and country like concat('%', #{country}, '%')</if>
-            <if test="timeZone != null  and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
-            <if test="dataFormat != null  and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
-            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
-            <if test="shipment != null  and shipment != ''"> and shipment like concat('%', #{shipment}, '%')</if>
-            <if test="taxCategory != null  and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectBasCustomerById" parameterType="String" resultMap="BasCustomerResult">
-        <include refid="selectBasCustomerVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasCustomer" parameterType="BasCustomer">
-        insert into bas_customer
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
-            <if test="customerNo != null and customerNo != ''">customer_no,</if>
-            <if test="customerGroupNo != null">customer_group_no,</if>
-            <if test="customerName != null">customer_name,</if>
-            <if test="simpleName != null">simple_name,</if>
-            <if test="useable != null">useable,</if>
-            <if test="remark != null">remark,</if>
-            <if test="businessDepartment != null">business_department,</if>
-            <if test="salesman != null">salesman,</if>
-            <if test="mnemonicCode != null">mnemonic_code,</if>
-            <if test="type != null">type,</if>
-            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
-            <if test="organization != null">organization,</if>
-            <if test="supCustomer != null">sup_customer,</if>
-            <if test="retailInvestor != null">retail_investor,</if>
-            <if test="country != null">country,</if>
-            <if test="timeZone != null">time_zone,</if>
-            <if test="dataFormat != null">data_format,</if>
-            <if test="contactName != null">contact_name,</if>
-            <if test="shipment != null">shipment,</if>
-            <if test="taxCategory != null">tax_category,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
-            <if test="customerNo != null and customerNo != ''">#{customerNo},</if>
-            <if test="customerGroupNo != null">#{customerGroupNo},</if>
-            <if test="customerName != null">#{customerName},</if>
-            <if test="simpleName != null">#{simpleName},</if>
-            <if test="useable != null">#{useable},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="businessDepartment != null">#{businessDepartment},</if>
-            <if test="salesman != null">#{salesman},</if>
-            <if test="mnemonicCode != null">#{mnemonicCode},</if>
-            <if test="type != null">#{type},</if>
-            <if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
-            <if test="organization != null">#{organization},</if>
-            <if test="supCustomer != null">#{supCustomer},</if>
-            <if test="retailInvestor != null">#{retailInvestor},</if>
-            <if test="country != null">#{country},</if>
-            <if test="timeZone != null">#{timeZone},</if>
-            <if test="dataFormat != null">#{dataFormat},</if>
-            <if test="contactName != null">#{contactName},</if>
-            <if test="shipment != null">#{shipment},</if>
-            <if test="taxCategory != null">#{taxCategory},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasCustomer" parameterType="BasCustomer">
-        update bas_customer
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="customerNo != null and customerNo != ''">customer_no = #{customerNo},</if>
-            <if test="customerGroupNo != null">customer_group_no = #{customerGroupNo},</if>
-            <if test="customerName != null">customer_name = #{customerName},</if>
-            <if test="simpleName != null">simple_name = #{simpleName},</if>
-            <if test="useable != null">useable = #{useable},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="businessDepartment != null">business_department = #{businessDepartment},</if>
-            <if test="salesman != null">salesman = #{salesman},</if>
-            <if test="mnemonicCode != null">mnemonic_code = #{mnemonicCode},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
-            <if test="organization != null">organization = #{organization},</if>
-            <if test="supCustomer != null">sup_customer = #{supCustomer},</if>
-            <if test="retailInvestor != null">retail_investor = #{retailInvestor},</if>
-            <if test="country != null">country = #{country},</if>
-            <if test="timeZone != null">time_zone = #{timeZone},</if>
-            <if test="dataFormat != null">data_format = #{dataFormat},</if>
-            <if test="contactName != null">contact_name = #{contactName},</if>
-            <if test="shipment != null">shipment = #{shipment},</if>
-            <if test="taxCategory != null">tax_category = #{taxCategory},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasCustomerById" parameterType="String">
-        delete from bas_customer where id = #{id}
-    </delete>
-
-    <delete id="deleteBasCustomerByIds" parameterType="String">
-        delete from bas_customer where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml
deleted file mode 100644
index 66c83fd..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.basJobId.mapper.BasJobIdMapper">
-
-    <resultMap type="BasJobId" id="BasJobIdResult">
-        <result property="id"    column="id"    />
-        <result property="type"    column="type"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="jobDetail"    column="job_detail"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="exorderId"    column="Exorder_id"    />
-        <result property="jobIdR"    column="job_id_R"    />
-        <result property="jobDetailR"    column="job_detail_R"    />
-        <result property="jobIdC"    column="job_id_C"    />
-        <result property="jobDetailC"    column="job_detail_C"    />
-        <result property="tempOrderId"    column="temp_order_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="planId"    column="plan_id"    />
-        <result property="jobIdY"    column="job_id_y"    />
-        <result property="jobIdS"    column="job_id_s"    />
-    </resultMap>
-
-    <sql id="selectBasJobIdVo">
-        select id, type, job_id, job_detail, stock_id, order_id, Exorder_id, job_id_R, job_detail_R, job_id_C, job_detail_C, temp_order_id, lot_no, stockin_id, stockin_detail_id, stockout_id, stockout_detail_id, plan_id, job_id_y, job_id_s from bas_job_id
-    </sql>
-
-    <select id="selectBasJobIdList" parameterType="BasJobId" resultMap="BasJobIdResult">
-        <include refid="selectBasJobIdVo"/>
-        <where>
-            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
-            <if test="jobDetail != null  and jobDetail != ''"> and job_detail like concat("%", #{jobDetail}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
-            <if test="exorderId != null  and exorderId != ''"> and Exorder_id like concat("%", #{exorderId}, "%")</if>
-            <if test="jobIdR != null  and jobIdR != ''"> and job_id_R like concat("%", #{jobIdR}, "%")</if>
-            <if test="jobDetailR != null  and jobDetailR != ''"> and job_detail_R like concat("%", #{jobDetailR}, "%")</if>
-            <if test="jobIdC != null  and jobIdC != ''"> and job_id_C like concat("%", #{jobIdC}, "%")</if>
-            <if test="jobDetailC != null  and jobDetailC != ''"> and job_detail_C like concat("%", #{jobDetailC}, "%")</if>
-            <if test="tempOrderId != null  and tempOrderId != ''"> and temp_order_id like concat("%", #{tempOrderId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
-            <if test="planId != null  and planId != ''"> and plan_id like concat("%", #{planId}, "%")</if>
-            <if test="jobIdY != null  and jobIdY != ''"> and job_id_y like concat("%", #{jobIdY}, "%")</if>
-            <if test="jobIdS != null  and jobIdS != ''"> and job_id_s like concat("%", #{jobIdS}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectBasJobIdById" parameterType="String" resultMap="BasJobIdResult">
-        <include refid="selectBasJobIdVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasJobId" parameterType="BasJobId">
-        insert into bas_job_id
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="type != null">type,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="jobDetail != null">job_detail,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="exorderId != null">Exorder_id,</if>
-            <if test="jobIdR != null">job_id_R,</if>
-            <if test="jobDetailR != null">job_detail_R,</if>
-            <if test="jobIdC != null">job_id_C,</if>
-            <if test="jobDetailC != null">job_detail_C,</if>
-            <if test="tempOrderId != null">temp_order_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockoutId != null">stockout_id,</if>
-            <if test="stockoutDetailId != null">stockout_detail_id,</if>
-            <if test="planId != null">plan_id,</if>
-            <if test="jobIdY != null">job_id_y,</if>
-            <if test="jobIdS != null">job_id_s,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="type != null">#{type},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="jobDetail != null">#{jobDetail},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="exorderId != null">#{exorderId},</if>
-            <if test="jobIdR != null">#{jobIdR},</if>
-            <if test="jobDetailR != null">#{jobDetailR},</if>
-            <if test="jobIdC != null">#{jobIdC},</if>
-            <if test="jobDetailC != null">#{jobDetailC},</if>
-            <if test="tempOrderId != null">#{tempOrderId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockoutId != null">#{stockoutId},</if>
-            <if test="stockoutDetailId != null">#{stockoutDetailId},</if>
-            <if test="planId != null">#{planId},</if>
-            <if test="jobIdY != null">#{jobIdY},</if>
-            <if test="jobIdS != null">#{jobIdS},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasJobId" parameterType="BasJobId">
-        update bas_job_id
-        <trim prefix="SET" suffixOverrides=",">
-
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="jobDetail != null">job_detail = #{jobDetail},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="exorderId != null">Exorder_id = #{exorderId},</if>
-            <if test="jobIdR != null">job_id_R = #{jobIdR},</if>
-            <if test="jobDetailR != null">job_detail_R = #{jobDetailR},</if>
-            <if test="jobIdC != null">job_id_C = #{jobIdC},</if>
-            <if test="jobDetailC != null">job_detail_C = #{jobDetailC},</if>
-            <if test="tempOrderId != null">temp_order_id = #{tempOrderId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
-            <if test="stockoutDetailId != null">stockout_detail_id = #{stockoutDetailId},</if>
-            <if test="planId != null">plan_id = #{planId},</if>
-            <if test="jobIdY != null">job_id_y = #{jobIdY},</if>
-            <if test="jobIdS != null">job_id_s = #{jobIdS},</if>
-        </trim>
-        where type = #{type}
-    </update>
-
-    <delete id="deleteBasJobIdById" parameterType="String">
-        delete from bas_job_id where id = #{id}
-    </delete>
-
-    <delete id="deleteBasJobIdByIds" parameterType="String">
-        delete from bas_job_id where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="getoutStockIdByDate" parameterType="String" resultType="Integer">
-        select count(*) from bas_job_id where type='CK' and job_id like CONCAT('%', #{date}, '%')
-    </select>
-
-
-
-
-    <select id="getIdByDate" parameterType="BasJobId" resultType="Integer">
-        select count(*) from bas_job_id where type = #{type} and stock_id like CONCAT('%', #{stockId}, '%')
-    </select>
-
-    <select id="getIdByType" resultType="String" parameterType="String">
-        select job_id from bas_job_id where type=#{type}
-    </select>
-
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml
deleted file mode 100644
index 8ca0ed2..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.BasProductCode.mapper.BasProductCodeMapper">
-    
-    <resultMap type="BasProductCode" id="BasProductCodeResult">
-        <result property="id"    column="id"    />
-        <result property="model"    column="model"    />
-        <result property="color"    column="color"    />
-        <result property="serial"    column="serial"    />
-        <result property="v"    column="v"    />
-        <result property="hz"    column="hz"    />
-        <result property="ph"    column="ph"    />
-        <result property="nW"    column="n_w"    />
-        <result property="gW"    column="g_w"    />
-        <result property="type"    column="type"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-    </resultMap>
-
-    <sql id="selectBasProductCodeVo">
-        select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3, create_time, spare4, spare5, spare6 from bas_product_code
-    </sql>
-
-    <select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
-        <include refid="selectBasProductCodeVo"/>
-        <where>  
-            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
-            <if test="color != null  and color != ''"> and color like concat('%', #{color}, '%')</if>
-            <if test="serial != null  and serial != ''"> and serial like concat('%', #{serial}, '%')</if>
-            <if test="v != null  and v != ''"> and v like concat('%', #{v}, '%')</if>
-            <if test="hz != null  and hz != ''"> and hz like concat('%', #{hz}, '%')</if>
-            <if test="ph != null  and ph != ''"> and ph like concat('%', #{ph}, '%')</if>
-            <if test="nW != null  and nW != ''"> and n_w like concat('%', #{nW}, '%')</if>
-            <if test="gW != null  and gW != ''"> and g_w like concat('%', #{gW}, '%')</if>
-            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasProductCodeById" parameterType="Long" resultMap="BasProductCodeResult">
-        <include refid="selectBasProductCodeVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasProductCode" parameterType="BasProductCode">
-        insert into bas_product_code
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="model != null and model != ''">model,</if>
-            <if test="color != null and color != ''">color,</if>
-            <if test="serial != null and serial != ''">serial,</if>
-            <if test="v != null and v != ''">v,</if>
-            <if test="hz != null and hz != ''">hz,</if>
-            <if test="ph != null and ph != ''">ph,</if>
-            <if test="nW != null and nW != ''">n_w,</if>
-            <if test="gW != null and gW != ''">g_w,</if>
-            <if test="type != null">type,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="model != null and model != ''">#{model},</if>
-            <if test="color != null and color != ''">#{color},</if>
-            <if test="serial != null and serial != ''">#{serial},</if>
-            <if test="v != null and v != ''">#{v},</if>
-            <if test="hz != null and hz != ''">#{hz},</if>
-            <if test="ph != null and ph != ''">#{ph},</if>
-            <if test="nW != null and nW != ''">#{nW},</if>
-            <if test="gW != null and gW != ''">#{gW},</if>
-            <if test="type != null">#{type},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasProductCode" parameterType="BasProductCode">
-        update bas_product_code
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="model != null and model != ''">model = #{model},</if>
-            <if test="color != null and color != ''">color = #{color},</if>
-            <if test="serial != null and serial != ''">serial = #{serial},</if>
-            <if test="v != null and v != ''">v = #{v},</if>
-            <if test="hz != null and hz != ''">hz = #{hz},</if>
-            <if test="ph != null and ph != ''">ph = #{ph},</if>
-            <if test="nW != null and nW != ''">n_w = #{nW},</if>
-            <if test="gW != null and gW != ''">g_w = #{gW},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasProductCodeById" parameterType="Long">
-        delete from bas_product_code where id = #{id}
-    </delete>
-
-    <delete id="deleteBasProductCodeByIds" parameterType="String">
-        delete from bas_product_code where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml
deleted file mode 100644
index 8c572db..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.BasProduct.mapper.BasProductMapper">
-    
-    <resultMap type="BasProduct" id="BasProductResult">
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spare10"    column="spare10"    />
-        <result property="spare11"    column="spare11"    />
-        <result property="spare12"    column="spare12"    />
-        <result property="spare13"    column="spare13"    />
-        <result property="spare14"    column="spare14"    />
-        <result property="spare15"    column="spare15"    />
-        <result property="spare16"    column="spare16"    />
-        <result property="spare17"    column="spare17"    />
-        <result property="spare18"    column="spare18"    />
-        <result property="spare19"    column="spare19"    />
-        <result property="spare20"    column="spare20"    />
-        <result property="spare21"    column="spare21"    />
-        <result property="spare22"    column="spare22"    />
-        <result property="spare23"    column="spare23"    />
-        <result property="spare24"    column="spare24"    />
-        <result property="spare25"    column="spare25"    />
-        <result property="spare26"    column="spare26"    />
-        <result property="spare27"    column="spare27"    />
-        <result property="spare28"    column="spare28"    />
-        <result property="spare29"    column="spare29"    />
-        <result property="spare30"    column="spare30"    />
-        <result property="spare31"    column="spare31"    />
-        <result property="spare32"    column="spare32"    />
-        <result property="spare33"    column="spare33"    />
-        <result property="spare34"    column="spare34"    />
-        <result property="spare35"    column="spare35"    />
-        <result property="spare36"    column="spare36"    />
-        <result property="spare37"    column="spare37"    />
-        <result property="spare38"    column="spare38"    />
-        <result property="spare39"    column="spare39"    />
-    </resultMap>
-
-    <sql id="selectBasProductVo">
-        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from bas_product
-    </sql>
-
-    <select id="selectBasProductList" parameterType="BasProduct" resultMap="BasProductResult">
-        <include refid="selectBasProductVo"/>
-        <where>  
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
-            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
-            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
-            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
-            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
-            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
-            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
-            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
-            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
-            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
-            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
-            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
-            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
-            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
-            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
-            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
-            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
-            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
-            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
-            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
-            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
-            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
-            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
-            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
-            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
-            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
-            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
-            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
-            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
-            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
-            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectBasProductByProductGuid" parameterType="String" resultMap="BasProductResult">
-        <include refid="selectBasProductVo"/>
-        where product_guid = #{productGuid}
-    </select>
-    <select id="selectBasProductByProductId" parameterType="String" resultMap="BasProductResult">
-        <include refid="selectBasProductVo"/>
-        where product_id = #{productId}
-    </select>
-    <insert id="insertBasProduct" parameterType="BasProduct">
-        insert into bas_product
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productName != null and productName != ''">product_name,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spare10 != null">spare10,</if>
-            <if test="spare11 != null">spare11,</if>
-            <if test="spare12 != null">spare12,</if>
-            <if test="spare13 != null">spare13,</if>
-            <if test="spare14 != null">spare14,</if>
-            <if test="spare15 != null">spare15,</if>
-            <if test="spare16 != null">spare16,</if>
-            <if test="spare17 != null">spare17,</if>
-            <if test="spare18 != null">spare18,</if>
-            <if test="spare19 != null">spare19,</if>
-            <if test="spare20 != null">spare20,</if>
-            <if test="spare21 != null">spare21,</if>
-            <if test="spare22 != null">spare22,</if>
-            <if test="spare23 != null">spare23,</if>
-            <if test="spare24 != null">spare24,</if>
-            <if test="spare25 != null">spare25,</if>
-            <if test="spare26 != null">spare26,</if>
-            <if test="spare27 != null">spare27,</if>
-            <if test="spare28 != null">spare28,</if>
-            <if test="spare29 != null">spare29,</if>
-            <if test="spare30 != null">spare30,</if>
-            <if test="spare31 != null">spare31,</if>
-            <if test="spare32 != null">spare32,</if>
-            <if test="spare33 != null">spare33,</if>
-            <if test="spare34 != null">spare34,</if>
-            <if test="spare35 != null">spare35,</if>
-            <if test="spare36 != null">spare36,</if>
-            <if test="spare37 != null">spare37,</if>
-            <if test="spare38 != null">spare38,</if>
-            <if test="spare39 != null">spare39,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productName != null and productName != ''">#{productName},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spare10 != null">#{spare10},</if>
-            <if test="spare11 != null">#{spare11},</if>
-            <if test="spare12 != null">#{spare12},</if>
-            <if test="spare13 != null">#{spare13},</if>
-            <if test="spare14 != null">#{spare14},</if>
-            <if test="spare15 != null">#{spare15},</if>
-            <if test="spare16 != null">#{spare16},</if>
-            <if test="spare17 != null">#{spare17},</if>
-            <if test="spare18 != null">#{spare18},</if>
-            <if test="spare19 != null">#{spare19},</if>
-            <if test="spare20 != null">#{spare20},</if>
-            <if test="spare21 != null">#{spare21},</if>
-            <if test="spare22 != null">#{spare22},</if>
-            <if test="spare23 != null">#{spare23},</if>
-            <if test="spare24 != null">#{spare24},</if>
-            <if test="spare25 != null">#{spare25},</if>
-            <if test="spare26 != null">#{spare26},</if>
-            <if test="spare27 != null">#{spare27},</if>
-            <if test="spare28 != null">#{spare28},</if>
-            <if test="spare29 != null">#{spare29},</if>
-            <if test="spare30 != null">#{spare30},</if>
-            <if test="spare31 != null">#{spare31},</if>
-            <if test="spare32 != null">#{spare32},</if>
-            <if test="spare33 != null">#{spare33},</if>
-            <if test="spare34 != null">#{spare34},</if>
-            <if test="spare35 != null">#{spare35},</if>
-            <if test="spare36 != null">#{spare36},</if>
-            <if test="spare37 != null">#{spare37},</if>
-            <if test="spare38 != null">#{spare38},</if>
-            <if test="spare39 != null">#{spare39},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasProduct" parameterType="BasProduct">
-        update bas_product
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productName != null and productName != ''">product_name = #{productName},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="spare10 != null">spare10 = #{spare10},</if>
-            <if test="spare11 != null">spare11 = #{spare11},</if>
-            <if test="spare12 != null">spare12 = #{spare12},</if>
-            <if test="spare13 != null">spare13 = #{spare13},</if>
-            <if test="spare14 != null">spare14 = #{spare14},</if>
-            <if test="spare15 != null">spare15 = #{spare15},</if>
-            <if test="spare16 != null">spare16 = #{spare16},</if>
-            <if test="spare17 != null">spare17 = #{spare17},</if>
-            <if test="spare18 != null">spare18 = #{spare18},</if>
-            <if test="spare19 != null">spare19 = #{spare19},</if>
-            <if test="spare20 != null">spare20 = #{spare20},</if>
-            <if test="spare21 != null">spare21 = #{spare21},</if>
-            <if test="spare22 != null">spare22 = #{spare22},</if>
-            <if test="spare23 != null">spare23 = #{spare23},</if>
-            <if test="spare24 != null">spare24 = #{spare24},</if>
-            <if test="spare25 != null">spare25 = #{spare25},</if>
-            <if test="spare26 != null">spare26 = #{spare26},</if>
-            <if test="spare27 != null">spare27 = #{spare27},</if>
-            <if test="spare28 != null">spare28 = #{spare28},</if>
-            <if test="spare29 != null">spare29 = #{spare29},</if>
-            <if test="spare30 != null">spare30 = #{spare30},</if>
-            <if test="spare31 != null">spare31 = #{spare31},</if>
-            <if test="spare32 != null">spare32 = #{spare32},</if>
-            <if test="spare33 != null">spare33 = #{spare33},</if>
-            <if test="spare34 != null">spare34 = #{spare34},</if>
-            <if test="spare35 != null">spare35 = #{spare35},</if>
-            <if test="spare36 != null">spare36 = #{spare36},</if>
-            <if test="spare37 != null">spare37 = #{spare37},</if>
-            <if test="spare38 != null">spare38 = #{spare38},</if>
-            <if test="spare39 != null">spare39 = #{spare39},</if>
-        </trim>
-        where product_guid = #{productGuid}
-    </update>
-
-    <delete id="deleteBasProductByProductGuid" parameterType="String">
-        delete from bas_product where product_guid = #{productGuid}
-    </delete>
-
-    <delete id="deleteBasProductByProductGuids" parameterType="String">
-        delete from bas_product where product_guid in 
-        <foreach item="productGuid" collection="array" open="(" separator="," close=")">
-            #{productGuid}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml
deleted file mode 100644
index 62ff058..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.port.mapper.BasProductPortMapper">
-    
-    <resultMap type="BasProductPort" id="BasProductPortResult">
-        <result property="id"    column="id"    />
-        <result property="portName"    column="port_name"    />
-        <result property="portType"    column="port_type"    />
-        <result property="portDesc"    column="port_desc"    />
-        <result property="createMan"    column="create_man"    />
-        <result property="createTime"    column="create_time"    />
-    </resultMap>
-
-    <sql id="selectBasProductPortVo">
-        select id, port_name, port_type, port_desc, create_man, create_time from bas_product_port
-    </sql>
-
-    <select id="selectBasProductPortList" parameterType="BasProductPort" resultMap="BasProductPortResult">
-        <include refid="selectBasProductPortVo"/>
-        <where>  
-            <if test="portName != null  and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
-            <if test="portType != null  and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
-            <if test="portDesc != null  and portDesc != ''"> and port_desc like concat("%", #{portDesc}, "%")</if>
-            <if test="createMan != null  and createMan != ''"> and create_man like concat("%", #{createMan}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasProductPortById" parameterType="String" resultMap="BasProductPortResult">
-        <include refid="selectBasProductPortVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasProductPort" parameterType="BasProductPort">
-        insert into bas_product_port
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="portName != null">port_name,</if>
-            <if test="portType != null">port_type,</if>
-            <if test="portDesc != null">port_desc,</if>
-            <if test="createMan != null">create_man,</if>
-            <if test="createTime != null">create_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="portName != null">#{portName},</if>
-            <if test="portType != null">#{portType},</if>
-            <if test="portDesc != null">#{portDesc},</if>
-            <if test="createMan != null">#{createMan},</if>
-            <if test="createTime != null">#{createTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasProductPort" parameterType="BasProductPort">
-        update bas_product_port
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="portName != null">port_name = #{portName},</if>
-            <if test="portType != null">port_type = #{portType},</if>
-            <if test="portDesc != null">port_desc = #{portDesc},</if>
-            <if test="createMan != null">create_man = #{createMan},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasProductPortById" parameterType="String">
-        delete from bas_product_port where id = #{id}
-    </delete>
-
-    <delete id="deleteBasProductPortByIds" parameterType="String">
-        delete from bas_product_port where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml
deleted file mode 100644
index 7ee65be..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.portrel.mapper.BasProductPortRelMapper">
-
-    <resultMap type="BasProductPortRel" id="BasProductPortRelResult">
-        <result property="id"    column="id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="portId"    column="port_id"    />
-    </resultMap>
-
-    <sql id="selectBasProductPortRelVo">
-        select id, product_guid, product_id, port_id from bas_product_port_rel
-    </sql>
-
-    <resultMap type="BasProduct" id="BasProductResult">
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="productName"    column="product_name"    />
-    </resultMap>
-
-    <sql id="selectBasProductVo">
-        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product
-    </sql>
-
-    <select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
-        <include refid="selectBasProductPortRelVo"/>
-        <where>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="portId != null  and portId != ''"> and port_id like concat("%", #{portId}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectBasProductPortRelById" parameterType="Long" resultMap="BasProductPortRelResult">
-        <include refid="selectBasProductPortRelVo"/>
-        where id = #{id}
-    </select>
-    <select id="selectNotBindProduct" resultMap="BasProductResult">
-        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9
-        from bas_product bp
-        <where>
-            <if test="bindStatus =='1'.toString()">
-                and product_id in (select product_id from bas_product_port_rel where port_id=#{portId})
-            </if>
-            <if test="bindStatus =='0'.toString()">
-                and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId})
-            </if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-        </where>
-
-    </select>
-
-    <insert id="insertBasProductPortRel" parameterType="BasProductPortRel">
-        insert into bas_product_port_rel
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="portId != null">port_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="portId != null">#{portId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasProductPortRel" parameterType="BasProductPortRel">
-        update bas_product_port_rel
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="portId != null">port_id = #{portId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasProductPortRelById" parameterType="Long">
-        delete from bas_product_port_rel where id = #{id}
-    </delete>
-
-    <delete id="deleteBasProductPortRelByIds" parameterType="String">
-        delete from bas_product_port_rel where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    <delete id="deleteBasProductPortRel">
-        delete from bas_product_port_rel where port_id=#{portId} and product_id in
-        <foreach item="productId" collection="productIds" open="(" separator="," close=")">
-            #{productId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml
deleted file mode 100644
index 875bfaf..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.roadway.mapper.BasRoadwayMapper">
-    
-    <resultMap type="BasRoadway" id="BasRoadwayResult">
-        <result property="id"    column="id"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="roadwayName"    column="roadway_name"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="inLocked"    column="in_locked"    />
-        <result property="outLocked"    column="out_locked"    />
-        <result property="inLocked2"    column="in_locked2"    />
-        <result property="outLocked2"    column="out_locked2"    />
-    </resultMap>
-
-    <sql id="selectBasRoadwayVo">
-        select id, roadway_id, warehouse_id, roadway_name, device_id, in_locked, out_locked, in_locked2, out_locked2 from bas_roadway
-    </sql>
-
-    <select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
-        <include refid="selectBasRoadwayVo"/>
-        <where>  
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="roadwayName != null  and roadwayName != ''"> and roadway_name like concat('%', #{roadwayName}, '%')</if>
-            <if test="deviceId != null  and deviceId != ''"> and device_id like concat("%", #{deviceId}, "%")</if>
-            <if test="inLocked != null  and inLocked != ''"> and in_locked like concat("%", #{inLocked}, "%")</if>
-            <if test="outLocked != null  and outLocked != ''"> and out_locked like concat("%", #{outLocked}, "%")</if>
-            <if test="inLocked2 != null  and inLocked2 != ''"> and in_locked2 like concat("%", #{inLocked2}, "%")</if>
-            <if test="outLocked2 != null  and outLocked2 != ''"> and out_locked2 like concat("%", #{outLocked2}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasRoadwayById" parameterType="String" resultMap="BasRoadwayResult">
-        <include refid="selectBasRoadwayVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasRoadway" parameterType="BasRoadway">
-        insert into bas_roadway
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
-            <if test="roadwayId != null and roadwayId != ''">roadway_id,</if>
-            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
-            <if test="roadwayName != null">roadway_name,</if>
-            <if test="deviceId != null">device_id,</if>
-            <if test="inLocked != null and inLocked != ''">in_locked,</if>
-            <if test="outLocked != null and outLocked != ''">out_locked,</if>
-            <if test="inLocked2 != null and inLocked2 != ''">in_locked2,</if>
-            <if test="outLocked2 != null and outLocked2 != ''">out_locked2,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
-            <if test="roadwayId != null and roadwayId != ''">#{roadwayId},</if>
-            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
-            <if test="roadwayName != null">#{roadwayName},</if>
-            <if test="deviceId != null">#{deviceId},</if>
-            <if test="inLocked != null and inLocked != ''">#{inLocked},</if>
-            <if test="outLocked != null and outLocked != ''">#{outLocked},</if>
-            <if test="inLocked2 != null and inLocked2 != ''">#{inLocked2},</if>
-            <if test="outLocked2 != null and outLocked2 != ''">#{outLocked2},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasRoadway" parameterType="BasRoadway">
-        update bas_roadway
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="roadwayId != null and roadwayId != ''">roadway_id = #{roadwayId},</if>
-            <if test="warehouseId != null and warehouseId != ''">warehouse_id = #{warehouseId},</if>
-            <if test="roadwayName != null">roadway_name = #{roadwayName},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="inLocked != null and inLocked != ''">in_locked = #{inLocked},</if>
-            <if test="outLocked != null and outLocked != ''">out_locked = #{outLocked},</if>
-            <if test="inLocked2 != null and inLocked2 != ''">in_locked2 = #{inLocked2},</if>
-            <if test="outLocked2 != null and outLocked2 != ''">out_locked2 = #{outLocked2},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasRoadwayById" parameterType="String">
-        delete from bas_roadway where id = #{id}
-    </delete>
-
-    <delete id="deleteBasRoadwayByIds" parameterType="String">
-        delete from bas_roadway where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml
deleted file mode 100644
index 750d04c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper">
-    
-    <resultMap type="BasSupplier" id="BasSupplierResult">
-        <result property="id"    column="id"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierGroupNo"    column="supplier_group_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="simpleName"    column="simple_name"    />
-        <result property="useable"    column="useable"    />
-        <result property="remark"    column="remark"    />
-        <result property="supplierArae"    column="supplier_arae"    />
-        <result property="taxpayerRegistrationNumber"    column="taxpayer_registration_number"    />
-        <result property="country"    column="country"    />
-        <result property="timeZone"    column="time_zone"    />
-        <result property="dataFormat"    column="data_format"    />
-        <result property="receivingCountry"    column="receiving_country"    />
-        <result property="taxCategory"    column="tax_category"    />
-        <result property="legalPerson"    column="legal_person"    />
-        <result property="registeredCapital"    column="registered_capital"    />
-        <result property="address"    column="address"    />
-        <result property="contactName"    column="contact_name"    />
-        <result property="contactNumber"    column="contact_number"    />
-    </resultMap>
-
-    <sql id="selectBasSupplierVo">
-        select id, supplier_no, supplier_group_no, supplier_name, simple_name, useable, remark, supplier_arae, taxpayer_registration_number, country, time_zone, data_format, receiving_country, tax_category, legal_person, registered_capital, address, contact_name, contact_number from bas_supplier
-    </sql>
-
-    <select id="selectBasSupplierList" parameterType="BasSupplier" resultMap="BasSupplierResult">
-        <include refid="selectBasSupplierVo"/>
-        <where>  
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
-            <if test="supplierGroupNo != null  and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if>
-            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="simpleName != null  and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
-            <if test="useable != null  and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
-            <if test="supplierArae != null  and supplierArae != ''"> and supplier_arae like concat('%', #{supplierArae}, '%')</if>
-            <if test="taxpayerRegistrationNumber != null  and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
-            <if test="country != null  and country != ''"> and country like concat('%', #{country}, '%')</if>
-            <if test="timeZone != null  and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
-            <if test="dataFormat != null  and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
-            <if test="receivingCountry != null  and receivingCountry != ''"> and receiving_country like concat('%', #{receivingCountry}, '%')</if>
-            <if test="taxCategory != null  and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
-            <if test="legalPerson != null  and legalPerson != ''"> and legal_person like concat('%', #{legalPerson}, '%')</if>
-            <if test="registeredCapital != null  and registeredCapital != ''"> and registered_capital like concat('%', #{registeredCapital}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = like concat('%',#{contactNumber}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectBasSupplierById" parameterType="String" resultMap="BasSupplierResult">
-        <include refid="selectBasSupplierVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasSupplier" parameterType="BasSupplier">
-        insert into bas_supplier
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="supplierGroupNo != null">supplier_group_no,</if>
-            <if test="supplierName != null">supplier_name,</if>
-            <if test="simpleName != null">simple_name,</if>
-            <if test="useable != null and useable != ''">useable,</if>
-            <if test="remark != null">remark,</if>
-            <if test="supplierArae != null">supplier_arae,</if>
-            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
-            <if test="country != null">country,</if>
-            <if test="timeZone != null">time_zone,</if>
-            <if test="dataFormat != null">data_format,</if>
-            <if test="receivingCountry != null">receiving_country,</if>
-            <if test="taxCategory != null">tax_category,</if>
-            <if test="legalPerson != null">legal_person,</if>
-            <if test="registeredCapital != null">registered_capital,</if>
-            <if test="address != null">address,</if>
-            <if test="contactName != null">contact_name,</if>
-            <if test="contactNumber != null">contact_number,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="supplierGroupNo != null">#{supplierGroupNo},</if>
-            <if test="supplierName != null">#{supplierName},</if>
-            <if test="simpleName != null">#{simpleName},</if>
-            <if test="useable != null and useable != ''">#{useable},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="supplierArae != null">#{supplierArae},</if>
-            <if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
-            <if test="country != null">#{country},</if>
-            <if test="timeZone != null">#{timeZone},</if>
-            <if test="dataFormat != null">#{dataFormat},</if>
-            <if test="receivingCountry != null">#{receivingCountry},</if>
-            <if test="taxCategory != null">#{taxCategory},</if>
-            <if test="legalPerson != null">#{legalPerson},</if>
-            <if test="registeredCapital != null">#{registeredCapital},</if>
-            <if test="address != null">#{address},</if>
-            <if test="contactName != null">#{contactName},</if>
-            <if test="contactNumber != null">#{contactNumber},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasSupplier" parameterType="BasSupplier">
-        update bas_supplier
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="supplierGroupNo != null">supplier_group_no = #{supplierGroupNo},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
-            <if test="simpleName != null">simple_name = #{simpleName},</if>
-            <if test="useable != null and useable != ''">useable = #{useable},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="supplierArae != null">supplier_arae = #{supplierArae},</if>
-            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
-            <if test="country != null">country = #{country},</if>
-            <if test="timeZone != null">time_zone = #{timeZone},</if>
-            <if test="dataFormat != null">data_format = #{dataFormat},</if>
-            <if test="receivingCountry != null">receiving_country = #{receivingCountry},</if>
-            <if test="taxCategory != null">tax_category = #{taxCategory},</if>
-            <if test="legalPerson != null">legal_person = #{legalPerson},</if>
-            <if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="contactName != null">contact_name = #{contactName},</if>
-            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasSupplierById" parameterType="String">
-        delete from bas_supplier where id = #{id}
-    </delete>
-
-    <delete id="deleteBasSupplierByIds" parameterType="String">
-        delete from bas_supplier where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml
deleted file mode 100644
index 9aa802b..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.tag.mapper.BasTagMapper">
-
-    <resultMap type="BasTag" id="BasTagResult">
-        <result property="id"    column="id"    />
-        <result property="ip"    column="ip"    />
-        <result property="pickAdd"    column="pick_add"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="curNum"    column="cur_num"    />
-        <result property="sendCompleted"    column="send_completed"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectBasTagVo">
-        select id, ip, pick_add, tray_code, cur_num, send_completed, spare1, spare2, spare3 from bas_tag
-    </sql>
-
-    <select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
-        <include refid="selectBasTagVo"/>
-        <where>
-            <if test="ip != null  and ip != ''"> and ip like concat("%", #{ip}, "%")</if>
-            <if test="pickAdd != null  and pickAdd != ''"> and pick_add like concat("%", #{pickAdd}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="curNum != null  and curNum != ''"> and cur_num like concat("%", #{curNum}, "%")</if>
-            <if test="sendCompleted != null  and sendCompleted != ''"> and send_completed like concat("%", #{sendCompleted}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectBasTagById" parameterType="Long" resultMap="BasTagResult">
-        <include refid="selectBasTagVo"/>
-        where id = #{id}
-    </select>
-    <select id="selectBasTagByTrayCode" resultMap="BasTagResult">
-        <include refid="selectBasTagVo"/>
-        where tray_code = #{trayCode}
-    </select>
-
-    <insert id="insertBasTag" parameterType="BasTag" useGeneratedKeys="true" keyProperty="id">
-        insert into bas_tag
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ip != null">ip,</if>
-            <if test="pickAdd != null">pick_add,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="curNum != null">cur_num,</if>
-            <if test="sendCompleted != null">send_completed,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ip != null">#{ip},</if>
-            <if test="pickAdd != null">#{pickAdd},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="curNum != null">#{curNum},</if>
-            <if test="sendCompleted != null">#{sendCompleted},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasTag" parameterType="BasTag">
-        update bas_tag
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ip != null">ip = #{ip},</if>
-            <if test="pickAdd != null">pick_add = #{pickAdd},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="curNum != null">cur_num = #{curNum},</if>
-            <if test="sendCompleted != null">send_completed = #{sendCompleted},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasTagById" parameterType="Long">
-        delete from bas_tag where id = #{id}
-    </delete>
-
-    <delete id="deleteBasTagByIds" parameterType="String">
-        delete from bas_tag where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml
deleted file mode 100644
index f7cd878..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.taskNo.mapper.BasTaskNoMapper">
-
-    <resultMap type="com.ruoyi.bas.taskNo.domain.BasTaskNo" id="BasTaskNoResult">
-        <result property="id" column="id"/>
-        <result property="taskType" column="task_type"/>
-        <result property="typeName" column="type_name"/>
-        <result property="taskNo" column="task_no"/>
-        <result property="minNo" column="min_no"/>
-        <result property="maxNo" column="max_no"/>
-    </resultMap>
-    <sql id="selectBasTaskNoVo">
-        select id, task_type, type_name, task_no, min_no, max_no
-        from bas_task_no
-    </sql>
-    <select id="selectBasTaskNoById" parameterType="String" resultMap="BasTaskNoResult">
-        <include refid="selectBasTaskNoVo"/>
-        where id = #{id}
-    </select>
-
-    <update id="updateBasTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
-        update bas_task_no
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="typeName != null">type_name = #{typeName},</if>
-            <if test="taskNo != null">task_no = #{taskNo},</if>
-            <if test="minNo != null">min_no = #{minNo},</if>
-            <if test="maxNo != null">max_no = #{maxNo},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <select id="getTaskNo" resultMap="BasTaskNoResult" parameterType="String">
-        select *
-        from bas_task_no
-        where id = #{id}
-    </select>
-
-    <update id="updateTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
-        update bas_task_no
-        set task_no=#{taskNo}
-        where id = #{id}
-    </update>
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml
deleted file mode 100644
index dbe6897..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.traycodeformat.mapper.BasTraycodeFormatMapper">
-    
-    <resultMap type="BasTraycodeFormat" id="BasTraycodeFormatResult">
-        <result property="id"    column="id"    />
-        <result property="barcodeFormat"    column="barcode_format"    />
-        <result property="serialRule"    column="serial_rule"    />
-        <result property="serialExample"    column="serial_example"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="minNum"    column="min_num"    />
-        <result property="maxNum"    column="max_num"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectBasTraycodeFormatVo">
-        select id, barcode_format, serial_rule, serial_example, remarks, min_num, max_num, create_time, update_time, spare1, spare2, spare3 from bas_traycode_format
-    </sql>
-
-    <select id="selectBasTraycodeFormatList" parameterType="BasTraycodeFormat" resultMap="BasTraycodeFormatResult">
-        <include refid="selectBasTraycodeFormatVo"/>
-        <where>  
-            <if test="barcodeFormat != null  and barcodeFormat != ''"> and barcode_format like concat('%', #{barcodeFormat}, '%')</if>
-            <if test="serialRule != null  and serialRule != ''"> and serial_rule like concat('%',#{serialRule}, '%')</if>
-            <if test="serialExample != null  and serialExample != ''"> and serial_example like concat('%',#{serialExample}, '%')</if>
-            <if test="remarks != null  and remarks != ''"> and remarks like concat('%',#{remarks}, '%')</if>
-            <if test="minNum != null "> and min_num like concat('%',#{minNum}, '%')</if>
-            <if test="maxNum != null "> and max_num like concat('%',#{maxNum}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasTraycodeFormatById" parameterType="Long" resultMap="BasTraycodeFormatResult">
-        <include refid="selectBasTraycodeFormatVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasTraycodeFormat" parameterType="BasTraycodeFormat">
-        insert into bas_traycode_format
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="barcodeFormat != null">barcode_format,</if>
-            <if test="serialRule != null">serial_rule,</if>
-            <if test="serialExample != null">serial_example,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="minNum != null">min_num,</if>
-            <if test="maxNum != null">max_num,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="barcodeFormat != null">#{barcodeFormat},</if>
-            <if test="serialRule != null">#{serialRule},</if>
-            <if test="serialExample != null">#{serialExample},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="minNum != null">#{minNum},</if>
-            <if test="maxNum != null">#{maxNum},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasTraycodeFormat" parameterType="BasTraycodeFormat">
-        update bas_traycode_format
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="barcodeFormat != null">barcode_format = #{barcodeFormat},</if>
-            <if test="serialRule != null">serial_rule = #{serialRule},</if>
-            <if test="serialExample != null">serial_example = #{serialExample},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="minNum != null">min_num = #{minNum},</if>
-            <if test="maxNum != null">max_num = #{maxNum},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasTraycodeFormatById" parameterType="Long">
-        delete from bas_traycode_format where id = #{id}
-    </delete>
-
-    <delete id="deleteBasTraycodeFormatByIds" parameterType="String">
-        delete from bas_traycode_format where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml
deleted file mode 100644
index 6a24c34..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.traycode.mapper.BasTraycodeMapper">
-
-    <resultMap type="BasTraycode" id="BasTraycodeResult">
-        <result property="id"    column="id"    />
-        <result property="formatId"    column="format_id"    />
-        <result property="formatName"    column="format_name"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectBasTraycodeVo">
-        select bt.id, bt.format_id, bt.tray_code, bt.create_time, bt.update_time, bt.spare1, bt.spare2, bt.spare3,btf.remarks as format_name
-        from bas_traycode bt
-        left join bas_traycode_format btf on btf.id = bt.format_id
-
-    </sql>
-
-    <select id="selectBasTraycodeList" parameterType="BasTraycode" resultMap="BasTraycodeResult">
-        <include refid="selectBasTraycodeVo"/>
-        <where>
-            <if test="formatId != null "> and bt.format_id like concat("%", #{formatId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and bt.tray_code like concat('%',#{trayCode}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and bt.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and bt.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and bt.spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectBasTraycodeById" parameterType="Long" resultMap="BasTraycodeResult">
-        <include refid="selectBasTraycodeVo"/>
-        where bt.id = #{id}
-    </select>
-
-    <insert id="insertBasTraycode" parameterType="BasTraycode">
-        insert into bas_traycode
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="formatId != null">format_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="formatId != null">#{formatId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-    <insert id="insertBasTraycodeList">
-        insert into bas_traycode( format_id, tray_code) values
-        <foreach item="item" collection="list" separator=",">
-            (
-
-            <if test="item.formatId != null">#{item.formatId},</if>
-            <if test="item.trayCode != null">#{item.trayCode}</if>
-            )
-        </foreach>
-    </insert>
-
-    <update id="updateBasTraycode" parameterType="BasTraycode">
-        update bas_traycode
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="formatId != null">format_id = #{formatId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasTraycodeById" parameterType="Long">
-        delete from bas_traycode where id = #{id}
-    </delete>
-
-    <delete id="deleteBasTraycodeByIds" parameterType="String">
-        delete from bas_traycode where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml
deleted file mode 100644
index 84f77ad..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.warehousePort.mapper.BasWarehousePortMapper">
-    
-    <resultMap type="BasWarehousePort" id="BasWarehousePortResult">
-        <result property="id"    column="id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="portCode"    column="port_code"    />
-        <result property="portName"    column="port_name"    />
-        <result property="portType"    column="port_type"    />
-    </resultMap>
-
-    <sql id="selectBasWarehousePortVo">
-        select id, warehouse_id, port_code, port_name, port_type from bas_warehouse_port
-    </sql>
-
-    <select id="selectBasWarehousePortList" parameterType="BasWarehousePort" resultMap="BasWarehousePortResult">
-        <include refid="selectBasWarehousePortVo"/>
-        <where>  
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="portCode != null  and portCode != ''"> and port_code like concat("%", #{portCode}, "%")</if>
-            <if test="portName != null  and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
-            <if test="portType != null  and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectBasWarehousePortById" parameterType="Long" resultMap="BasWarehousePortResult">
-        <include refid="selectBasWarehousePortVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBasWarehousePort" parameterType="BasWarehousePort">
-        insert into bas_warehouse_port
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="portCode != null">port_code,</if>
-            <if test="portName != null">port_name,</if>
-            <if test="portType != null">port_type,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="portCode != null">#{portCode},</if>
-            <if test="portName != null">#{portName},</if>
-            <if test="portType != null">#{portType},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasWarehousePort" parameterType="BasWarehousePort">
-        update bas_warehouse_port
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="portCode != null">port_code = #{portCode},</if>
-            <if test="portName != null">port_name = #{portName},</if>
-            <if test="portType != null">port_type = #{portType},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBasWarehousePortById" parameterType="Long">
-        delete from bas_warehouse_port where id = #{id}
-    </delete>
-
-    <delete id="deleteBasWarehousePortByIds" parameterType="String">
-        delete from bas_warehouse_port where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
deleted file mode 100644
index bba33c8..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper">
-
-    <resultMap type="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace" id="BasCargoSpaceResult">
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoAreaId"    column="cargo_area_id"    />
-        <result property="theType"    column="the_type"    />
-        <result property="theTypeName"    column="the_type_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
-        <result property="status"    column="status"    />
-        <result property="locked"    column="locked"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="cargoHight"    column="cargo_hight"    />
-        <result property="issDouble"    column="iss_double"    />
-        <result property="groupCodingNo"    column="group_coding_no"    />
-        <result property="groupCoding"    column="group_coding"    />
-        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
-        <result property="thisCargoArea"    column="this_cargo_area"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="quantity"    column="quantity"    />
-    </resultMap>
-
-    <sql id="selectBasCargoSpaceVo">
-        select
-            bcs.cargo_space_id,
-            bcs.warehouse_id,
-            bcs.roadway_id,
-            bcs.cargo_area_id,
-            bcs.the_type,
-            bcs.the_type_name,
-            bcs.cargo_space_name,
-            bcs.the_platoon,
-            bcs.the_column,
-            bcs.the_floor,
-            bcs.status,
-            bcs.locked,
-            bcs.tray_code,
-            bcs.cargo_hight,
-            bcs.iss_double,
-            bcs.group_coding_no,
-            bcs.group_coding,
-            bcs.cargo_space_logo,
-            bcs.this_cargo_area,
-            bw.warehouse_name
-        from bas_cargo_space bcs
-                 left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id
-
-    </sql>
-
-    <select id="selectBasCargoSpaceList" resultMap="BasCargoSpaceResult">
-        <include refid="selectBasCargoSpaceVo"/>
-        <where>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and bcs.cargo_area_id like concat("%", #{cargoAreaId}, "%")</if>
-            <if test="theType != null  and theType != ''"> and bcs.the_type like concat("%", #{theType}, "%")</if>
-            <if test="theTypeName != null  and theTypeName != ''"> and bcs.the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="thePlatoon != null "> and bcs.the_platoon like concat("%", #{thePlatoon}, "%")</if>
-            <if test="theColumn != null "> and bcs.the_column like concat("%", #{theColumn}, "%")</if>
-            <if test="theFloor != null "> and bcs.the_floor like concat("%", #{theFloor}, "%")</if>
-            <if test="status != null  and status != ''"> and bcs.status like concat("%", #{status}, "%")</if>
-            <if test="locked != null  and locked != ''"> and bcs.locked like concat("%", #{locked}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and bcs.cargo_hight like concat("%", #{cargoHight}, "%")</if>
-            <if test="issDouble != null  and issDouble != ''"> and bcs.iss_double like concat("%", #{issDouble}, "%")</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and bcs.group_coding_no like concat("%", #{groupCodingNo}, "%")</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and bcs.group_coding like concat("%", #{groupCoding}, "%")</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and bcs.cargo_space_logo like concat("%", #{cargoSpaceLogo}, "%")</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and bcs.this_cargo_area like concat("%", #{thisCargoArea}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by the_platoon,the_floor,the_column
-    </select>
-
-    <select id="selectBasCargoSpaceByCargoSpaceId" parameterType="String" resultMap="BasCargoSpaceResult">
-        <include refid="selectBasCargoSpaceVo"/>
-        where cargo_space_id = #{cargoSpaceId}
-    </select>
-
-    <insert id="insertBasCargoSpace" parameterType="BasCargoSpace">
-        insert into bas_cargo_space
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoAreaId != null">cargo_area_id,</if>
-            <if test="theType != null">the_type,</if>
-            <if test="theTypeName != null">the_type_name,</if>
-            <if test="cargoSpaceName != null and cargoSpaceName != ''">cargo_space_name,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="locked != null and locked != ''">locked,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="cargoHight != null">cargo_hight,</if>
-            <if test="issDouble != null">iss_double,</if>
-            <if test="groupCodingNo != null">group_coding_no,</if>
-            <if test="groupCoding != null">group_coding,</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
-            <if test="thisCargoArea != null">this_cargo_area,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoAreaId != null">#{cargoAreaId},</if>
-            <if test="theType != null">#{theType},</if>
-            <if test="theTypeName != null">#{theTypeName},</if>
-            <if test="cargoSpaceName != null and cargoSpaceName != ''">#{cargoSpaceName},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="locked != null and locked != ''">#{locked},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="cargoHight != null">#{cargoHight},</if>
-            <if test="issDouble != null">#{issDouble},</if>
-            <if test="groupCodingNo != null">#{groupCodingNo},</if>
-            <if test="groupCoding != null">#{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">#{thisCargoArea},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasCargoSpace" parameterType="BasCargoSpace">
-        update bas_cargo_space
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehouseId != null and warehouseId != ''">warehouse_id = #{warehouseId},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
-            <if test="theType != null">the_type = #{theType},</if>
-            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
-            <if test="cargoSpaceName != null and cargoSpaceName != ''">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="locked != null and locked != ''">locked = #{locked},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
-            <if test="issDouble != null">iss_double = #{issDouble},</if>
-            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
-            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
-        </trim>
-        where cargo_space_id = #{cargoSpaceId}
-    </update>
-
-    <delete id="deleteBasCargoSpaceByCargoSpaceId" parameterType="String">
-        delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
-    </delete>
-
-    <delete id="deleteBasCargoSpaceByCargoSpaceIds" parameterType="String">
-        delete from bas_cargo_space where cargo_space_id in
-        <foreach item="cargoSpaceId" collection="array" open="(" separator="," close=")">
-            #{cargoSpaceId}
-        </foreach>
-    </delete>
-
-    <select id="selectStatusCount" resultType="java.util.Map">
-        SELECT
-            status,
-            COUNT(*) as count
-        FROM bas_cargo_space
-        GROUP BY status
-    </select>
-    <select id="selectEmptyCargoSpaceByWarehouseId" resultType="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace">
-        SELECT TOP 1 cargo_space_id as cargoSpaceId
-        FROM bas_cargo_space
-        WHERE status = '1'
-          and locked = 'N'
-        <if test="warehouseId != null">
-            and warehouse_id like concat("%", #{warehouseId}, "%")
-        </if>
-        <if test="roadwayId != null">
-            and roadway_id like concat("%", #{roadwayId}, "%")
-        </if>
-        ORDER BY the_platoon, the_floor,the_column
-    </select>
-    <select id="selectCargoSpaceWithStock" resultMap="BasCargoSpaceResult">
-        select
-            bcs.cargo_space_id,
-            bcs.cargo_space_name,
-            bcs.the_platoon,
-            bcs.the_column,
-            bcs.the_floor,
-            bcs.status,
-            bs.tray_code,
-            bs.product_id,
-            bs.product_name
-        from bas_cargo_space bcs
-                 left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
-        where bcs.status in ( '2')
-    </select>
-    <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
-        select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_space_name,
-               bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked, bs.tray_code, bs.product_id,
-               bp.product_name,bs.spare6,bs.quantity,bs.spare7
-        from bas_stock bs,bas_cargo_space bcs,bas_roadway br,bas_product bp
-        where bs.cargo_space_id = bcs.cargo_space_id
-          and br.roadway_id = bcs.roadway_id
-          and bp.product_id = bs.product_id
-          and br.out_locked = 'N'
-        <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-        <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id like concat("%", #{roadwayId}, "%")</if>
-        <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-        <if test="thePlatoon != null "> and bcs.the_platoon like concat("%", #{thePlatoon}, "%")</if>
-        <if test="theColumn != null "> and bcs.the_column like concat("%", #{theColumn}, "%")</if>
-        <if test="theFloor != null "> and bcs.the_floor like concat("%", #{theFloor}, "%")</if>
-        <if test="status != null  and status != ''"> and bcs.status like concat("%", #{status}, "%")</if>
-        <if test="locked != null  and locked != ''"> and bcs.locked like concat("%", #{locked}, "%")</if>
-        <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
-        <if test="spare7 != null  and spare7 != ''"> and bs.spare7 like concat("%", #{spare7}, "%")</if>
-        <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
-        <if test="productId != null  and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
-        <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml
deleted file mode 100644
index 060f79e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper">
-
-    <resultMap type="BasWarehouse" id="BasWarehouseResult">
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseNo"    column="warehouse_no"    />
-        <result property="projectNo"    column="project_no"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="address"    column="address"    />
-        <result property="cDesc"    column="c_desc"    />
-        <result property="warehouseKind"    column="warehouse_kind"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-        <result property="isCurrent"    column="is_current"    />
-    </resultMap>
-
-    <sql id="selectBasWarehouseVo">
-        select warehouse_id, warehouse_no, project_no, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current from bas_warehouse
-    </sql>
-
-    <select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
-        <include refid="selectBasWarehouseVo"/>
-        <where>
-            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat('%',#{warehouseId}, '%')</if>
-            <if test="warehouseNo != null  and warehouseNo != ''">and warehouse_no like concat('%',#{warehouseNo}, '%')</if>
-            <if test="projectNo != null  and projectNo != ''">and project_no like concat('%',#{projectNo}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''">and warehouse_name like concat('%',
-                #{warehouseName}, '%')
-            </if>
-            <if test="address != null  and address != ''">and address like concat("%", #{address}, "%")</if>
-            <if test="cDesc != null  and cDesc != ''">and c_desc like concat("%", #{cDesc}, "%")</if>
-            <if test="warehouseKind != null  and warehouseKind != ''">and warehouse_kind like concat("%", #{warehouseKind}, "%")</if>
-            <if test="warehouseType != null  and warehouseType != ''">and warehouse_type like concat("%", #{warehouseType}, "%")</if>
-            <if test="isCurrent != null  and isCurrent != ''">and is_current like concat("%", #{isCurrent}, "%")</if>
-            <if test="dataScope !=null and dataScope.size()>0">
-                and warehouse_id in
-                <foreach item="item" index="index" collection="dataScope" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="typeData != null and typeData.size()>0">
-                and warehouse_type in
-                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectBasWarehouseByWarehouseId" parameterType="String" resultMap="BasWarehouseResult">
-        <include refid="selectBasWarehouseVo"/>
-        where warehouse_id = #{warehouseId}
-    </select>
-
-    <insert id="insertBasWarehouse" parameterType="BasWarehouse">
-        insert into bas_warehouse
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
-            <if test="warehouseNo != null and warehouseNo != ''">warehouse_no,</if>
-            <if test="projectNo != null">project_no,</if>
-            <if test="warehouseName != null and warehouseName != ''">warehouse_name,</if>
-            <if test="address != null">address,</if>
-            <if test="cDesc != null">c_desc,</if>
-            <if test="warehouseKind != null">warehouse_kind,</if>
-            <if test="warehouseType != null">warehouse_type,</if>
-            <if test="isCurrent != null and isCurrent != ''">is_current,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
-            <if test="warehouseNo != null and warehouseNo != ''">#{warehouseNo},</if>
-            <if test="projectNo != null">#{projectNo},</if>
-            <if test="warehouseName != null and warehouseName != ''">#{warehouseName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="cDesc != null">#{cDesc},</if>
-            <if test="warehouseKind != null">#{warehouseKind},</if>
-            <if test="warehouseType != null">#{warehouseType},</if>
-            <if test="isCurrent != null and isCurrent != ''">#{isCurrent},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasWarehouse" parameterType="BasWarehouse">
-        update bas_warehouse
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehouseNo != null and warehouseNo != ''">warehouse_no = #{warehouseNo},</if>
-            <if test="projectNo != null">project_no = #{projectNo},</if>
-            <if test="warehouseName != null and warehouseName != ''">warehouse_name = #{warehouseName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="cDesc != null">c_desc = #{cDesc},</if>
-            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
-            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
-            <if test="isCurrent != null and isCurrent != ''">is_current = #{isCurrent},</if>
-        </trim>
-        where warehouse_id = #{warehouseId}
-    </update>
-
-    <delete id="deleteBasWarehouseByWarehouseId" parameterType="String">
-        delete from bas_warehouse where warehouse_id = #{warehouseId}
-    </delete>
-
-    <delete id="deleteBasWarehouseByWarehouseIds" parameterType="String">
-        delete from bas_warehouse where warehouse_id in
-        <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
-            #{warehouseId}
-        </foreach>
-    </delete>
-
-
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml
deleted file mode 100644
index 85a7fc8..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.commit.mapper.CheckCommitRecordMapper">
-    
-    <resultMap type="CheckCommitRecord" id="CheckCommitRecordResult">
-        <result property="pdGuid"    column="pd_guid"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectCheckCommitRecordVo">
-        select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3 from check_commit_record
-    </sql>
-
-    <select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
-        <include refid="selectCheckCommitRecordVo"/>
-        <where>  
-            <if test="pdGuid != null "> and pd_guid like concat("%", #{pdGuid}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectCheckCommitRecordByPdGuid" parameterType="Long" resultMap="CheckCommitRecordResult">
-        <include refid="selectCheckCommitRecordVo"/>
-        where pd_guid = #{pdGuid}
-    </select>
-
-    <insert id="insertCheckCommitRecord" parameterType="CheckCommitRecord" useGeneratedKeys="true" keyProperty="pdGuid">
-        insert into check_commit_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="trayCode != null">tray_code,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCheckCommitRecord" parameterType="CheckCommitRecord">
-        update check_commit_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where pd_guid = #{pdGuid}
-    </update>
-
-    <delete id="deleteCheckCommitRecordByPdGuid" parameterType="Long">
-        delete from check_commit_record where pd_guid = #{pdGuid}
-    </delete>
-
-    <delete id="deleteCheckCommitRecordByPdGuids" parameterType="String">
-        delete from check_commit_record where pd_guid in 
-        <foreach item="pdGuid" collection="array" open="(" separator="," close=")">
-            #{pdGuid}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml
deleted file mode 100644
index 303fb5a..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.DifferenceRecordFinish.mapper.CheckDifferenceRecordFinishMapper">
-
-    <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
-        <result property="checkGuid" column="check_guid"/>
-        <result property="checkStockDetailId" column="check_stock_detail_id"/>
-        <result property="stockId" column="stock_id"/>
-        <result property="trayCode" column="tray_code"/>
-        <result property="cargoSpaceId" column="cargo_space_id"/>
-        <result property="cargoSpaceName" column="cargo_space_name"/>
-        <result property="productId" column="product_id"/>
-        <result property="lotNo" column="lot_no"/>
-        <result property="supplier" column="supplier"/>
-        <result property="customer" column="customer"/>
-        <result property="oldQuantity" column="old_quantity"/>
-        <result property="newQuantity" column="new_quantity"/>
-        <result property="recordType" column="record_type"/>
-        <result property="createTime" column="create_time"/>
-        <result property="productGuid" column="product_guid"/>
-        <result property="status" column="status"/>
-        <result property="warehouseId" column="warehouse_id"/>
-        <result property="warehouseName" column="warehouse_name"/>
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId" column="product_id"/>
-            <result property="materialDesc" column="product_name"/>
-            <result property="englishDesc" column="englishDesc"/>
-            <result property="length" column="length"/>
-            <result property="width" column="width"/>
-            <result property="height" column="height"/>
-            <result property="volume" column="volume"/>
-            <result property="netWeight" column="netWeight"/>
-        </association>
-    </resultMap>
-
-    <sql id="selectCheckDifferenceRecordVo">
-        select r.check_guid,
-               r.check_stock_detail_id,
-               r.stock_id,
-               r.tray_code,
-               r.cargo_space_id,
-               r.product_id,
-               r.lot_no,
-               r.supplier,
-               r.customer,
-               r.old_quantity,
-               r.new_quantity,
-               r.record_type,
-               r.create_time,
-               r.product_guid,
-               r.status,
-               r.warehouse_id,
-               w.warehouse_name,
-               bp.product_name,
-               bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,
-               bp.spare5 as length,
-               bp.spare6 as width,
-               bp.spare7 as height,
-               bp.spare8 as volume,
-               bcs.cargo_space_name
-        from check_difference_record_finish r
-                 left join bas_warehouse w on r.warehouse_id = w.warehouse_id
-                 left join bas_product bp on r.product_id = bp.product_id
-                 left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
-    </sql>
-
-    <select id="selectCheckDifferenceRecordFinishList" parameterType="CheckDifferenceRecord"
-            resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordVo"/>
-        <where>
-            <if test="checkStockDetailId != null  and checkStockDetailId != ''">
-                and r.check_stock_detail_id like concat("%", #{checkStockDetailId}, "%")
-            </if>
-            <if test="stockId != null  and stockId != ''">
-                and r.stock_id like concat("%", #{stockId}, "%")
-            </if>
-            <if test="trayCode != null  and trayCode != ''">
-                and r.tray_code like concat("%", #{trayCode}, "%")
-            </if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
-                and r.cargo_space_id like concat("%", #{cargoSpaceId}, "%")
-            </if>
-            <if test="productId != null  and productId != ''">
-                and r.product_id like concat("%", #{productId}, "%")
-            </if>
-            <if test="lotNo != null  and lotNo != ''">
-                and r.lot_no like concat("%", #{lotNo}, "%")
-            </if>
-            <if test="supplier != null  and supplier != ''">
-                and r.supplier like concat("%", #{supplier}, "%")
-            </if>
-            <if test="customer != null  and customer != ''">
-                and r.customer like concat("%", #{customer}, "%")
-            </if>
-            <if test="oldQuantity != null  and oldQuantity != ''">
-                and r.old_quantity like concat("%", #{oldQuantity}, "%")
-            </if>
-            <if test="newQuantity != null  and newQuantity != ''">
-                and r.new_quantity like concat("%", #{newQuantity}, "%")
-            </if>
-            <if test="recordType != null ">
-                and r.record_type like concat("%", #{recordType}, "%")
-            </if>
-            <if test="productGuid != null  and productGuid != ''">
-                and r.product_guid like concat("%", #{productGuid}, "%")
-            </if>
-            <if test="status != null  and status != ''">
-                and r.status like concat("%", #{status}, "%")
-            </if>
-            <if test="warehouseId != null  and warehouseId != ''">
-                and r.warehouse_id like concat("%", #{warehouseId}, "%")
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by r.create_time desc
-    </select>
-
-    <select id="selectCheckDifferenceRecordFinishByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordVo"/>
-        where check_guid = #{checkGuid}
-    </select>
-
-    <insert id="insertCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecord">
-        insert into check_difference_record_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">check_guid,</if>
-            <if test="checkStockDetailId != null">check_stock_detail_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="supplier != null">supplier,</if>
-            <if test="customer != null">customer,</if>
-            <if test="oldQuantity != null">old_quantity,</if>
-            <if test="newQuantity != null">new_quantity,</if>
-            <if test="recordType != null">record_type,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="status != null">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">#{checkGuid},</if>
-            <if test="checkStockDetailId != null">#{checkStockDetailId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="supplier != null">#{supplier},</if>
-            <if test="customer != null">#{customer},</if>
-            <if test="oldQuantity != null">#{oldQuantity},</if>
-            <if test="newQuantity != null">#{newQuantity},</if>
-            <if test="recordType != null">#{recordType},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="status != null">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecord">
-        update check_difference_record_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="supplier != null">supplier = #{supplier},</if>
-            <if test="customer != null">customer = #{customer},</if>
-            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
-            <if test="newQuantity != null">new_quantity = #{newQuantity},</if>
-            <if test="recordType != null">record_type = #{recordType},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-        </trim>
-        where check_guid = #{checkGuid}
-    </update>
-
-    <delete id="deleteCheckDifferenceRecordFinishByCheckGuid" parameterType="String">
-        delete
-        from check_difference_record_finish
-        where check_guid = #{checkGuid}
-    </delete>
-
-    <delete id="deleteCheckDifferenceRecordFinishByCheckGuids" parameterType="String">
-        delete from check_difference_record_finish where check_guid in
-        <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
-            #{checkGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml
deleted file mode 100644
index d6fc4fc..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper">
-
-    <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
-        <result property="checkGuid" column="check_guid"/>
-        <result property="checkStockDetailId" column="check_stock_detail_id"/>
-        <result property="stockId" column="stock_id"/>
-        <result property="trayCode" column="tray_code"/>
-        <result property="cargoSpaceId" column="cargo_space_id"/>
-        <result property="cargoSpaceName" column="cargo_space_name"/>
-        <result property="productId" column="product_id"/>
-        <result property="lotNo" column="lot_no"/>
-        <result property="supplier" column="supplier"/>
-        <result property="customer" column="customer"/>
-        <result property="oldQuantity" column="old_quantity"/>
-        <result property="newQuantity" column="new_quantity"/>
-        <result property="recordType" column="record_type"/>
-        <result property="createTime" column="create_time"/>
-        <result property="productGuid" column="product_guid"/>
-        <result property="status" column="status"/>
-        <result property="warehouseId" column="warehouse_id"/>
-        <result property="warehouseName" column="warehouse_name"/>
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId" column="product_id"/>
-            <result property="materialDesc" column="product_name"/>
-            <result property="englishDesc" column="englishDesc"/>
-            <result property="length" column="length"/>
-            <result property="width" column="width"/>
-            <result property="height" column="height"/>
-            <result property="volume" column="volume"/>
-            <result property="netWeight" column="netWeight"/>
-        </association>
-    </resultMap>
-
-    <sql id="selectCheckDifferenceRecordVo">
-        select r.check_guid,
-               r.check_stock_detail_id,
-               r.stock_id,
-               r.tray_code,
-               r.cargo_space_id,
-               r.product_id,
-               r.lot_no,
-               r.supplier,
-               r.customer,
-               r.old_quantity,
-               r.new_quantity,
-               r.record_type,
-               r.create_time,
-               r.product_guid,
-               r.status,
-               r.warehouse_id,
-               w.warehouse_name,
-               bp.product_name,
-               bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,
-               bp.spare5 as length,
-               bp.spare6 as width,
-               bp.spare7 as height,
-               bp.spare8 as volume,
-               bcs.cargo_space_name
-        from check_difference_record r
-                 left join bas_warehouse w on r.warehouse_id = w.warehouse_id
-                 left join bas_product bp on r.product_id = bp.product_id
-                 left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
-    </sql>
-
-    <select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord"
-            resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordVo"/>
-        <where>
-            <if test="checkStockDetailId != null  and checkStockDetailId != ''">
-                and r.check_stock_detail_id like concat("%", #{checkStockDetailId}, "%")
-            </if>
-            <if test="stockId != null  and stockId != ''">
-                and r.stock_id like concat("%", #{stockId}, "%")
-            </if>
-            <if test="trayCode != null  and trayCode != ''">
-                and r.tray_code like concat("%", #{trayCode}, "%")
-            </if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
-                and r.cargo_space_id like concat("%", #{cargoSpaceId}, "%")
-            </if>
-            <if test="productId != null  and productId != ''">
-                and r.product_id like concat("%", #{productId}, "%")
-            </if>
-            <if test="lotNo != null  and lotNo != ''">
-                and r.lot_no like concat("%", #{lotNo}, "%")
-            </if>
-            <if test="supplier != null  and supplier != ''">
-                and r.supplier like concat("%", #{supplier}, "%")
-            </if>
-            <if test="customer != null  and customer != ''">
-                and r.customer like concat("%", #{customer}, "%")
-            </if>
-            <if test="oldQuantity != null  and oldQuantity != ''">
-                and r.old_quantity like concat("%", #{oldQuantity}, "%")
-            </if>
-            <if test="newQuantity != null  and newQuantity != ''">
-                and r.new_quantity like concat("%", #{newQuantity}, "%")
-            </if>
-            <if test="recordType != null ">
-                and r.record_type like concat("%", #{recordType}, "%")
-            </if>
-            <if test="productGuid != null  and productGuid != ''">
-                and r.product_guid like concat("%", #{productGuid}, "%")
-            </if>
-            <if test="status != null  and status != ''">
-                and r.status like concat("%", #{status}, "%")
-            </if>
-            <if test="warehouseId != null  and warehouseId != ''">
-                and r.warehouse_id like concat("%", #{warehouseId}, "%")
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by r.create_time desc
-    </select>
-
-    <select id="selectCheckDifferenceRecordByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordVo"/>
-        where check_guid = #{checkGuid}
-    </select>
-
-    <insert id="insertCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
-        insert into check_difference_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">check_guid,</if>
-            <if test="checkStockDetailId != null">check_stock_detail_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="supplier != null">supplier,</if>
-            <if test="customer != null">customer,</if>
-            <if test="oldQuantity != null">old_quantity,</if>
-            <if test="newQuantity != null">new_quantity,</if>
-            <if test="recordType != null">record_type,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="status != null">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">#{checkGuid},</if>
-            <if test="checkStockDetailId != null">#{checkStockDetailId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="supplier != null">#{supplier},</if>
-            <if test="customer != null">#{customer},</if>
-            <if test="oldQuantity != null">#{oldQuantity},</if>
-            <if test="newQuantity != null">#{newQuantity},</if>
-            <if test="recordType != null">#{recordType},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="status != null">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
-        update check_difference_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="supplier != null">supplier = #{supplier},</if>
-            <if test="customer != null">customer = #{customer},</if>
-            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
-            <if test="newQuantity != null">new_quantity = #{newQuantity},</if>
-            <if test="recordType != null">record_type = #{recordType},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-        </trim>
-        where check_guid = #{checkGuid}
-    </update>
-
-    <delete id="deleteCheckDifferenceRecordByCheckGuid" parameterType="String">
-        delete
-        from check_difference_record
-        where check_guid = #{checkGuid}
-    </delete>
-
-    <delete id="deleteCheckDifferenceRecordByCheckGuids" parameterType="String">
-        delete from check_difference_record where check_guid in
-        <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
-            #{checkGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml
deleted file mode 100644
index 1a61a5f..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper">
-
-    <resultMap type="CheckStockinDetailFinish" id="CheckStockinDetailFinishResult">
-        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
-        <result property="stockCheckGuid"    column="stock_check_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-    </resultMap>
-    <resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
-        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
-        <result property="stockCheckGuid"    column="stock_check_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="productName"    column="product_name"    />
-
-    </resultMap>
-
-    <sql id="selectCheckStockinDetailVo">
-        select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
-               csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
-               csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
-               csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
-               bp.product_name,
-               bcs.cargo_space_name,
-               csd.spare7,
-               csd.spare8,
-               csd.spare9
-        from check_stockin_detail_finish csd
-                 left join bas_product bp on csd.product_id = bp.product_id
-                 left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id
-
-    </sql>
-
-    <sql id="selectCheckStockinDetailFinishVo">
-        select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish
-    </sql>
-
-    <select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
-        <include refid="selectCheckStockinDetailFinishVo"/>
-        <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectCheckStockinDetailFinishByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailFinishResult">
-        <include refid="selectCheckStockinDetailFinishVo"/>
-        where stock_check_detail_id = #{stockCheckDetailId}
-    </select>
-    <select id="selectCheckStockinDetailList"
-            resultMap="CheckStockinDetailResult">
-        <include refid="selectCheckStockinDetailVo"/>
-        <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and csd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and csd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and csd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and csd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and csd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and csd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and csd.spec like concat("%", #{spec}, "%")</if>
-            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-    </select>
-
-    <insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
-        insert into check_stockin_detail_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockCheckDetailId != null">stock_check_detail_id,</if>
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
-        update check_stockin_detail_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-        </trim>
-        where stock_check_detail_id = #{stockCheckDetailId}
-    </update>
-
-    <delete id="deleteCheckStockinDetailFinishByStockCheckDetailId" parameterType="String">
-        delete from check_stockin_detail_finish where stock_check_detail_id = #{stockCheckDetailId}
-    </delete>
-
-    <delete id="deleteCheckStockinDetailFinishByStockCheckDetailIds" parameterType="String">
-        delete from check_stockin_detail_finish where stock_check_detail_id in
-        <foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
-            #{stockCheckDetailId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml
deleted file mode 100644
index 057a4e0..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.stockcheckdetail.mapper.CheckStockinDetailMapper">
-
-    <resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
-        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
-        <result property="stockCheckGuid"    column="stock_check_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="productName"    column="product_name"    />
-        <result property="orderId"    column="order_id"    />
-
-    </resultMap>
-
-    <sql id="selectCheckStockinDetailVo">
-        select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
-               csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
-               csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
-               csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
-               bp.product_name,
-               bcs.cargo_space_name,
-               csd.spare7,
-               csd.spare8,
-               csd.spare9,
-               csd.order_id
-        from check_stockin_detail csd
-        left join bas_product bp on csd.product_id = bp.product_id
-        left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id
-    </sql>
-
-    <select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
-        <include refid="selectCheckStockinDetailVo"/>
-        <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and csd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and csd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and csd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and csd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and csd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and csd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and csd.spec like concat("%", #{spec}, "%")</if>
-            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectCheckStockinDetailByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailResult">
-        <include refid="selectCheckStockinDetailVo"/>
-        where stock_check_detail_id = #{stockCheckDetailId}
-    </select>
-
-    <insert id="insertCheckStockinDetail" parameterType="CheckStockinDetail">
-        insert into check_stockin_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockCheckDetailId != null">stock_check_detail_id,</if>
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="orderId != null">order_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="orderId != null">#{orderId},</if>
-         </trim>
-    </insert>
-    <insert id="insertCheckStockinDetailHistory">
-        insert into check_stockin_detail_finish
-        select * from check_stockin_detail where stock_check_id = #{stockCheckId}
-    </insert>
-
-    <update id="updateCheckStockinDetail" parameterType="CheckStockinDetail">
-        update check_stockin_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where stock_check_detail_id = #{stockCheckDetailId}
-    </update>
-
-    <delete id="deleteCheckStockinDetailByStockCheckDetailId" parameterType="String">
-        delete from check_stockin_detail where stock_check_detail_id = #{stockCheckDetailId}
-    </delete>
-
-    <delete id="deleteCheckStockinDetailByStockCheckDetailIds" parameterType="String">
-        delete from check_stockin_detail where stock_check_detail_id in
-        <foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
-            #{stockCheckDetailId}
-        </foreach>
-    </delete>
-    <delete id="deleteCheckStockinDetailByStockinGuid">
-        delete from check_stockin_detail where stock_check_guid = #{stockCheckGuid}
-    </delete>
-
-    <select id="getCheckDetailById" parameterType="String" resultMap="CheckStockinDetailResult">
-        select * from check_stockin_detail where stock_check_id = #{stockCheckId}
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml
deleted file mode 100644
index 675d421..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper">
-
-    <resultMap type="CheckStockinFinish" id="CheckStockinFinishResult">
-        <result property="stockGuid"    column="stock_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="checkType"    column="check_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-    </resultMap>
-    <resultMap type="CheckStockin" id="CheckStockinResult">
-        <result property="stockGuid"    column="stock_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="checkType"    column="check_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-    </resultMap>
-    <sql id="selectCheckStockinVo">
-        select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5
-        from check_stockin_finish csf
-        left join bas_warehouse bw on bw.warehouse_id=  csf.warehouse_id
-    </sql>
-    <sql id="selectCheckStockinFinishVo">
-        select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
-    </sql>
-
-    <select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
-        <include refid="selectCheckStockinFinishVo"/>
-        <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="checkType != null  and checkType != ''"> and check_type like concat("%", #{checkType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectCheckStockinFinishByStockGuid" parameterType="String" resultMap="CheckStockinFinishResult">
-        <include refid="selectCheckStockinFinishVo"/>
-        where stock_guid = #{stockGuid}
-    </select>
-    <select id="selectCheckStockinList" resultMap="CheckStockinResult">
-        <include refid="selectCheckStockinVo"/>
-        <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="checkType != null  and checkType != ''"> and check_type like concat("%", #{checkType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and csf.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by cs.create_date asc
-    </select>
-
-    <insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
-        insert into check_stockin_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockGuid != null">stock_guid,</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
-            <if test="checkType != null and checkType != ''">check_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockGuid != null">#{stockGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
-            <if test="checkType != null and checkType != ''">#{checkType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCheckStockinFinish" parameterType="CheckStockinFinish">
-        update check_stockin_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
-            <if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-        </trim>
-        where stock_guid = #{stockGuid}
-    </update>
-
-    <delete id="deleteCheckStockinFinishByStockGuid" parameterType="String">
-        delete from check_stockin_finish where stock_guid = #{stockGuid}
-    </delete>
-
-    <delete id="deleteCheckStockinFinishByStockGuids" parameterType="String">
-        delete from check_stockin_finish where stock_guid in
-        <foreach item="stockGuid" collection="array" open="(" separator="," close=")">
-            #{stockGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml
deleted file mode 100644
index 7028bf3..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.stockcheck.mapper.CheckStockinMapper">
-
-    <resultMap type="CheckStockin" id="CheckStockinResult">
-        <result property="stockGuid"    column="stock_guid"    />
-        <result property="stockCheckId"    column="stock_check_id"    />
-        <result property="checkType"    column="check_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="departmentName"    column="department_name"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-    </resultMap>
-
-    <sql id="selectCheckStockinVo">
-        select cs.stock_guid,
-               cs.stock_check_id,
-               cs.check_type,
-               cs.create_date,
-               cs.create_man_id,
-               cs.status,
-               cs.warehouse_id,
-               cs.finish_date,
-               cs.erp_bill,
-               cs.stock_source,
-               cs.department_no,
-               cs.customer_no,
-               cs.class_no,
-               cs.supplier_no,
-               cs.spare1,
-               cs.spare2,
-               cs.spare3,
-               cs.spare4,
-               cs.spare5,
-               bw.warehouse_name,
-               sd.dept_name as department_name
-        from check_stockin cs
-                 left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
-                 left join sys_dept sd on cs.department_no = sd.dept_id
-    </sql>
-
-    <select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
-        <include refid="selectCheckStockinVo"/>
-        <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and cs.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
-            <if test="checkType != null  and checkType != ''"> and cs.check_type like concat("%", #{checkType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and cs.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and cs.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and cs.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and cs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and cs.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and cs.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and cs.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and cs.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and cs.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and cs.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and cs.supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and cs.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and cs.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and cs.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and cs.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and cs.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-             order by cs.create_date asc
-    </select>
-
-    <select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult">
-        <include refid="selectCheckStockinVo"/>
-        where stock_guid = #{stockGuid}
-    </select>
-    <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
-        {
-            call proc_check_auto_allocation(
-                #{v_stock_check_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-                 )
-            }
-    </select>
-
-    <insert id="insertCheckStockin" parameterType="CheckStockin">
-        insert into check_stockin
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockGuid != null">stock_guid,</if>
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
-            <if test="checkType != null and checkType != ''">check_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockGuid != null">#{stockGuid},</if>
-            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
-            <if test="checkType != null and checkType != ''">#{checkType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-         </trim>
-    </insert>
-    <insert id="insertCheckStockinHistory">
-        insert into check_stockin_finish
-        select * from check_stockin  where stock_guid = #{stockGuid}
-    </insert>
-
-    <update id="updateCheckStockin" parameterType="CheckStockin">
-        update check_stockin
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
-            <if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-        </trim>
-        where stock_guid = #{stockGuid}
-    </update>
-
-    <delete id="deleteCheckStockinByStockGuid" parameterType="String">
-        delete from check_stockin where stock_guid = #{stockGuid}
-    </delete>
-
-    <delete id="deleteCheckStockinByStockGuids" parameterType="String">
-        delete from check_stockin where stock_guid in
-        <foreach item="stockGuid" collection="array" open="(" separator="," close=")">
-            #{stockGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml
deleted file mode 100644
index 52a7b9e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockinback.mapper.InStockinBackMapper">
-    
-    <resultMap type="InStockinBack" id="InStockinBackResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="sendStatus"    column="send_status"/>
-        <result property="sendTime"   column="send_time"/>
-        <result property="msg"     column="msg"/>
-        <result property="companyShortName"     column="company_short_name"/>
-        <result property="accountSetNo"     column="account_set_no"/>
-    </resultMap>
-
-    <sql id="selectInStockinBackVo">
-        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id,
-               spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no,
-               customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back
-    </sql>
-
-    <select id="selectInStockinBackList" parameterType="InStockinBack" resultMap="InStockinBackResult">
-        <include refid="selectInStockinBackVo"/>
-        <where>  
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
-            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectInStockinBackByStockinGuid" parameterType="String" resultMap="InStockinBackResult">
-        <include refid="selectInStockinBackVo"/>
-        where stockin_guid = #{stockinGuid}
-    </select>
-
-    <insert id="insertInStockinBack" parameterType="InStockinBack">
-        insert into in_stockin_back
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="sendStatus != null">send_status,</if>
-            <if test="sendTime != null">send_time,</if>
-            <if test="msg != null">msg,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="sendStatus != null">#{sendStatus},</if>
-            <if test="sendTime != null">#{sendTime},</if>
-            <if test="msg != null">#{msg},</if>
-         </trim>
-    </insert>
-
-    <insert id="insertInStockinBackById" parameterType="InStockin" >
-        insert into in_stockin_back
-        select * from in_stockin where stockin_guid = #{stockinGuid}
-    </insert>
-
-    <update id="updateInStockinBack" parameterType="InStockinBack">
-        update in_stockin_back
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="sendStatus != null">send_status = #{sendStatus},</if>
-            <if test="sendTime != null">send_time = #{sendTime},</if>
-            <if test="msg != null">msg = #{msg},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteInStockinBackByStockinGuid" parameterType="String">
-        delete from in_stockin_back where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteInStockinBackByStockinGuids" parameterType="String">
-        delete from in_stockin_back where stockin_guid in 
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-
-    <select id="selectTopInStockin" resultMap="InStockinBackResult">
-        select top(1) *
-        from in_stockin_back where send_status= 0 and stock_source =1
-
-    </select>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml
deleted file mode 100644
index 4a7495f..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockindeatilback.mapper.InStockinDetailBackMapper">
-    
-    <resultMap type="InStockinDetailBack" id="InStockinDetailBackResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="productName"    column="product_name"    />
-        <result property="sendStatus"    column="send_status"/>
-        <result property="sendTime"   column="send_time"/>
-        <result property="msg"     column="msg"/>
-        <result property="sourceLineId"     column="source_line_id"/>
-        <result property="barCode"     column="bar_code"/>
-        <result property="isBatchManage"     column="is_batch_manage"/>
-        <result property="oldProjectNo"     column="old_project_no"/>
-    </resultMap>
-
-    <sql id="selectInStockinDetailBackVo">
-        select stockin_detail_id,
-               stockin_guid,
-               stockin_id,
-               lot_no,
-               product_guid,
-               product_id,
-               quantity,
-               quantity_x,
-               quantity_j,
-               price,
-               cargo_no,
-               remark,
-               assign_num,
-               assign_num_x,
-               assign_num_j,
-               print_date,
-               stock_status,
-               supplier_id,
-               customer_id,
-               unit,
-               spec,
-               spare1,
-               spare2,
-               spare3,
-               spare4,
-               spare5,
-               spare6,
-               scan_num,
-               scan_num_x,
-               scan_num_j,
-               spare7,
-               spare8,
-               spare9,
-               product_name,
-               send_status,
-               send_time,
-               msg,
-               source_line_id,
-               bar_code,
-               is_batch_manage,
-               old_project_no
-        from in_stockin_detail_back
-    </sql>
-
-    <select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">
-        <include refid="selectInStockinDetailBackVo"/>
-        <where>  
-            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat("%", #{spare9}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
-            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectInStockinDetailBackByStockinDetailId" parameterType="String" resultMap="InStockinDetailBackResult">
-        <include refid="selectInStockinDetailBackVo"/>
-        where stockin_detail_id = #{stockinDetailId}
-    </select>
-
-    <insert id="insertInStockinDetailBack" parameterType="InStockinDetailBack">
-        insert into in_stockin_detail_back
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="sendStatus != null">send_status,</if>
-            <if test="sendTime != null">send_time,</if>
-            <if test="msg != null">msg,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="sendStatus != null">#{sendStatus},</if>
-            <if test="sendTime != null">#{sendTime},</if>
-            <if test="msg != null">#{msg},</if>
-         </trim>
-    </insert>
-
-
-    <insert id="insertInStockinDetailBackById" parameterType="InStockin">
-        insert into in_stockin_detail_back
-        select * from in_stockin_detail where stockin_guid = #{stockinGuid}
-    </insert>
-
-    <update id="updateInStockinDetailBack" parameterType="InStockinDetailBack">
-        update in_stockin_detail_back
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
-
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="sendStatus != null">send_status = #{sendStatus},</if>
-            <if test="sendTime != null">send_time = #{sendTime},</if>
-            <if test="msg != null">msg = #{msg},</if>
-        </trim>
-        where stockin_id = #{stockinId}
-    </update>
-
-    <delete id="deleteInStockinDetailBackByStockinDetailId" parameterType="String">
-        delete from in_stockin_detail_back where stockin_detail_id = #{stockinDetailId}
-    </delete>
-
-    <delete id="deleteInStockinDetailBackByStockinDetailIds" parameterType="String">
-        delete from in_stockin_detail_back where stockin_detail_id in 
-        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
-            #{stockinDetailId}
-        </foreach>
-    </delete>
-
-    <insert id="insertInStockInDetailBackFinish" parameterType="java.util.List">
-        INSERT INTO in_stockin_detail_back_finish
-        <foreach collection="list" item="item" separator="UNION ALL">
-            SELECT * FROM in_stockin_detail_back
-            WHERE stockin_detail_id = #{item.stockinDetailId}
-        </foreach>
-    </insert>
-
-    <delete id="deleteInStockInDetailList">
-        DELETE FROM in_stockin_detail_back
-        WHERE stockin_detail_id IN
-        <foreach collection="idList" item="item" open="(" separator="," close=")">
-            #{item.stockinDetailId}
-        </foreach>
-    </delete>
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml
deleted file mode 100644
index dcf74ec..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper">
-
-    <resultMap type="InStockinDetailFinish" id="InStockinDetailFinishResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-
-    </resultMap>
-    <resultMap type="InStockinDetail" id="InStockinDetailResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="productName"    column="product_name"    />
-
-        <!--<association property="extraField" javaType="ExtraField">
-            <result property="productId"    column="product_id"    />
-            <result property="materialDesc"    column="product_name"    />
-            <result property="englishDesc"    column="englishDesc"    />
-            <result property="length"    column="length"    />
-            <result property="width"    column="width"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>-->
-    </resultMap>
-    <sql id="selectInStockinDetailFinishVo">
-        select
-            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
-            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
-            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
-            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
-            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
-            isd.product_name,
-            isd.spare7,isd.spare8,isd.spare9
-        from in_stockin_detail_finish isd
-                 left join bas_product bp on bp.product_id = isd.product_id
-    </sql>
-
-    <select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
-        <include refid="selectInStockinDetailFinishVo"/>
-        <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectInStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="InStockinDetailFinishResult">
-        <include refid="selectInStockinDetailFinishVo"/>
-        where stockin_detail_id = #{stockinDetailId}
-    </select>
-    <select id="selectInStockinDetailFinishListByInStockinDetail"
-            resultMap="InStockinDetailResult">
-        <include refid="selectInStockinDetailFinishVo"/>
-        <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-        </where>
-    </select>
-
-    <insert id="insertInStockinDetailFinish" parameterType="InStockinDetailFinish">
-        insert into in_stockin_detail_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-         </trim>
-    </insert>
-
-    <update id="updateInStockinDetailFinish" parameterType="InStockinDetailFinish">
-        update in_stockin_detail_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-        </trim>
-        where stockin_detail_id = #{stockinDetailId}
-    </update>
-
-    <delete id="deleteInStockinDetailFinishByStockinDetailId" parameterType="String">
-        delete from in_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
-    </delete>
-
-    <delete id="deleteInStockinDetailFinishByStockinDetailIds" parameterType="String">
-        delete from in_stockin_detail_finish where stockin_detail_id in
-        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
-            #{stockinDetailId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml
deleted file mode 100644
index b1bcc7f..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper">
-
-    <resultMap type="InStockinDetail" id="InStockinDetailResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="productName"    column="product_name"    />
-<!--        <association property="extraField" javaType="ExtraField">-->
-<!--            <result property="productId"    column="product_id"    />-->
-<!--            <result property="materialDesc"    column="product_name"    />-->
-<!--            <result property="englishDesc"    column="englishDesc"    />-->
-<!--            <result property="length"    column="length"    />-->
-<!--            <result property="width"    column="width"    />-->
-<!--            <result property="height"    column="height"    />-->
-<!--            <result property="volume"    column="volume"    />-->
-<!--            <result property="netWeight"    column="netWeight"    />-->
-<!--        </association>-->
-    </resultMap>
-
-    <sql id="selectInStockinDetailVo">
-        select
-            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
-            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
-            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
-            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
-            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
-            isd.product_name,
-            isd.spare7,isd.spare8,isd.spare9
-        from in_stockin_detail isd
-        left join bas_product bp on bp.product_id = isd.product_id
-    </sql>
-
-    <select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
-        <include refid="selectInStockinDetailVo"/>
-        <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
-        <include refid="selectInStockinDetailVo"/>
-        where stockin_detail_id = #{stockinDetailId}
-    </select>
-
-    <insert id="insertInStockinDetail" parameterType="InStockinDetail">
-        insert into in_stockin_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="sourceLineId != null">source_line_id,</if>
-            <if test="barCode != null">bar_code,</if>
-            <if test="isBatchManage != null">is_batch_manage,</if>
-            <if test="oldProjectNo != null">old_project_no,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-            <if test="productName != null">#{productName},</if>
-
-            <if test="sourceLineId != null">#{sourceLineId},</if>
-            <if test="barCode != null">#{barCode},</if>
-            <if test="isBatchManage != null">#{isBatchManage},</if>
-            <if test="oldProjectNo != null">#{oldProjectNo},</if>
-
-        </trim>
-    </insert>
-    <insert id="insertInStockinDetailList">
-        INSERT INTO in_stockin_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <!-- 动态选择字段 -->
-            <if test="list[0].stockinDetailId != null">stockin_detail_id,</if>
-            <if test="list[0].stockinGuid != null and list[0].stockinGuid != ''">stockin_guid,</if>
-            <if test="list[0].stockinId != null and list[0].stockinId != ''">stockin_id,</if>
-            <if test="list[0].lotNo != null and list[0].lotNo != ''">lot_no,</if>
-            <if test="list[0].productGuid != null">product_guid,</if>
-            <if test="list[0].productId != null and list[0].productId != ''">product_id,</if>
-            <if test="list[0].quantity != null">quantity,</if>
-            <if test="list[0].quantityX != null">quantity_x,</if>
-            <if test="list[0].quantityJ != null">quantity_j,</if>
-            <if test="list[0].price != null">price,</if>
-            <if test="list[0].cargoNo != null">cargo_no,</if>
-            <if test="list[0].remark != null">remark,</if>
-            <if test="list[0].assignNum != null">assign_num,</if>
-            <if test="list[0].assignNumX != null">assign_num_x,</if>
-            <if test="list[0].assignNumJ != null">assign_num_j,</if>
-            <if test="list[0].printDate != null">print_date,</if>
-            <if test="list[0].stockStatus != null">stock_status,</if>
-            <if test="list[0].supplierId != null">supplier_id,</if>
-            <if test="list[0].customerId != null">customer_id,</if>
-            <if test="list[0].unit != null">unit,</if>
-            <if test="list[0].spec != null">spec,</if>
-            <if test="list[0].spare1 != null">spare1,</if>
-            <if test="list[0].spare2 != null">spare2,</if>
-            <if test="list[0].spare3 != null">spare3,</if>
-            <if test="list[0].spare4 != null">spare4,</if>
-            <if test="list[0].spare5 != null">spare5,</if>
-            <if test="list[0].spare6 != null">spare6,</if>
-            <if test="list[0].scanNum != null">scan_num,</if>
-            <if test="list[0].scanNumX != null">scan_num_x,</if>
-            <if test="list[0].scanNumJ != null">scan_num_j,</if>
-        </trim>
-
-        <!-- values 部分：遍历列表插入多行 -->
-        VALUES
-        <foreach collection="list" item="item" separator=",">
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="item.stockinDetailId != null">#{item.stockinDetailId},</if>
-                <if test="item.stockinGuid != null and item.stockinGuid != ''">#{item.stockinGuid},</if>
-                <if test="item.stockinId != null and item.stockinId != ''">#{item.stockinId},</if>
-                <if test="item.lotNo != null and item.lotNo != ''">#{item.lotNo},</if>
-                <if test="item.productGuid != null">#{item.productGuid},</if>
-                <if test="item.productId != null and item.productId != ''">#{item.productId},</if>
-                <if test="item.quantity != null">#{item.quantity},</if>
-                <if test="item.quantityX != null">#{item.quantityX},</if>
-                <if test="item.quantityJ != null">#{item.quantityJ},</if>
-                <if test="item.price != null">#{item.price},</if>
-                <if test="item.cargoNo != null">#{item.cargoNo},</if>
-                <if test="item.remark != null">#{item.remark},</if>
-                <if test="item.assignNum != null">#{item.assignNum},</if>
-                <if test="item.assignNumX != null">#{item.assignNumX},</if>
-                <if test="item.assignNumJ != null">#{item.assignNumJ},</if>
-                <if test="item.printDate != null">#{item.printDate},</if>
-                <if test="item.stockStatus != null">#{item.stockStatus},</if>
-                <if test="item.supplierId != null">#{item.supplierId},</if>
-                <if test="item.customerId != null">#{item.customerId},</if>
-                <if test="item.unit != null">#{item.unit},</if>
-                <if test="item.spec != null">#{item.spec},</if>
-                <if test="item.spare1 != null">#{item.spare1},</if>
-                <if test="item.spare2 != null">#{item.spare2},</if>
-                <if test="item.spare3 != null">#{item.spare3},</if>
-                <if test="item.spare4 != null">#{item.spare4},</if>
-                <if test="item.spare5 != null">#{item.spare5},</if>
-                <if test="item.spare6 != null">#{item.spare6},</if>
-                <if test="item.scanNum != null">#{item.scanNum},</if>
-                <if test="item.scanNumX != null">#{item.scanNumX},</if>
-                <if test="item.scanNumJ != null">#{item.scanNumJ},</if>
-            </trim>
-        </foreach>
-    </insert>
-    <insert id="insertInStockinDetailHistory">
-        insert into in_stockin_detail_finish
-        select * from in_stockin_detail where stockin_guid = #{stockinGuid}
-    </insert>
-
-    <update id="updateInStockinDetail" parameterType="InStockinDetail">
-        update in_stockin_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-        </trim>
-        where stockin_detail_id = #{stockinDetailId}
-    </update>
-
-    <delete id="deleteInStockinDetailByStockinDetailId" parameterType="String">
-        delete from in_stockin_detail where stockin_detail_id = #{stockinDetailId}
-    </delete>
-
-    <delete id="deleteInStockinDetailByStockinDetailIds" parameterType="String">
-        delete from in_stockin_detail where stockin_detail_id in
-        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
-            #{stockinDetailId}
-        </foreach>
-    </delete>
-    <delete id="deleteInStockinDetailByStockinGuid">
-        delete from in_stockin_detail where stockin_guid = #{stockinGuid}
-    </delete>
-    <select id="selectStockinByDetailById" parameterType="InstockinDetail" resultMap="InStockinDetailResult">
-        select
-            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
-            isd.product_id, isd.quantity-isd.scan_num as quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
-            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
-            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
-            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
-            bp.product_name, bp.spare1 as englishDesc,
-            bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,ist.warehouse_id
-            from in_stockin_detail isd
-            left join bas_product bp on bp.product_id = isd.product_id
-        left join in_stockin ist on ist.stockin_guid = isd.stockin_guid
-        left join bas_warehouse bw on bw.warehouse_id = ist.warehouse_id
-        <where>
-        <if  test="stockinDetailId != null and stockinDetailId != '' ">
-            isd.stockin_detail_id = #{stockinDetailId}
-        </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by ist.create_date desc
-    </select>
-
-
-    <select id="selectStockInByDetailByBarCode" parameterType="string" resultType="com.ruoyi.in.stockindetail.domain.InStockinDetail">
-        select a.erp_bill,b.* from in_stockin a left join in_stockin_detail b on a.stockin_id=b.stockin_id where b.bar_code=#{barCode}
-
-
-    </select>
-
-
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml
deleted file mode 100644
index 95b6a7e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper">
-
-    <resultMap type="InStockinFinish" id="InStockinFinishResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-    </resultMap>
-
-    <resultMap type="InStockin" id="InStockinResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createManName"    column="user_name"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="departmentName"    column="dept_name"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare5"    column="spare5"    />
-    </resultMap>
-
-    <sql id="selectInStockinFinishVo">
-        select is2.stockin_guid,
-               is2.stockin_id,
-               is2.in_type,
-               is2.create_date,
-               is2.create_man_id,
-               is2.status,
-               is2.warehouse_id,
-               is2.finish_date,
-               is2.erp_bill,
-               is2.stock_source,
-               is2.department_no,
-               is2.customer_no,
-               is2.class_no,
-               is2.supplier_no,
-               is2.spare1,
-               is2.spare2,
-               is2.spare4,
-               is2.spare3,
-               is2.spare5,
-               bw.warehouse_name
---                bs.supplier_name,
---                sd.dept_name ,
---                su.user_name
-        from in_stockin_finish is2
-                 left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
---                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
---                  left join sys_dept sd on is2.department_no = sd.dept_id
---                  left join sys_user su on su.user_id = is2.create_man_id
-                 </sql>
-
-    <select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
-        <include refid="selectInStockinFinishVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectInStockinFinishByStockinGuid" parameterType="String" resultMap="InStockinFinishResult">
-        <include refid="selectInStockinFinishVo"/>
-        where is2.stockin_guid = #{stockinGuid}
-    </select>
-
-    <select id="selectInStockinFinishByStockinId" parameterType="String" resultMap="InStockinFinishResult">
-        <include refid="selectInStockinFinishVo"/>
-        where is2.stockin_id = #{stockinId}
-    </select>
-
-
-    <select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
-        <include refid="selectInStockinFinishVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="materialDesc !=null and materialDesc!=''">
-                and is2.stockin_id in (
-                select distinct stockin_id from in_stockin_detail_finish isd
-                left join bas_product bp on isd.product_id = bp.product_id
-                where isd.product_name like concat('%',#{materialDesc},'%')
-                )
-            </if>
-            <if test="lotNo !=null and lotNo!=''">
-                and is2.stockin_id in (
-                select distinct stockin_id from in_stockin_detail_finish
-                where lot_no like concat('%',#{lotNo},'%')
-                )
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by is2.create_date desc
-    </select>
-
-    <insert id="insertInStockinFinish" parameterType="InStockinFinish">
-        insert into in_stockin_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-         </trim>
-    </insert>
-
-    <update id="updateInStockinFinish" parameterType="InStockinFinish">
-        update in_stockin_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteInStockinFinishByStockinGuid" parameterType="String">
-        delete from in_stockin_finish where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteInStockinFinishByStockinGuids" parameterType="String">
-        delete from in_stockin_finish where stockin_guid in
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml
deleted file mode 100644
index 46bcaff..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.stockin.mapper.InStockinMapper">
-
-    <resultMap type="InStockin" id="InStockinResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createManName"    column="user_name"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="departmentName"    column="dept_name"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare5"    column="spare5"    />
-    </resultMap>
-
-    <sql id="selectInStockinVo">
-        select is2.stockin_guid,
-               is2.stockin_id,
-               is2.in_type,
-               is2.create_date,
-               is2.create_man_id,
-               is2.status,
-               is2.warehouse_id,
-               is2.finish_date,
-               is2.erp_bill,
-               is2.stock_source,
-               is2.department_no,
-               is2.customer_no,
-               is2.class_no,
-               is2.supplier_no,
-               is2.spare1,
-               is2.spare2,
-               is2.spare4,
-               is2.spare3,
-               is2.spare5,
-               bw.warehouse_name
-        from in_stockin is2
-                 left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
---                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
---                  left join sys_dept sd on is2.department_no = sd.dept_id
---                  left join sys_user su on su.user_id = is2.create_man_id
-    </sql>
-
-    <select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
-        <include refid="selectInStockinVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="startDate != null  and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
-            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
-            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="materialDesc !=null and materialDesc!=''">
-                and is2.stockin_id in (
-                select distinct stockin_id from in_stockin_detail isd
-                left join bas_product bp on isd.product_id = bp.product_id
-                where isd.product_name like concat('%',#{materialDesc},'%')
-                )
-            </if>
-            <if test="lotNo !=null and lotNo!=''">
-                and is2.stockin_id in (
-                select distinct stockin_id from in_stockin_detail
-                where lot_no like concat('%',#{lotNo},'%')
-                )
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-            <if test="typeData != null and typeData.size()>0">
-                and bw.warehouse_type in
-                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-             order by is2.create_date desc
-    </select>
-
-    <select id="selectInStockinByStockinGuid" parameterType="String" resultMap="InStockinResult">
-        <include refid="selectInStockinVo"/>
-        where is2.stockin_guid = #{stockinGuid}
-    </select>
-
-    <select id="selectInStockinByStockinId" parameterType="String" resultMap="InStockinResult">
-        <include refid="selectInStockinVo"/>
-        where is2.stockin_id = #{stockinId}
-    </select>
-
-    <insert id="insertInStockin" parameterType="InStockin">
-        insert into in_stockin
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="companyShortName != null">company_short_name,</if>
-            <if test="accountSetNo != null">account_set_no,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="companyShortName != null">#{companyShortName},</if>
-            <if test="accountSetNo != null">#{accountSetNo},</if>
-        </trim>
-    </insert>
-    <insert id="insertInStockinHistory">
-        insert into in_stockin_finish
-        select * from in_stockin where stockin_guid = #{stockinGuid}
-    </insert>
-
-    <update id="updateInStockin" parameterType="InStockin">
-        update in_stockin
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
-            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteInStockinByStockinGuid" parameterType="String">
-        delete from in_stockin where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteInStockinByStockinGuids" parameterType="String">
-        delete from in_stockin where stockin_guid in
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-
-     <select id="selectStockinByDetail" parameterType="string" resultMap="InStockinResult">
-         select distinct is2.stockin_guid,
-         is2.stockin_id,
-         is2.in_type,
-         is2.create_date,
-         is2.create_man_id,
-         is2.status,
-         is2.warehouse_id,
-         is2.finish_date,
-         is2.erp_bill,
-         is2.stock_source,
-         is2.department_no,
-         is2.customer_no,
-         is2.class_no,
-         is2.supplier_no,
-         is2.spare1,
-         is2.spare2,
-         is2.spare4,
-         is2.spare3,
-         is2.spare5,
-         bw.warehouse_name,
-         bs.supplier_name,
-         sd.dept_name ,
-         su.user_name
-         from in_stockin is2
-         left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
-         left join bas_supplier bs on bs.supplier_no = is2.supplier_no
-         left join sys_dept sd on is2.department_no = sd.dept_id
-         left join sys_user su on su.user_id = is2.create_man_id
-         left join in_stockin_detail isd on isd.stockin_id = is2.stockin_id
-         <where>
-             <if  test="stockinDetailId != null and stockinDetailId !=''">  stockin_detail_id=#{stockinDetailId}</if>
-         </where>
-     </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml
deleted file mode 100644
index 52e9970..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.erp.mapper.TransferBillCallbackMapper">
-    
-    <resultMap type="TransferBillCallback" id="TransferBillCallbackResult">
-        <result property="id"    column="id"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="type"    column="type"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectTransferBillCallbackVo">
-        select id, job_id, erp_bill, type, status, create_time, finish_time, spare1, spare2, spare3 from transfer_bill_callback
-    </sql>
-
-    <select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
-        <include refid="selectTransferBillCallbackVo"/>
-        <where>  
-            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectTransferBillCallbackById" parameterType="Long" resultMap="TransferBillCallbackResult">
-        <include refid="selectTransferBillCallbackVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTransferBillCallback" parameterType="TransferBillCallback" useGeneratedKeys="true" keyProperty="id">
-        insert into transfer_bill_callback
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobId != null">job_id,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="type != null">type,</if>
-            <if test="status != null">status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobId != null">#{jobId},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="type != null">#{type},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTransferBillCallback" parameterType="TransferBillCallback">
-        update transfer_bill_callback
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTransferBillCallbackById" parameterType="Long">
-        delete from transfer_bill_callback where id = #{id}
-    </delete>
-
-    <delete id="deleteTransferBillCallbackByIds" parameterType="String">
-        delete from transfer_bill_callback where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml
deleted file mode 100644
index 74cf270..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.index.mapper.BillStatusCountMapper">
-    
-    <resultMap type="com.ruoyi.index.domain.BillStatusCount" id="BillStatusCountResult">
-        <result property="id" column="id"/>
-        <result property="status" column="status"/>
-        <result property="type" column="type"/>
-    </resultMap>
-
-    <select id="selectStockinStatusCount" resultMap="BillStatusCountResult">
-        select stockin_id as id, status, '1' as type
-        from in_stockin
-        where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
-    </select>
-
-    <select id="selectStockoutStatusCount" resultMap="BillStatusCountResult">
-        select stockout_id as id, status, '2' as type
-        from out_stockout
-        where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
-    </select>
-
-    <select id="selectStockcheckStatusCount" resultMap="BillStatusCountResult">
-        select stock_check_id as id, status, '3' as type
-        from check_stockin
-        where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml
deleted file mode 100644
index 5263856..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.index.mapper.CargoSpaceCountMapper">
-
-    <select id="selectStatusCount" resultType="java.util.Map">
-        SELECT status, COUNT(*) as count
-        FROM bas_cargo_space
-        WHERE status IN ('1', '2', '3', '4', '5', '6')
-            ${params.warehouseDataScope}
-        GROUP BY status
-        ORDER BY status
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml
deleted file mode 100644
index 78a4fe9..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.index.mapper.IndexCountMapper">
-    
-    <!-- 查询已完成入库单数量 -->
-    <select id="selectStockinFinishCount" resultType="Integer">
-        select count(1) from in_stockin_finish
-        where 1=1
-        ${params.warehouseDataScope}
-    </select>
-    
-    <!-- 查询已完成出库单数量 -->
-    <select id="selectStockoutFinishCount" resultType="Integer">
-        select count(1) from out_stockout_finish
-        where 1=1
-        ${params.warehouseDataScope}
-    </select>
-    
-    <!-- 查询已完成盘点单数量 -->
-    <select id="selectStockcheckFinishCount" resultType="Integer">
-        select count(1) from check_stockin_finish
-        where 1=1
-        ${params.warehouseDataScope}
-    </select>
-    
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml
deleted file mode 100644
index 11eb6df..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.index.mapper.ViewIndexJobMapper">
-    
-    <resultMap type="ViewIndexJob" id="ViewIndexJobResult">
-        <result property="jobId" column="job_id" />
-        <result property="status" column="status" />
-        <result property="statusLabel" column="status_label" />
-        <result property="inOrOut" column="in_or_out" />
-        <result property="priority" column="priority" />
-    </resultMap>
-
-    <select id="selectViewIndexJobByStatus" parameterType="String" resultMap="ViewIndexJobResult">
-        select 
-            job_id,
-            status,
-            status_label,
-            in_or_out,
-            priority
-        from view_index_job
-        ${params.warehouseDataScope}
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml
deleted file mode 100644
index 4af7e81..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.index.mapper.WeekJobCountMapper">
-
-    <!-- 查询指定日期范围内每天的入库作业数量 -->
-    <select id="selectInJobCounts" resultType="java.lang.Integer">
-        SELECT
-            COUNT(*) as count
-        FROM
-            mydo_job_finish
-        WHERE
-            in_or_out &lt; 20
-            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
-        GROUP BY
-            CAST(create_time AS DATE)
-        ORDER BY
-            CAST(create_time AS DATE)
-            ${baseEntity.params.warehouseDataScope}
-    </select>
-
-    <!-- 查询指定日期范围内每天的出库作业数量 -->
-    <select id="selectOutJobCounts" resultType="java.lang.Integer">
-        SELECT
-            COUNT(*) as count
-        FROM
-            mydo_job_finish
-        WHERE
-            in_or_out >= 20
-            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
-        GROUP BY
-            CAST(create_time AS DATE)
-        ORDER BY
-            CAST(create_time AS DATE)
-            ${baseEntity.params.warehouseDataScope}
-    </select>
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml
deleted file mode 100644
index b055c22..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper">
-
-    <resultMap type="MydoJobDetail" id="MydoJobDetailFinishResult">
-        <result property="jobDetailId"    column="job_detail_id"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="stockQuantity"    column="stock_quantity"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="layerQuantity"    column="layer_quantity"    />
-        <result property="outLayerQuantity"    column="out_layer_quantity"    />
-        <result property="giveNum"    column="give_num"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="pickQuantity"    column="pick_quantity"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="productName"    column="product_name"    />
-    </resultMap>
-
-
-    <select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
-        select mjd.job_detail_id,
-        mjd.job_id,
-        mjd.stock_id,
-        mjd.lot_no,
-        mjd.in_date,
-        mjd.in_or_out_id,
-        mjd.in_or_out_d_id,
-        mjd.product_guid,
-        mjd.product_id,
-        mjd.stock_status,
-        mjd.in_quantity,
-        mjd.stock_quantity,
-        mjd.out_quantity,
-        mjd.layer_quantity,
-        mjd.out_layer_quantity,
-        mjd.give_num,
-        mjd.stockin_id,
-        mjd.stacking_id,
-        mjd.exit_id,
-        mjd.print_date,
-        mjd.customer_id,
-        mjd.supplier_id,
-        mjd.spare1,
-        mjd.spare2,
-        mjd.spare3,
-        mjd.spare4,
-        mjd.stockin_detail_id,
-        mjd.pick_quantity,
-        bp.product_name,
-        mjd.spare5,
-        mjd.spare6,
-        mjd.spare7,
-        mjd.spare8,
-        mjd.spare9,
-        mjd.spec,
-        mjd.unit
-        from mydo_job_detail_finish mjd
-        left join bas_product bp on mjd.product_id = bp.product_id
-        <where>
-            <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat("%", #{jobDetailId}, "%")</if>
-            <if test="jobId != null and jobId != ''"> and mjd.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="stockId != null and stockId != ''"> and mjd.stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null and inDate != ''"> and mjd.in_date like concat("%", #{inDate}, "%")</if>
-            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
-            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and mjd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat("%", #{inQuantity}, "%")</if>
-            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat("%", #{stockQuantity}, "%")</if>
-            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat("%", #{layerQuantity}, "%")</if>
-            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat("%", #{outLayerQuantity}, "%")</if>
-            <if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat("%", #{giveNum}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="exitId != null and exitId != ''"> and mjd.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and mjd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and mjd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat("%", #{spare4}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectMydoJobDetailFinishListByJobId" parameterType="String" resultMap="MydoJobDetailFinishResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.stockin_detail_id,
-               mjd.pick_quantity,
-               mjd.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit
-        from mydo_job_detail_finish mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-        where job_id = #{jobId}
-    </select>
-
-    <select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.pick_quantity,
-               bp.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit
-        from mydo_job_detail_finish mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-        where job_detail_id = #{jobDetailId}
-    </select>
-
-    <insert id="insertMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
-        insert into mydo_job_detail_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="stockQuantity != null">stock_quantity,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="layerQuantity != null">layer_quantity,</if>
-            <if test="outLayerQuantity != null">out_layer_quantity,</if>
-            <if test="giveNum != null">give_num,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="stockQuantity != null">#{stockQuantity},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="layerQuantity != null">#{layerQuantity},</if>
-            <if test="outLayerQuantity != null">#{outLayerQuantity},</if>
-            <if test="giveNum != null">#{giveNum},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-         </trim>
-    </insert>
-
-    <update id="updateMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
-        update mydo_job_detail_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id = #{jobId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="layerQuantity != null">layer_quantity = #{layerQuantity},</if>
-            <if test="outLayerQuantity != null">out_layer_quantity = #{outLayerQuantity},</if>
-            <if test="giveNum != null">give_num = #{giveNum},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-        </trim>
-        where job_detail_id = #{jobDetailId}
-    </update>
-
-    <delete id="deleteMydoJobDetailFinishByJobDetailId" parameterType="String">
-        delete from mydo_job_detail_finish where job_detail_id = #{jobDetailId}
-    </delete>
-
-    <delete id="deleteMydoJobDetailFinishByJobDetailIds" parameterType="String">
-        delete from mydo_job_detail_finish where job_detail_id in
-        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
-            #{jobDetailId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml
deleted file mode 100644
index 79de6fc..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper">
-
-    <resultMap type="MydoJobDetail" id="MydoJobDetailResult">
-        <result property="jobDetailId"    column="job_detail_id"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="stockQuantity"    column="stock_quantity"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="layerQuantity"    column="layer_quantity"    />
-        <result property="outLayerQuantity"    column="out_layer_quantity"    />
-        <result property="giveNum"    column="give_num"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="pickQuantity"    column="pick_quantity"    />
-        <result property="pickQuantityReal"    column="pick_quantity_real"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="productName"    column="product_name"    />
-        <result property="trayCode"    column="tray_code"    />
-    </resultMap>
-
-    <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
-        select mjd.job_detail_id,
-        mjd.job_id,
-        mjd.stock_id,
-        mjd.lot_no,
-        mjd.in_date,
-        mjd.in_or_out_id,
-        mjd.in_or_out_d_id,
-        mjd.product_guid,
-        mjd.product_id,
-        mjd.stock_status,
-        mjd.in_quantity,
-        mjd.stock_quantity,
-        mjd.out_quantity,
-        mjd.layer_quantity,
-        mjd.out_layer_quantity,
-        mjd.give_num,
-        mjd.stockin_id,
-        mjd.stacking_id,
-        mjd.exit_id,
-        mjd.print_date,
-        mjd.customer_id,
-        mjd.supplier_id,
-        mjd.spare1,
-        mjd.spare2,
-        mjd.spare3,
-        mjd.spare4,
-        mjd.stockin_detail_id,
-        mjd.pick_quantity,
-        mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-        mjd.product_name,
-        mjd.spare5,
-        mjd.spare6,
-        mjd.spare7,
-        mjd.spare8,
-        mjd.spare9,
-        mjd.spec,
-        mjd.unit
-
-        from mydo_job_detail mjd
-        left join bas_product bp on mjd.product_id = bp.product_id
-        <where>
-            <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat("%", #{jobDetailId}, "%")</if>
-            <if test="jobId != null and jobId != ''"> and mjd.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="stockId != null and stockId != ''"> and mjd.stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null and inDate != ''"> and mjd.in_date like concat("%", #{inDate}, "%")</if>
-            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
-            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and mjd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat("%", #{inQuantity}, "%")</if>
-            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat("%", #{stockQuantity}, "%")</if>
-            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat("%", #{layerQuantity}, "%")</if>
-            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat("%", #{outLayerQuantity}, "%")</if>
-            <if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat("%", #{giveNum}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="exitId != null and exitId != ''"> and mjd.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and mjd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and mjd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat("%", #{spare4}, "%")</if>
-        </where>
-
-    </select>
-
-    <select id="selectMydoJobDetailByJobDetailId" parameterType="String" resultMap="MydoJobDetailResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               bp.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit
-
-        from mydo_job_detail mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-        where job_detail_id = #{jobDetailId}
-    </select>
-    <select id="selectMydoJobDetailListByJobId" resultMap="MydoJobDetailResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               bp.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit
-
-        from mydo_job_detail mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-        where mjd.job_id = #{jobId}
-    </select>
-
-    <insert id="insertMydoJobDetail" parameterType="MydoJobDetail">
-        insert into mydo_job_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="stockQuantity != null">stock_quantity,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="layerQuantity != null">layer_quantity,</if>
-            <if test="outLayerQuantity != null">out_layer_quantity,</if>
-            <if test="giveNum != null">give_num,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="pickQuantity != null">pick_quantity,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="stockQuantity != null">#{stockQuantity},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="layerQuantity != null">#{layerQuantity},</if>
-            <if test="outLayerQuantity != null">#{outLayerQuantity},</if>
-            <if test="giveNum != null">#{giveNum},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="pickQuantity != null">#{pick_quantity},</if>
-         </trim>
-    </insert>
-    <insert id="insertHistory">
-        insert into mydo_job_detail_finish select * from mydo_job_detail where job_id = #{jobId}
-    </insert>
-
-    <update id="updateMydoJobDetail" parameterType="MydoJobDetail">
-        update mydo_job_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id = #{jobId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="layerQuantity != null">layer_quantity = #{layerQuantity},</if>
-            <if test="outLayerQuantity != null">out_layer_quantity = #{outLayerQuantity},</if>
-            <if test="giveNum != null">give_num = #{giveNum},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="pickQuantity != null">pick_quantity = #{pickQuantity},</if>
-        </trim>
-        where job_detail_id = #{jobDetailId}
-    </update>
-
-    <delete id="deleteMydoJobDetailByJobDetailId" parameterType="String">
-        delete from mydo_job_detail where job_detail_id = #{jobDetailId}
-    </delete>
-
-    <delete id="deleteMydoJobDetailByJobDetailIds" parameterType="String">
-        delete from mydo_job_detail where job_detail_id in
-        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
-            #{jobDetailId}
-        </foreach>
-    </delete>
-    <delete id="deleteMydoJobDetailByJobId">
-        delete from mydo_job_detail where job_id = #{jobId}
-    </delete>
-
-    <select id="selectMydoJobDetailListByTrayCode" parameterType="MydoJob" resultMap="MydoJobDetailResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               mjd.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit,
-               mj.tray_code
-
-        from mydo_job_detail mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-        left join mydo_job mj on mjd.job_id = mj.job_id
-        where mj.tray_code=#{trayCode}
-        and mj.status='3'
-
-
-    </select>
-    <select id="selectPdMydoJobDetailListByExit" parameterType="MydoJob" resultMap="MydoJobDetailResult">
-        select mjd.job_detail_id,
-               mjd.job_id,
-               mjd.stock_id,
-               mjd.lot_no,
-               mjd.in_date,
-               mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
-               mjd.product_guid,
-               mjd.product_id,
-               mjd.stock_status,
-               mjd.in_quantity,
-               mjd.stock_quantity,
-               mjd.out_quantity,
-               mjd.layer_quantity,
-               mjd.out_layer_quantity,
-               mjd.give_num,
-               mjd.stockin_id,
-               mjd.stacking_id,
-               mjd.exit_id,
-               mjd.print_date,
-               mjd.customer_id,
-               mjd.supplier_id,
-               mjd.spare1,
-               mjd.spare2,
-               mjd.spare3,
-               mjd.spare4,
-               mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               bp.product_name,
-               mjd.spare5,
-               mjd.spare6,
-               mjd.spare7,
-               mjd.spare8,
-               mjd.spare9,
-               mjd.spec,
-               mjd.unit,
-               mj.tray_code
-
-        from mydo_job_detail mjd
-                 left join bas_product bp on mjd.product_id = bp.product_id
-                 left join mydo_job mj on mjd.job_id = mj.job_id
-        where mj.exit_id=#{exitId}
-          and mj.status='3'
-          and mj.execution_phase=2
-          and mj.in_or_out like concat("%", #{inOrOut}, "%")
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml
deleted file mode 100644
index 6c88e70..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper">
-
-    <resultMap type="MydoJob" id="MydoJobFinishResult">
-        <result property="jobId"    column="job_id"    />
-        <result property="status"    column="status"    />
-        <result property="onLineType"    column="on_line_type"    />
-        <result property="taskNo"    column="task_no"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="departmentId"    column="department_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="targetRoadwayId"    column="target_roadway_id"    />
-        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
-        <result property="lineId"    column="line_id"    />
-        <result property="workshopId"    column="workshop_id"    />
-        <result property="priority"    column="priority"    />
-        <result property="executionPhase"    column="execution_phase"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="classId"    column="class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="faultFlag"    column="fault_flag"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="targetCargoSpaceName"    column="target_cargo_space_name"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="departmentName"    column="dept_name"    />
-    </resultMap>
-
-
-    <sql id="selectMydoJobFinishVo">
-        select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
-               mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
-               mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
-               mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
-               mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
-               bs.supplier_name as supplier_name, bc.customer_name as customer_name,
-               bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
-               bw.warehouse_name as warehouse_name,sd.dept_name
-        from mydo_job_finish mj
-                 left join bas_supplier bs on mj.supplier_id = bs.id
-                 left join bas_customer bc on mj.customer_id = bc.id
-                 left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
-                 left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
-                 left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-                 left join sys_dept sd on mj.department_id = sd.dept_id
-    </sql>
-
-    <select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
-        <include refid="selectMydoJobFinishVo"/>
-        <where>
-            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat("%", #{lineId}, "%")</if>
-            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
-            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
-            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat("%", #{entranceId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
-            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
-            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
-            <if test = "inOutIds !=null and inOutIds.size() > 0">
-                and mj.in_or_out in
-                <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-
-
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by mj.create_time desc
-    </select>
-
-    <select id="selectMydoJobFinishListByMydoJob" parameterType="MydoJob" resultMap="MydoJobFinishResult">
-        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
-        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
-        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
-        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
-        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
-        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
-        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
-        bw.warehouse_name as warehouse_name
-        from mydo_job_finish mj
-        left join bas_supplier bs on mj.supplier_id = bs.id
-        left join bas_customer bc on mj.customer_id = bc.id
-        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
-        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
-        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
-
-        <where>
-            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
-            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
-            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
-            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat("%", #{entranceId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(28)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
-            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
-            order by mj.create_time desc
-        </where>
-
-    </select>
-
-    <select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">
-        <include refid="selectMydoJobFinishVo"/>
-        where mj.job_id = #{jobId}
-    </select>
-
-    <insert id="insertMydoJobFinish" parameterType="MydoJobFinish">
-        insert into mydo_job_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="onLineType != null">on_line_type,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="departmentId != null">department_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="targetRoadwayId != null">target_roadway_id,</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
-            <if test="lineId != null">line_id,</if>
-            <if test="workshopId != null">workshop_id,</if>
-            <if test="priority != null">priority,</if>
-            <if test="executionPhase != null">execution_phase,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="entranceId != null">entrance_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="classId != null">class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="faultFlag != null">fault_flag,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="onLineType != null">#{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="departmentId != null">#{departmentId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
-            <if test="lineId != null">#{lineId},</if>
-            <if test="workshopId != null">#{workshopId},</if>
-            <if test="priority != null">#{priority},</if>
-            <if test="executionPhase != null">#{executionPhase},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="entranceId != null">#{entranceId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="classId != null">#{classId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="faultFlag != null">#{faultFlag},</if>
-         </trim>
-    </insert>
-
-    <update id="updateMydoJobFinish" parameterType="MydoJobFinish">
-        update mydo_job_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="onLineType != null">on_line_type = #{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="departmentId != null">department_id = #{departmentId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
-            <if test="lineId != null">line_id = #{lineId},</if>
-            <if test="workshopId != null">workshop_id = #{workshopId},</if>
-            <if test="priority != null">priority = #{priority},</if>
-            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="classId != null">class_id = #{classId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
-        </trim>
-        where job_id = #{jobId}
-    </update>
-
-    <delete id="deleteMydoJobFinishByJobId" parameterType="String">
-        delete from mydo_job_finish where job_id = #{jobId}
-    </delete>
-
-    <delete id="deleteMydoJobFinishByJobIds" parameterType="String">
-        delete from mydo_job_finish where job_id in
-        <foreach item="jobId" collection="array" open="(" separator="," close=")">
-            #{jobId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml
deleted file mode 100644
index f5d0891..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.job.mydojob.mapper.MydoJobMapper">
-
-    <resultMap type="MydoJob" id="MydoJobResult">
-        <result property="jobId"    column="job_id"    />
-        <result property="status"    column="status"    />
-        <result property="onLineType"    column="on_line_type"    />
-        <result property="taskNo"    column="task_no"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="departmentId"    column="department_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="targetRoadwayId"    column="target_roadway_id"    />
-        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
-        <result property="lineId"    column="line_id"    />
-        <result property="workshopId"    column="workshop_id"    />
-        <result property="priority"    column="priority"    />
-        <result property="executionPhase"    column="execution_phase"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="classId"    column="class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="faultFlag"    column="fault_flag"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="targetCargoSpaceName"    column="target_cargo_space_name"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-
-    </resultMap>
-
-    <sql id="selectMydoJobVo">
-        select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
-               mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
-               mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
-               mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
-               mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
-               bs.supplier_name as supplier_name, bc.customer_name as customer_name,
-               bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
-               bw.warehouse_name as warehouse_name
-        from mydo_job mj
-        left join bas_supplier bs on mj.supplier_id = bs.id
-        left join bas_customer bc on mj.customer_id = bc.id
-        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
-        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
-        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-
-
-    </sql>
-
-    <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
-        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
-        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
-        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
-        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
-        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
-        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
-        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
-        bw.warehouse_name as warehouse_name
-        from mydo_job mj
-        left join bas_supplier bs on mj.supplier_id = bs.id
-        left join bas_customer bc on mj.customer_id = bc.id
-        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
-        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
-        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
-
-        <where>
-            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%',#{trayCode},'%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
-            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
-            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
-            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat('%',#{entranceId},'%')</if>
-            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
-            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 </if>
-            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 </if>
-            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
-            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
-        </where>
-        order by mj.create_time desc
-    </select>
-
-    <select id="selectMydoJobByJobId" parameterType="String" resultMap="MydoJobResult">
-        <include refid="selectMydoJobVo"/>
-        where mj.job_id = #{jobId}
-    </select>
-
-    <insert id="insertMydoJob" parameterType="MydoJob">
-        insert into mydo_job
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="onLineType != null">on_line_type,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="departmentId != null">department_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="targetRoadwayId != null">target_roadway_id,</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
-            <if test="lineId != null">line_id,</if>
-            <if test="workshopId != null">workshop_id,</if>
-            <if test="priority != null">priority,</if>
-            <if test="executionPhase != null">execution_phase,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="entranceId != null">entrance_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="classId != null">class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="faultFlag != null">fault_flag,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="onLineType != null">#{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="departmentId != null">#{departmentId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
-            <if test="lineId != null">#{lineId},</if>
-            <if test="workshopId != null">#{workshopId},</if>
-            <if test="priority != null">#{priority},</if>
-            <if test="executionPhase != null">#{executionPhase},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="entranceId != null">#{entranceId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="classId != null">#{classId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="faultFlag != null">#{faultFlag},</if>
-         </trim>
-    </insert>
-    <insert id="insertHistory">
-        insert into mydo_job_finish
-        select * from mydo_job where job_id = #{jobId}
-    </insert>
-
-    <update id="updateMydoJob" parameterType="MydoJob">
-        update mydo_job
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="onLineType != null">on_line_type = #{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="departmentId != null">department_id = #{departmentId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
-            <if test="lineId != null">line_id = #{lineId},</if>
-            <if test="workshopId != null">workshop_id = #{workshopId},</if>
-            <if test="priority != null">priority = #{priority},</if>
-            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="classId != null">class_id = #{classId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
-        </trim>
-        where job_id = #{jobId}
-    </update>
-    <select id="ykCompleted" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_yk_complete(
-                #{v_job_id,jdbcType=VARCHAR,mode=IN},
-                #{v_result,mode=OUT,jdbcType=INTEGER}
-              )}
-    </select>
-
-    <delete id="deleteMydoJobByJobId" parameterType="String">
-        delete from mydo_job where job_id = #{jobId}
-    </delete>
-
-    <delete id="deleteMydoJobByJobIds" parameterType="String">
-        delete from mydo_job where job_id in
-        <foreach item="jobId" collection="array" open="(" separator="," close=")">
-            #{jobId}
-        </foreach>
-    </delete>
-
-    <select id="selectCurrentTasks" resultMap="MydoJobResult">
-        <include refid="selectMydoJobVo"/>
-        where mj.status = '3'
-    </select>
-
-    <select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_point_out(
-        #{v_tray_code,jdbcType=VARCHAR,mode=IN},
-        #{v_exit_id,jdbcType=VARCHAR,mode=IN},
-        #{v_result,mode=OUT,jdbcType=INTEGER},
-        #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-    <select id="selectByTrayCode" resultMap="MydoJobResult">
-        <include refid="selectMydoJobVo"/>
-        where mj.tray_code = #{trayCode}
-    </select>
-
-    <select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
-        select top(1)* from mydo_job mj
-        where in_or_out&lt;20 and mj.entrance_id like concat("%", #{entranceId}, "%")
-          and mj.status like concat("%", #{status}, "%")
-        <if test="lineId != null  and lineId != ''"> and mj.line_id like concat("%", #{lineId}, "%")</if>
-        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
-        order by mj.create_time
-    </select>
-
-    <select id="getInJobBySerial" parameterType="String" resultMap="MydoJobResult">
-        select * from mydo_job where tray_code=#{trayCode}
-    </select>
-
-    <select id="manualCompleted" parameterType="java.util.Map"  statementType="CALLABLE">
-        {call proc_complete_in_job(
-        #{v_job_id,jdbcType=VARCHAR,mode=IN},
-        #{v_result,mode=OUT,jdbcType=INTEGER},
-        #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-    <select id="selectInJobByTrayCode" parameterType="String" resultMap="MydoJobResult">
-        select * from mydo_job where tray_code = #{trayCode}
-    </select>
-
-    <select id="selectInJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
-        select * from mydo_job where task_no = #{taskNo}
-    </select>
-
-
-    <select id="allotInJobSpace" parameterType="java.util.Map"  statementType="CALLABLE">
-        {call proc_allot_space(
-                #{v_tray_code,jdbcType=VARCHAR,mode=IN},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml
deleted file mode 100644
index df959ea..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.mp.mapper.UserMapper">
-
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml
deleted file mode 100644
index 580156d..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.exception.mapper.OutExceptionRecordMapper">
-    
-    <resultMap type="OutExceptionRecord" id="OutExceptionRecordResult">
-        <result property="outGuid"    column="out_guid"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="productId"    column="product_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectOutExceptionRecordVo">
-        select out_guid, warehouse_id, stock_id, tray_code, product_id, spare1, spare2, spare3 from out_exception_record
-    </sql>
-
-    <select id="selectOutExceptionRecordList" parameterType="OutExceptionRecord" resultMap="OutExceptionRecordResult">
-        <include refid="selectOutExceptionRecordVo"/>
-        <where>  
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectOutExceptionRecordByOutGuid" parameterType="Long" resultMap="OutExceptionRecordResult">
-        <include refid="selectOutExceptionRecordVo"/>
-        where out_guid = #{outGuid}
-    </select>
-
-    <insert id="insertOutExceptionRecord" parameterType="OutExceptionRecord" useGeneratedKeys="true" keyProperty="outGuid">
-        insert into out_exception_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOutExceptionRecord" parameterType="OutExceptionRecord">
-        update out_exception_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where out_guid = #{outGuid}
-    </update>
-
-    <delete id="deleteOutExceptionRecordByOutGuid" parameterType="Long">
-        delete from out_exception_record where out_guid = #{outGuid}
-    </delete>
-
-    <delete id="deleteOutExceptionRecordByOutGuids" parameterType="String">
-        delete from out_exception_record where out_guid in 
-        <foreach item="outGuid" collection="array" open="(" separator="," close=")">
-            #{outGuid}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml
deleted file mode 100644
index eb17b7e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.submit.mapper.OutPickSubmitMapper">
-    
-    <resultMap type="OutPickSubmit" id="OutPickSubmitResult">
-        <result property="id"    column="id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="jobDetailId"    column="job_detail_id"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-    </resultMap>
-
-    <sql id="selectOutPickSubmitVo">
-        select id, tray_code, job_id, job_detail_id, product_id, quantity, warehouse_id, exit_id, spare1, spare2, spare3 from out_pick_submit
-    </sql>
-
-    <select id="selectOutPickSubmitList" parameterType="OutPickSubmit" resultMap="OutPickSubmitResult">
-        <include refid="selectOutPickSubmitVo"/>
-        <where>  
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectOutPickSubmitById" parameterType="Long" resultMap="OutPickSubmitResult">
-        <include refid="selectOutPickSubmitVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertOutPickSubmit" parameterType="OutPickSubmit" useGeneratedKeys="true" keyProperty="id">
-        insert into out_pick_submit
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="trayCode != null">tray_code,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="jobDetailId != null">job_detail_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="jobDetailId != null">#{jobDetailId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOutPickSubmit" parameterType="OutPickSubmit">
-        update out_pick_submit
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteOutPickSubmitById" parameterType="Long">
-        delete from out_pick_submit where id = #{id}
-    </delete>
-
-    <delete id="deleteOutPickSubmitByIds" parameterType="String">
-        delete from out_pick_submit where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml
deleted file mode 100644
index 6cfc269..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockoutBack.mapper.OutStockoutBackMapper">
-    
-    <resultMap type="OutStockoutBack" id="OutStockoutBackResult">
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="outType"    column="out_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="stockoutSource"    column="stockout_source"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="classNowId"    column="class_now_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="FID"    column="FID"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="startDate"    column="start_date"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="sendStatus"    column="send_status"    />
-        <result property="sendTime"    column="send_time"    />
-        <result property="msg"    column="msg"    />
-        <result property="companyShortName"    column="company_short_name"    />
-        <result property="accountSetNo"    column="account_set_no"    />
-    </resultMap>
-
-    <sql id="selectOutStockoutBackVo">
-        select stockout_guid,
-               stockout_id,
-               out_type,
-               create_date,
-               department_no,
-               customer_no,
-               create_man_id,
-               status,
-               stockout_source,
-               warehouse_id,
-               class_now_id,
-               exit_id,
-               car_number,
-               FID,
-               erp_stockout_id,
-               start_date,
-               finish_date,
-               spare1,
-               spare2,
-               spare3,
-               spare4,
-               spare5,
-               spare6,
-               spare7,
-               spare8,
-               send_status,
-               send_time,
-               msg,
-               company_short_name,
-               account_set_no
-        from out_stockout_back
-    </sql>
-
-    <select id="selectOutStockoutBackList" parameterType="OutStockoutBack" resultMap="OutStockoutBackResult">
-        <include refid="selectOutStockoutBackVo"/>
-        <where>  
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="carNumber != null  and carNumber != ''"> and car_number like concat("%", #{carNumber}, "%")</if>
-            <if test="FID != null  and FID != ''"> and FID like concat("%", #{FID}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="startDate != null  and startDate != ''"> and start_date like concat("%", #{startDate}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
-            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectOutStockoutBackByStockoutGuid" parameterType="String" resultMap="OutStockoutBackResult">
-        <include refid="selectOutStockoutBackVo"/>
-        where stockout_guid = #{stockoutGuid}
-    </select>
-
-    <select id="selelctTopOutStockout" resultMap="OutStockoutBackResult">
-        select top(1)* from out_stockout_back where send_status=0 and stockout_source = 1
-    </select>
-
-    <insert id="insertOutStockoutBack" parameterType="OutStockoutBack">
-        insert into out_stockout_back
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
-            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null and outType != ''">out_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="stockoutSource != null">stockout_source,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="classNowId != null">class_now_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="carNumber != null">car_number,</if>
-            <if test="FID != null">FID,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="startDate != null">start_date,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="sendStatus != null">send_status,</if>
-            <if test="sendTime != null">send_time,</if>
-            <if test="msg != null">msg,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
-            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null and outType != ''">#{outType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="stockoutSource != null">#{stockoutSource},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="classNowId != null">#{classNowId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="carNumber != null">#{carNumber},</if>
-            <if test="FID != null">#{FID},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="startDate != null">#{startDate},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="sendStatus != null">#{sendStatus},</if>
-            <if test="sendTime != null">#{sendTime},</if>
-            <if test="msg != null">#{msg},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOutStockoutBack" parameterType="OutStockoutBack">
-        update out_stockout_back
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
-            <if test="outType != null and outType != ''">out_type = #{outType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="classNowId != null">class_now_id = #{classNowId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="carNumber != null">car_number = #{carNumber},</if>
-            <if test="FID != null">FID = #{FID},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="startDate != null">start_date = #{startDate},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="sendStatus != null">send_status = #{sendStatus},</if>
-            <if test="sendTime != null">send_time = #{sendTime},</if>
-            <if test="msg != null">msg = #{msg},</if>
-        </trim>
-        where stockout_guid = #{stockoutGuid}
-    </update>
-
-    <delete id="deleteOutStockoutBackByStockoutGuid" parameterType="String">
-        delete from out_stockout_back where stockout_guid = #{stockoutGuid}
-    </delete>
-
-    <delete id="deleteOutStockoutBackByStockoutGuids" parameterType="String">
-        delete from out_stockout_back where stockout_guid in 
-        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
-            #{stockoutGuid}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml
deleted file mode 100644
index 89dc8cc..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockoutDetailBack.mapper.OutStockoutDetailBackMapper">
-
-    <resultMap type="OutStockoutDetailBack" id="OutStockoutDetailBackResult">
-        <result property="stockoutDetailId" column="stockout_detail_id"/>
-        <result property="stockoutGuid" column="stockout_guid"/>
-        <result property="stockoutId" column="stockout_id"/>
-        <result property="lotNo" column="lot_no"/>
-        <result property="productGuid" column="product_guid"/>
-        <result property="productId" column="product_id"/>
-        <result property="quantity" column="quantity"/>
-        <result property="quantityX" column="quantity_x"/>
-        <result property="quantityJ" column="quantity_j"/>
-        <result property="assignNum" column="assign_num"/>
-        <result property="assignNumX" column="assign_num_x"/>
-        <result property="assignNumJ" column="assign_num_j"/>
-        <result property="allotQuantity" column="allot_quantity"/>
-        <result property="allotQuantityX" column="allot_quantity_x"/>
-        <result property="allotQuantityJ" column="allot_quantity_j"/>
-        <result property="price" column="price"/>
-        <result property="remark" column="remark"/>
-        <result property="warehouseId" column="warehouse_id"/>
-        <result property="outId" column="out_id"/>
-        <result property="bukechaiQuantity" column="bukechai_quantity"/>
-        <result property="kechaiQuantity" column="kechai_quantity"/>
-        <result property="entryid" column="entryid"/>
-        <result property="flatQuantity" column="flat_quantity"/>
-        <result property="fid" column="fid"/>
-        <result property="erpStockoutId" column="erp_stockout_id"/>
-        <result property="unit" column="unit"/>
-        <result property="spec" column="spec"/>
-        <result property="productName" column="product_name"/>
-        <result property="spare1" column="spare1"/>
-        <result property="spare2" column="spare2"/>
-        <result property="spare3" column="spare3"/>
-        <result property="spare4" column="spare4"/>
-        <result property="spare5" column="spare5"/>
-        <result property="spare6" column="spare6"/>
-        <result property="spare7" column="spare7"/>
-        <result property="spare8" column="spare8"/>
-        <result property="spare9" column="spare9"/>
-        <result property="sendStatus" column="send_status"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="msg" column="msg"/>
-        <result property="sourceLineId" column="source_line_id"/>
-        <result property="barCode" column="bar_code"/>
-        <result property="isBatchManage" column="is_batch_manage"/>
-        <result property="oldProjectNo" column="old_project_no"/>
-    </resultMap>
-
-    <sql id="selectOutStockoutDetailBackVo">
-        select stockout_detail_id,
-               stockout_guid,
-               stockout_id,
-               lot_no,
-               product_guid,
-               product_id,
-               quantity,
-               quantity_x,
-               quantity_j,
-               assign_num,
-               assign_num_x,
-               assign_num_j,
-               allot_quantity,
-               allot_quantity_x,
-               allot_quantity_j,
-               price,
-               remark,
-               warehouse_id,
-               out_id,
-               bukechai_quantity,
-               kechai_quantity,
-               entryid,
-               flat_quantity,
-               fid,
-               erp_stockout_id,
-               unit,
-               spec,
-               product_name,
-               spare1,
-               spare2,
-               spare3,
-               spare4,
-               spare5,
-               spare6,
-               spare7,
-               spare8,
-               spare9,
-               send_status,
-               send_time,
-               msg,
-               source_line_id,
-               bar_code,
-               is_batch_manage,
-               old_project_no
-        from out_stockout_detail_back
-    </sql>
-
-    <select id="selectOutStockoutDetailBackList" parameterType="OutStockoutDetailBack"
-            resultMap="OutStockoutDetailBackResult">
-        <include refid="selectOutStockoutDetailBackVo"/>
-        <where>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''">and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")
-            </if>
-            <if test="stockoutGuid != null  and stockoutGuid != ''">and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''">and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''">and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''">and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''">and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null ">and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null ">and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null ">and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="assignNum != null ">and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null ">and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null ">and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="allotQuantity != null ">and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
-            <if test="allotQuantityX != null ">and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
-            <if test="allotQuantityJ != null ">and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
-            <if test="price != null  and price != ''">and price like concat("%", #{price}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="outId != null  and outId != ''">and out_id like concat("%", #{outId}, "%")</if>
-            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''">and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")
-            </if>
-            <if test="kechaiQuantity != null  and kechaiQuantity != ''">and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
-            <if test="entryid != null  and entryid != ''">and entryid like concat("%", #{entryid}, "%")</if>
-            <if test="flatQuantity != null  and flatQuantity != ''">and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
-            <if test="fid != null  and fid != ''">and fid like concat("%", #{fid}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''">and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="unit != null  and unit != ''">and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''">and spec like concat("%", #{spec}, "%")</if>
-            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
-                '%')
-            </if>
-            <if test="spare1 != null  and spare1 != ''">and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''">and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''">and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''">and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''">and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''">and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="spare7 != null  and spare7 != ''">and spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''">and spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="spare9 != null  and spare9 != ''">and spare9 like concat("%", #{spare9}, "%")</if>
-            <if test="sendStatus != null  and sendStatus != ''">and send_status like concat("%", #{sendStatus}, "%")</if>
-            <if test="sendTime != null  and sendTime != ''">and send_time like concat("%", #{sendTime}, "%")</if>
-            <if test="msg != null  and msg != ''">and msg like concat("%", #{msg}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectOutStockoutDetailBackByStockoutDetailId" parameterType="String"
-            resultMap="OutStockoutDetailBackResult">
-        <include refid="selectOutStockoutDetailBackVo"/>
-        where stockout_detail_id = #{stockoutDetailId}
-    </select>
-
-    <insert id="insertOutStockoutDetailBack" parameterType="OutStockoutDetailBack">
-        insert into out_stockout_detail_back
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
-            <if test="stockoutGuid != null">stockout_guid,</if>
-            <if test="stockoutId != null">stockout_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="allotQuantity != null">allot_quantity,</if>
-            <if test="allotQuantityX != null">allot_quantity_x,</if>
-            <if test="allotQuantityJ != null">allot_quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="outId != null">out_id,</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
-            <if test="kechaiQuantity != null">kechai_quantity,</if>
-            <if test="entryid != null">entryid,</if>
-            <if test="flatQuantity != null">flat_quantity,</if>
-            <if test="fid != null">fid,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="sendStatus != null">send_status,</if>
-            <if test="sendTime != null">send_time,</if>
-            <if test="msg != null">msg,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="stockoutGuid != null">#{stockoutGuid},</if>
-            <if test="stockoutId != null">#{stockoutId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="allotQuantityX != null">#{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="outId != null">#{outId},</if>
-            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
-            <if test="entryid != null">#{entryid},</if>
-            <if test="flatQuantity != null">#{flatQuantity},</if>
-            <if test="fid != null">#{fid},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="sendStatus != null">#{sendStatus},</if>
-            <if test="sendTime != null">#{sendTime},</if>
-            <if test="msg != null">#{msg},</if>
-        </trim>
-    </insert>
-
-    <update id="updateOutStockoutDetailBack" parameterType="OutStockoutDetailBack">
-        update out_stockout_detail_back
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
-            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="outId != null">out_id = #{outId},</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
-            <if test="entryid != null">entryid = #{entryid},</if>
-            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
-            <if test="fid != null">fid = #{fid},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="sendStatus != null">send_status = #{sendStatus},</if>
-            <if test="sendTime != null">send_time = #{sendTime},</if>
-            <if test="msg != null">msg = #{msg},</if>
-        </trim>
-        where stockout_id = #{stockoutId}
-    </update>
-
-    <delete id="deleteOutStockoutDetailBackByStockoutDetailId" parameterType="String">
-        delete
-        from out_stockout_detail_back
-        where stockout_detail_id = #{stockoutDetailId}
-    </delete>
-
-    <delete id="deleteOutStockoutDetailBackByStockoutDetailIds" parameterType="String">
-        delete from out_stockout_detail_back where stockout_detail_id in
-        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
-            #{stockoutDetailId}
-        </foreach>
-    </delete>
-
-    <insert id="insertOutStockDetailBackFinish" parameterType="java.util.List">
-        INSERT INTO out_stockout_detail_back_finish
-        <foreach collection="list" item="item" separator="UNION ALL">
-            SELECT * FROM out_stockout_detail_back
-            WHERE stockout_detail_id = #{item.stockoutDetailId}
-        </foreach>
-    </insert>
-
-    <delete id="deleteOutStockDetailList">
-        DELETE FROM out_stockout_detail_back
-        WHERE stockout_detail_id IN
-        <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item.stockoutDetailId}
-        </foreach>
-    </delete>
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml
deleted file mode 100644
index 1ccd669..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockoutDetailFinish.mapper.OutStockoutDetailFinishMapper">
-
-    <resultMap type="OutStockoutDetailFinish" id="OutStockoutDetailFinishResult">
-        <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="allotQuantityX"    column="allot_quantity_x"    />
-        <result property="allotQuantityJ"    column="allot_quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="outId"    column="out_id"    />
-        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
-        <result property="kechaiQuantity"    column="kechai_quantity"    />
-        <result property="entryid"    column="entryid"    />
-        <result property="flatQuantity"    column="flat_quantity"    />
-        <result property="fid"    column="fid"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="productName"    column="product_name"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="printDate"    column="print_date"    />
-    </resultMap>
-
-    <resultMap type="OutStockoutDetail" id="OutStockoutDetailResult">
-        <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="allotQuantityX"    column="allot_quantity_x"    />
-        <result property="allotQuantityJ"    column="allot_quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="outId"    column="out_id"    />
-        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
-        <result property="kechaiQuantity"    column="kechai_quantity"    />
-        <result property="entryid"    column="entryid"    />
-        <result property="flatQuantity"    column="flat_quantity"    />
-        <result property="fid"    column="fid"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="productName"    column="product_name"    />
-    </resultMap>
-
-    <sql id="selectOutStockoutDetailFinishVo">
-        select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, supplier_id, cargo_no, create_time, print_date from out_stockout_detail_finish
-    </sql>
-
-    <select id="selectOutStockoutDetailFinishList" parameterType="OutStockoutDetailFinish" resultMap="OutStockoutDetailFinishResult">
-        <include refid="selectOutStockoutDetailFinishVo"/>
-        <where>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null "> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null "> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null "> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null "> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
-            <if test="allotQuantityX != null "> and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
-            <if test="allotQuantityJ != null "> and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="outId != null  and outId != ''"> and out_id like concat("%", #{outId}, "%")</if>
-            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")</if>
-            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
-            <if test="entryid != null  and entryid != ''"> and entryid like concat("%", #{entryid}, "%")</if>
-            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
-            <if test="fid != null  and fid != ''"> and fid like concat("%", #{fid}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectOutStockoutDetailFinishByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailFinishResult">
-        <include refid="selectOutStockoutDetailFinishVo"/>
-        where stockout_detail_id = #{stockoutDetailId}
-    </select>
-
-    <insert id="insertOutStockoutDetailFinish" parameterType="OutStockoutDetailFinish">
-        insert into out_stockout_detail_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
-            <if test="stockoutGuid != null">stockout_guid,</if>
-            <if test="stockoutId != null">stockout_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="allotQuantity != null">allot_quantity,</if>
-            <if test="allotQuantityX != null">allot_quantity_x,</if>
-            <if test="allotQuantityJ != null">allot_quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="outId != null">out_id,</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
-            <if test="kechaiQuantity != null">kechai_quantity,</if>
-            <if test="entryid != null">entryid,</if>
-            <if test="flatQuantity != null">flat_quantity,</if>
-            <if test="fid != null">fid,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="printDate != null">print_date,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="stockoutGuid != null">#{stockoutGuid},</if>
-            <if test="stockoutId != null">#{stockoutId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="allotQuantityX != null">#{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="outId != null">#{outId},</if>
-            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
-            <if test="entryid != null">#{entryid},</if>
-            <if test="flatQuantity != null">#{flatQuantity},</if>
-            <if test="fid != null">#{fid},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="printDate != null">#{printDate},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOutStockoutDetailFinish" parameterType="OutStockoutDetailFinish">
-        update out_stockout_detail_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
-            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
-            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="outId != null">out_id = #{outId},</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
-            <if test="entryid != null">entryid = #{entryid},</if>
-            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
-            <if test="fid != null">fid = #{fid},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-        </trim>
-        where stockout_detail_id = #{stockoutDetailId}
-    </update>
-
-    <delete id="deleteOutStockoutDetailFinishByStockoutDetailId" parameterType="String">
-        delete from out_stockout_detail_finish where stockout_detail_id = #{stockoutDetailId}
-    </delete>
-
-    <delete id="deleteOutStockoutDetailFinishByStockoutDetailIds" parameterType="String">
-        delete from out_stockout_detail_finish where stockout_detail_id in
-        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
-            #{stockoutDetailId}
-        </foreach>
-    </delete>
-
-    <select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
-        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
-               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
-               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,
-               d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
-        from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id
-        where stockout_guid = #{stockoutGuid}
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml
deleted file mode 100644
index a56d66c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockoutDetail.mapper.OutStockoutDetailMapper">
-
-    <resultMap type="OutStockoutDetail" id="OutStockoutDetailResult">
-        <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="allotQuantityX"    column="allot_quantity_x"    />
-        <result property="allotQuantityJ"    column="allot_quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="outId"    column="out_id"    />
-        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
-        <result property="kechaiQuantity"    column="kechai_quantity"    />
-        <result property="entryid"    column="entryid"    />
-        <result property="flatQuantity"    column="flat_quantity"    />
-        <result property="fid"    column="fid"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-
-    </resultMap>
-
-    <sql id="selectOutStockoutDetailVo">
-        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
-               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
-               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,
-               d.product_name ,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
-        from out_stockout_detail d
-    </sql>
-
-    <select id="selectOutStockoutDetailList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
-        <include refid="selectOutStockoutDetailVo"/>
-        <where>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
-            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null "> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null "> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null "> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null "> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
-            <if test="allotQuantityX != null "> and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
-            <if test="allotQuantityJ != null "> and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and d.price like concat("%", #{price}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and d.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="outId != null  and outId != ''"> and out_id like concat("%", #{outId}, "%")</if>
-            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")</if>
-            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
-            <if test="entryid != null  and entryid != ''"> and entryid like concat("%", #{entryid}, "%")</if>
-            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
-            <if test="fid != null  and fid != ''"> and fid like concat("%", #{fid}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and d.unit like concat('%', #{unit}, '%')</if>
-            <if test="spec != null  and spec != ''"> and d.spec like concat('%', #{spec}, '%')</if>
-
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="spare7 != null and spare7 != ''"> and isd.spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null and spare8 != ''"> and isd.spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="spare9 != null and spare9 != ''"> and isd.spare9 like concat("%", #{spare9}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectOutStockoutDetailByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailResult">
-        <include refid="selectOutStockoutDetailVo"/>
-        where stockout_detail_id = #{stockoutDetailId}
-    </select>
-
-    <insert id="insertOutStockoutDetail" parameterType="OutStockoutDetail">
-        insert into out_stockout_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
-            <if test="stockoutGuid != null">stockout_guid,</if>
-            <if test="stockoutId != null">stockout_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="allotQuantity != null">allot_quantity,</if>
-            <if test="allotQuantityX != null">allot_quantity_x,</if>
-            <if test="allotQuantityJ != null">allot_quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="outId != null">out_id,</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
-            <if test="kechaiQuantity != null">kechai_quantity,</if>
-            <if test="entryid != null">entryid,</if>
-            <if test="flatQuantity != null">flat_quantity,</if>
-            <if test="fid != null">fid,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="sourceLineId != null">source_line_id,</if>
-            <if test="barCode != null">bar_code,</if>
-            <if test="isBatchManage != null">is_batch_manage,</if>
-            <if test="oldProjectNo != null">old_project_no,</if>
-
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="stockoutGuid != null">#{stockoutGuid},</if>
-            <if test="stockoutId != null">#{stockoutId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="allotQuantityX != null">#{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="outId != null">#{outId},</if>
-            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
-            <if test="entryid != null">#{entryid},</if>
-            <if test="flatQuantity != null">#{flatQuantity},</if>
-            <if test="fid != null">#{fid},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="sourceLineId != null">#{sourceLineId},</if>
-            <if test="barCode != null">#{barCode},</if>
-            <if test="isBatchManage != null">#{isBatchManage},</if>
-            <if test="oldProjectNo != null">#{oldProjectNo},</if>
-        </trim>
-    </insert>
-
-    <update id="updateOutStockoutDetail" parameterType="OutStockoutDetail">
-        update out_stockout_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
-            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
-            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="outId != null">out_id = #{outId},</if>
-            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
-            <if test="entryid != null">entryid = #{entryid},</if>
-            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
-            <if test="fid != null">fid = #{fid},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-
-        </trim>
-        where stockout_detail_id = #{stockoutDetailId}
-    </update>
-
-    <delete id="deleteOutStockoutDetailByStockoutDetailId" parameterType="String">
-        delete from out_stockout_detail where stockout_detail_id = #{stockoutDetailId}
-    </delete>
-
-    <delete id="deleteOutStockoutDetailByStockoutDetailIds" parameterType="String">
-        delete from out_stockout_detail where stockout_detail_id in
-        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
-            #{stockoutDetailId}
-        </foreach>
-    </delete>
-
-    <select id="selectOutStockoutDetailByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
-        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
-               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
-               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,
-               d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
-               from out_stockout_detail d left join bas_product p on d.product_id = p.product_id
-        where d.stockout_guid = #{stockoutGuid}
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml
deleted file mode 100644
index ec19b6e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockoutFinish.mapper.OutStockoutFinishMapper">
-
-    <resultMap type="OutStockoutFinish" id="OutStockoutFinishResult">
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="outType"    column="out_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="stockoutSource"    column="stockout_source"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="classNowId"    column="class_now_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="FID"    column="FID"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="startDate"    column="start_date"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="customerName"    column="customer_name"    />
-    </resultMap>
-
-    <sql id="selectOutStockoutFinishVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date from out_stockout_finish
-    </sql>
-
-    <select id="selectOutStockoutFinishList" parameterType="OutStockoutFinish" resultMap="OutStockoutFinishResult">
-        <include refid="selectOutStockoutFinishVo"/>
-        <where>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="carNumber != null  and carNumber != ''"> and car_number like concat("%", #{carNumber}, "%")</if>
-            <if test="FID != null  and FID != ''"> and FID like concat("%", #{FID}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="startDate != null  and startDate != ''"> and start_date like concat("%", #{startDate}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectOutStockoutFinishByStockoutGuid" parameterType="String" resultMap="OutStockoutFinishResult">
-        <include refid="selectOutStockoutFinishVo"/>
-        where stockout_guid = #{stockoutGuid}
-    </select>
-
-    <insert id="insertOutStockoutFinish" parameterType="OutStockoutFinish">
-        insert into out_stockout_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
-            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null and outType != ''">out_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="stockoutSource != null">stockout_source,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="classNowId != null">class_now_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="carNumber != null">car_number,</if>
-            <if test="FID != null">FID,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="startDate != null">start_date,</if>
-            <if test="finishDate != null">finish_date,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
-            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null and outType != ''">#{outType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="stockoutSource != null">#{stockoutSource},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="classNowId != null">#{classNowId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="carNumber != null">#{carNumber},</if>
-            <if test="FID != null">#{FID},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="startDate != null">#{startDate},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOutStockoutFinish" parameterType="OutStockoutFinish">
-        update out_stockout_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
-            <if test="outType != null and outType != ''">out_type = #{outType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="classNowId != null">class_now_id = #{classNowId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="carNumber != null">car_number = #{carNumber},</if>
-            <if test="FID != null">FID = #{FID},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="startDate != null">start_date = #{startDate},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-        </trim>
-        where stockout_guid = #{stockoutGuid}
-    </update>
-
-    <delete id="deleteOutStockoutFinishByStockoutGuid" parameterType="String">
-        delete from out_stockout_finish where stockout_guid = #{stockoutGuid}
-    </delete>
-
-    <delete id="deleteOutStockoutFinishByStockoutGuids" parameterType="String">
-        delete from out_stockout_finish where stockout_guid in
-        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
-            #{stockoutGuid}
-        </foreach>
-    </delete>
-
-    <select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult">
-        select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name  from out_stockout_finish o
-        left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
-        left join bas_customer bc on bc.customer_no = o.customer_no
-        left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id
-        left join bas_product bp on bp.product_id = d.product_id
-        <where>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="outType != null  and outType != ''"> and o.out_type like concat("%", #{outType}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and o.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and o.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and o.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and o.status like concat("%", #{status}, "%")</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source like concat("%", #{stockoutSource}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id like concat("%", #{classNowId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and o.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="carNumber != null  and carNumber != ''"> and o.car_number like concat("%", #{carNumber}, "%")</if>
-            <if test="FID != null  and FID != ''"> and o.FID like concat("%", #{FID}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
-            <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
-            <if test="productId != null  and productId != ''"> and d.product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
-        </where>
-        order by o.create_date desc
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml
deleted file mode 100644
index 58b314c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.outStockout.mapper.OutStockoutMapper">
-
-    <resultMap type="OutStockout" id="OutStockoutResult">
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="outType"    column="out_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="stockoutSource"    column="stockout_source"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="classNowId"    column="class_now_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="FID"    column="FID"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="startDate"    column="start_date"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-    </resultMap>
-
-    <sql id="selectOutStockoutVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date,spare1,spare2,spare3,spare4,spare5,spare6,spare7,spare8 from out_stockout
-    </sql>
-
-    <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
-        select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.spare1,o.spare2,o.spare3,o.spare4,o.spare5,o.spare8  from out_stockout o
-        left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
-         left join bas_customer bc on bc.customer_no = o.customer_no
-        left join out_stockout_detail d on d.stockout_id = o.stockout_id
-
-        <where>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id like concat("%", #{stockoutId}, "%")</if>
-            <if test="outType != null  and outType != ''"> and o.out_type like concat("%", #{outType}, "%")</if>
-            <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
-            <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and o.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and o.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and o.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and o.status like concat("%", #{status}, "%")</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source like concat("%", #{stockoutSource}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id like concat("%", #{classNowId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and o.exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="carNumber != null  and carNumber != ''"> and o.car_number like concat("%", #{carNumber}, "%")</if>
-            <if test="FID != null  and FID != ''"> and o.FID like concat("%", #{FID}, "%")</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
-            <if test="productId != null  and productId != ''"> and d.product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''"> and o.spare8 like concat("%", #{spare8}, "%")</if>
-
-
-        </where>
-        order by o.create_date desc
-    </select>
-
-    <select id="selectOutStockoutByStockoutGuid" parameterType="String" resultMap="OutStockoutResult">
-        <include refid="selectOutStockoutVo"/>
-        where stockout_guid = #{stockoutGuid}
-    </select>
-
-    <insert id="insertOutStockout" parameterType="OutStockout">
-        insert into out_stockout
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
-            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null and outType != ''">out_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="stockoutSource != null">stockout_source,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="classNowId != null">class_now_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="carNumber != null">car_number,</if>
-            <if test="FID != null">FID,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="companyShortName != null">company_short_name,</if>
-            <if test="accountSetNo != null">account_set_no,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
-            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null and outType != ''">#{outType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="stockoutSource != null">#{stockoutSource},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="classNowId != null">#{classNowId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="carNumber != null">#{carNumber},</if>
-            <if test="FID != null">#{FID},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="companyShortName != null">#{companyShortName},</if>
-            <if test="accountSetNo != null">#{accountSetNo},</if>
-        </trim>
-    </insert>
-
-    <update id="updateOutStockout" parameterType="OutStockout">
-        update out_stockout
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
-            <if test="outType != null and outType != ''">out_type = #{outType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="classNowId != null">class_now_id = #{classNowId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="carNumber != null">car_number = #{carNumber},</if>
-            <if test="FID != null">FID = #{FID},</if>
-            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
-            <if test="startDate != null">start_date = #{startDate},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
-            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
-        </trim>
-        where stockout_id = #{stockoutId}
-    </update>
-
-    <delete id="deleteOutStockoutByStockoutGuid" parameterType="String">
-        delete from out_stockout where stockout_guid = #{stockoutGuid}
-    </delete>
-
-    <delete id="deleteOutStockoutByStockoutGuids" parameterType="String">
-        delete from out_stockout where stockout_guid in
-        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
-            #{stockoutGuid}
-        </foreach>
-    </delete>
-
-    <select id="updateOutStockoutStatus" parameterType="java.util.Map" statementType="CALLABLE">
-        {
-            call proc_update_outbill_status(
-                #{outStockId,mode=IN,jdbcType=VARCHAR},
-                #{status,mode=IN,jdbcType=VARCHAR},
-                #{newStatus,mode=IN,jdbcType=VARCHAR},
-                #{exitId,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
-            )
-        }
-    </select>
-    <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
-        {
-            call proc_out_auto_allocation(
-                #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-                 )
-            }
-    </select>
-
-    <select id="manualAllot" parameterType="java.util.Map" statementType="CALLABLE">
-        {
-            call proc_out_hand_allocation(
-                #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_stock_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-                 )
-            }
-    </select>
-    <select id="selectOutStockoutByStockoutId" resultMap="OutStockoutResult">
-        select distinct o.stockout_guid,
-                        o.stockout_id,
-                        o.out_type,
-                        o.create_date,
-                        o.department_no,
-                        o.customer_no,
-                        o.create_man_id,
-                        o.status,
-                        o.stockout_source,
-                        o.warehouse_id,
-                        o.class_now_id,
-                        o.exit_id,
-                        o.car_number,
-                        o.FID,
-                        o.erp_stockout_id,
-                        o.start_date,
-                        o.finish_date,
-                        o.spare1,
-                        o.spare2,
-                        o.spare4,
-                        o.spare3,
-                        o.spare5,
-                        bw.warehouse_name,
-                        bc.customer_name
-        from out_stockout o
-                 left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
-                 left join bas_customer bc on bc.customer_no = o.customer_no
-                 left join out_stockout_detail d on d.stockout_id = o.stockout_id
-                 left join bas_product bp on bp.product_id = d.product_id
-        where o.stockout_id = #{stockoutId}
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml
deleted file mode 100644
index f1db0d0..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper">
-    
-    <resultMap type="ViewHandAllotStock" id="ViewHandAllotStockResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
-        <result property="status"    column="status"    />
-        <result property="locked"    column="locked"    />
-    </resultMap>
-
-    <sql id="selectViewHandAllotStockVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, roadway_id, the_platoon, the_column, the_floor, status, locked from view_hand_allot_stock
-    </sql>
-
-    <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
-        <include refid="selectViewHandAllotStockVo"/>
-        <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat("%", #{backDate}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat("%", #{inClassId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
-            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
-            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
-            <if test="netWeight != null  and netWeight != ''"> and net_weight like concat("%", #{netWeight}, "%")</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat("%", #{grossWeight}, "%")</if>
-            <if test="distribution != null  and distribution != ''"> and distribution like concat("%", #{distribution}, "%")</if>
-            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
-            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="thePlatoon != null "> and the_platoon like concat("%", #{thePlatoon}, "%")</if>
-            <if test="theColumn != null "> and the_column like concat("%", #{theColumn}, "%")</if>
-            <if test="theFloor != null "> and the_floor like concat("%", #{theFloor}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectViewHandAllotStockByStockId" parameterType="String" resultMap="ViewHandAllotStockResult">
-        <include refid="selectViewHandAllotStockVo"/>
-        where stock_id = #{stockId}
-    </select>
-
-    <insert id="insertViewHandAllotStock" parameterType="ViewHandAllotStock">
-        insert into view_hand_allot_stock
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
-            <if test="status != null">status,</if>
-            <if test="locked != null">locked,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
-            <if test="status != null">#{status},</if>
-            <if test="locked != null">#{locked},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewHandAllotStock" parameterType="ViewHandAllotStock">
-        update view_hand_allot_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="locked != null">locked = #{locked},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-
-    <delete id="deleteViewHandAllotStockByStockId" parameterType="String">
-        delete from view_hand_allot_stock where stock_id = #{stockId}
-    </delete>
-
-    <delete id="deleteViewHandAllotStockByStockIds" parameterType="String">
-        delete from view_hand_allot_stock where stock_id in 
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
-            #{stockId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
deleted file mode 100644
index 62c82e9..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.pda.mapper.PdaMapper">
-
-    <select id="bindTray" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_bind_tray_msg(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_is_bound_accord,mode=IN,jdbcType=VARCHAR},
-                #{v_quantity,mode=IN,jdbcType=INTEGER},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-    <select id="tpIn" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_tp_in(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
-                #{v_quantity,mode=IN,jdbcType=INTEGER},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-
-    <select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_tp_out(
-
-                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-    <select id="halfTrayOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_half_tray_out(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-
-
-
-
-
-
-    <select id="outMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_out_makesure(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-
-    <select id="emptyTrayIn" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_tray_in(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
-                #{v_quantity,mode=IN,jdbcType=VARCHAR},
-                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-    <select id="emptyBoxIn" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_box_in(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
-                #{v_entrance_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-    <select id="emptyTrayOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_tray_out(
-                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
-                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-    <select id="emptyBoxOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_box_out(
-                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-    <select id="bindTrayMsg" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_bind_tray_msg(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_quantity,mode=IN,jdbcType=INTEGER},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-
-    <select id="addInJob" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_add_in_job(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_is_full,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-        )}
-    </select>
-    <select id="checkMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_check_makesure(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-    <select id="outMakeSureException" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_out_makesure_exception(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_type,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-
-    <select id="pkIn" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_pk_in(
-                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
-                #{v_in_quantity,mode=IN,jdbcType=INTEGER},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-
-    <select id="pkOut" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_pk_out(
-                #{v_job_id,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-    </select>
-
-    <select id="hcoutMakesure" parameterType="java.util.Map" statementType="CALLABLE">
-
-        {call proc_hc_out_make_sure(
-                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
-              )}
-
-    </select>
-    <select id="completeInPk" parameterType="java.util.Map" statementType="CALLABLE">
-        {call proc_complete_in_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                                  #{v_in_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
-                                  #{v_quantity,mode=IN,jdbcType=VARCHAR},
-                                  #{v_result,mode=OUT,jdbcType=INTEGER},
-                                  #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
-    </select>
-    <select id="selectByTrayCodeAndProduct" parameterType="string" resultType="java.lang.Integer">
-        select count(1)
-        from mydo_job_detail
-        where job_id in (select job_id from mydo_job where tray_code = #{trayCode} and in_or_out > 20)
-          and product_id = #{productId}
-    </select>
-<select id="completeOutPk" parameterType="java.util.Map" statementType="CALLABLE">
-    {call proc_complete_out_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
-                              #{v_out_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
-                              #{v_quantity,mode=IN,jdbcType=VARCHAR},
-                              #{v_result,mode=OUT,jdbcType=INTEGER},
-                              #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
-</select>
-
-
-    <select id="selectBasStockHcCount" resultType="java.lang.Integer">
-
-    </select>
-
-
-
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml
deleted file mode 100644
index 746fdd9..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.pda.trayMsg.mapper.TrayMsgMapper">
-    
-    <resultMap type="TrayMsg" id="TrayMsgResult">
-        <result property="id"    column="id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="productName"    column="product_name"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-    </resultMap>
-
-    <sql id="selectTrayMsgVo">
-        select id, tray_code, stockin_detail_id, quantity,warehouse_id from tray_msg
-    </sql>
-
-    <select id="selectTrayMsgList" parameterType="TrayMsg" resultMap="TrayMsgResult">
-        select t.id, t.tray_code, t.stockin_detail_id, t.quantity,p.product_name,t.warehouse_id,w.warehouse_name,w.warehouse_type from tray_msg t
-            left join in_stockin_detail d on t.stockin_detail_id = d.stockin_detail_id
-            left join bas_product p on d.product_id=p.product_id
-             left join bas_warehouse w on t.warehouse_id=w.warehouse_id
-        <where>  
-            <if test="trayCode != null  and trayCode != ''"> and t.tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and t.stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and t.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-
-        </where>
-    </select>
-    
-    <select id="selectTrayMsgById" parameterType="String" resultMap="TrayMsgResult">
-        <include refid="selectTrayMsgVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTrayMsg" parameterType="TrayMsg">
-        insert into tray_msg
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTrayMsg" parameterType="TrayMsg">
-        update tray_msg
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTrayMsgById" parameterType="String">
-        delete from tray_msg where id = #{id}
-    </delete>
-
-    <delete id="deleteTrayMsgByIds" parameterType="String">
-        delete from tray_msg where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml
deleted file mode 100644
index 7cf3c89..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
-
-    <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
-        <result property="onlyIdentity"    column="only_identity"    />
-        <result property="productId"    column="product_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productName"    column="product_name"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-    </resultMap>
-
-    <sql id="selectViewProductAndStockVo">
-        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock
-    </sql>
-    <sql id="selectViewProductAndStockPdVo">
-        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock_pd
-    </sql>
-
-    <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
-        <include refid="selectViewProductAndStockVo"/>
-        <where>
-            <if test="onlyIdentity != null "> and only_identity like concat("%", #{onlyIdentity}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
-            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
-            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
-        <include refid="selectViewProductAndStockVo"/>
-        where only_identity = #{onlyIdentity}
-    </select>
-    <select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock"
-            resultMap="ViewProductAndStockResult">
-        <include refid="selectViewProductAndStockPdVo"/>
-        <where>
-            <if test="onlyIdentity != null ">and only_identity like concat("%", #{onlyIdentity}, "%")</if>
-            <if test="productId != null  and productId != ''">and product_id like concat("%", #{productId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''">and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
-                '%')
-            </if>
-            <if test="quantity != null  and quantity != ''">and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''">and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''">and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''">and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''">and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''">and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''">and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''">and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="voltage != null  and voltage != ''">and voltage like concat("%", #{voltage}, "%")</if>
-            <if test="power != null  and power != ''">and power like concat("%", #{power}, "%")</if>
-            <if test="phase != null  and phase != ''">and phase like concat("%", #{phase}, "%")</if>
-        </where>
-    </select>
-
-    <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
-        insert into view_product_and_stock
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">only_identity,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">#{onlyIdentity},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewProductAndStock" parameterType="ViewProductAndStock">
-        update view_product_and_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-        </trim>
-        where only_identity = #{onlyIdentity}
-    </update>
-
-    <delete id="deleteViewProductAndStockByOnlyIdentity" parameterType="Long">
-        delete from view_product_and_stock where only_identity = #{onlyIdentity}
-    </delete>
-
-    <delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String">
-        delete from view_product_and_stock where only_identity in
-        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
-            #{onlyIdentity}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml
deleted file mode 100644
index f57ee75..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper">
-
-    <resultMap type="ReceiveStockinDetailFinish" id="ReceiveStockinDetailFinishResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-    </resultMap>
-    <resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId"    column="product_id"    />
-            <result property="materialDesc"    column="product_name"    />
-            <result property="englishDesc"    column="englishDesc"    />
-            <result property="length"    column="length"    />
-            <result property="width"    column="width"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>
-    </resultMap>
-
-    <sql id="selectReceiveStockinDetailFinishVo">
-        select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
-               rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
-               rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
-               rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
-               bp.product_name,bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
-        from receive_stockin_detail_finish rsd
-                 left join bas_product bp on rsd.product_id = bp.product_id
-    </sql>
-
-    <select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
-        <include refid="selectReceiveStockinDetailFinishVo"/>
-        <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and rsd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null and quantity != ''"> and rsd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null and price != ''"> and rsd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and rsd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and rsd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null and unit != ''"> and rsd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null and spec != ''"> and rsd.spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectReceiveStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailFinishResult">
-        <include refid="selectReceiveStockinDetailFinishVo"/>
-        where stockin_detail_id = #{stockinDetailId}
-    </select>
-    <select id="selectReceiveStockinDetailList"
-            resultMap="ReceiveStockinDetailResult">
-        <include refid="selectReceiveStockinDetailFinishVo"/>
-        <where>
-            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-    </select>
-
-    <insert id="insertReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
-        insert into receive_stockin_detail_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-         </trim>
-    </insert>
-
-    <update id="updateReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
-        update receive_stockin_detail_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where stockin_detail_id = #{stockinDetailId}
-    </update>
-
-    <delete id="deleteReceiveStockinDetailFinishByStockinDetailId" parameterType="String">
-        delete from receive_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
-    </delete>
-
-    <delete id="deleteReceiveStockinDetailFinishByStockinDetailIds" parameterType="String">
-        delete from receive_stockin_detail_finish where stockin_detail_id in
-        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
-            #{stockinDetailId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml
deleted file mode 100644
index 6790d91..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper">
-
-    <resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId"    column="product_id"    />
-            <result property="materialDesc"    column="product_name"    />
-            <result property="englishDesc"    column="englishDesc"    />
-            <result property="length"    column="length"    />
-            <result property="width"    column="width"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>
-    </resultMap>
-
-    <sql id="selectReceiveStockinDetailVo">
-        select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
-               rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
-               rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
-               rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
-               bp.product_name,bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
-        from receive_stockin_detail rsd
-        left join bas_product bp on rsd.product_id = bp.product_id
-    </sql>
-
-    <select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
-        <include refid="selectReceiveStockinDetailVo"/>
-        <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null and productId != ''"> and rsd.product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null and quantity != ''"> and rsd.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="price != null and price != ''"> and rsd.price like concat("%", #{price}, "%")</if>
-            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat("%", #{cargoNo}, "%")</if>
-            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="printDate != null and printDate != ''"> and rsd.print_date like concat("%", #{printDate}, "%")</if>
-            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null and customerId != ''"> and rsd.customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="unit != null and unit != ''"> and rsd.unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null and spec != ''"> and rsd.spec like concat("%", #{spec}, "%")</if>
-            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat("%", #{spare6}, "%")</if>
-        </where>
-
-    </select>
-
-    <select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">
-        <include refid="selectReceiveStockinDetailVo"/>
-        where stockin_detail_id = #{stockinDetailId}
-    </select>
-
-    <insert id="insertReceiveStockinDetail" parameterType="ReceiveStockinDetail">
-        insert into receive_stockin_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="lotNo != null and lotNo != ''">lot_no,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-         </trim>
-    </insert>
-    <insert id="insertReceiveStockinDetailHistory">
-        insert into receive_stockin_detail_finish
-        select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid}
-    </insert>
-
-    <update id="updateReceiveStockinDetail" parameterType="ReceiveStockinDetail">
-        update receive_stockin_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where stockin_detail_id = #{stockinDetailId}
-    </update>
-
-    <delete id="deleteReceiveStockinDetailByStockinDetailId" parameterType="String">
-        delete from receive_stockin_detail where stockin_detail_id = #{stockinDetailId}
-    </delete>
-
-    <delete id="deleteReceiveStockinDetailByStockinDetailIds" parameterType="String">
-        delete from receive_stockin_detail where stockin_detail_id in
-        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
-            #{stockinDetailId}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml
deleted file mode 100644
index 7acb93b..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper">
-
-    <resultMap type="ReceiveStockinFinish" id="ReceiveStockinFinishResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-    </resultMap>
-    <resultMap type="ReceiveStockin" id="ReceiveStockinResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createManName"    column="user_name"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="departmentName"    column="dept_name"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-    </resultMap>
-
-    <sql id="selectReceiveStockinFinishVo">
-        select
-            rs.stockin_guid ,
-            rs.stockin_id ,
-            rs.in_type ,
-            rs.create_date ,
-            rs.create_man_id ,
-            rs.status ,
-            rs.warehouse_id ,
-            bw.warehouse_name ,
-            rs.spare5 ,
-            rs.spare4 ,
-            rs.spare3 ,
-            rs.finish_date ,
-            rs.spare2 ,
-            rs.spare1,
-            rs.erp_bill ,
-            rs.stock_source,
-            rs.department_no,
-            rs.customer_no,
-            rs.class_no,
-            rs.supplier_no,
-            bs.supplier_name,
-            sd.dept_name,
-            su.user_name
-        from receive_stockin_finish rs
-                 left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
-                 left join bas_supplier bs on rs.supplier_no = bs.supplier_no
-                 left join sys_dept sd on rs.department_no = sd.dept_id
-                 left join sys_user su on su.user_id = rs.create_man_id
-    </sql>
-
-    <select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
-        <include refid="selectReceiveStockinFinishVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
-        </where>
-    </select>
-
-    <select id="selectReceiveStockinFinishByStockinGuid" parameterType="String" resultMap="ReceiveStockinFinishResult">
-        <include refid="selectReceiveStockinFinishVo"/>
-        where stockin_guid = #{stockinGuid}
-    </select>
-    <select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
-        <include refid="selectReceiveStockinFinishVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="materialDesc !=null and materialDesc!=''">
-                and rs.stockin_id in (
-                select distinct stockin_id from receive_stockin_detail_finish rsd
-                left join bas_product bp on rsd.product_id = bp.product_id
-                where bp.product_name like concat('%',#{materialDesc},'%')
-                )
-            </if>
-            <if test="lotNo !=null and lotNo!=''">
-                and rs.stockin_id in (
-                select distinct stockin_id from receive_stockin_detail_finish rsd
-                where rsd.lot_no like concat('%',#{lotNo},'%')
-                )
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-             order by rs.create_date desc
-    </select>
-
-    <insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">
-        insert into receive_stockin_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-         </trim>
-    </insert>
-
-    <update id="updateReceiveStockinFinish" parameterType="ReceiveStockinFinish">
-        update receive_stockin_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteReceiveStockinFinishByStockinGuid" parameterType="String">
-        delete from receive_stockin_finish where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteReceiveStockinFinishByStockinGuids" parameterType="String">
-        delete from receive_stockin_finish where stockin_guid in
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml
deleted file mode 100644
index bd93721..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper">
-
-    <resultMap type="ReceiveStockin" id="ReceiveStockinResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createManName"    column="user_name"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="departmentName"    column="dept_name"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-    </resultMap>
-
-    <sql id="selectReceiveStockinVo">
-        select
-            rs.stockin_guid ,
-            rs.stockin_id ,
-            rs.in_type ,
-            rs.create_date ,
-            rs.create_man_id ,
-            rs.status ,
-            rs.warehouse_id ,
-            bw.warehouse_name ,
-            rs.spare5 ,
-            rs.spare4 ,
-            rs.spare3 ,
-            rs.finish_date ,
-            rs.spare2 ,
-            rs.spare1,
-            rs.erp_bill ,
-            rs.stock_source,
-            rs.department_no,
-            rs.customer_no,
-            rs.class_no,
-            rs.supplier_no,
-            bs.supplier_name,
-            sd.dept_name,
-            su.user_name
-        from receive_stockin rs
-        left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
-        left join bas_supplier bs on rs.supplier_no = bs.supplier_no
-        left join sys_dept sd on rs.department_no = sd.dept_id
-        left join sys_user su on su.user_id = rs.create_man_id
-
-    </sql>
-
-    <select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
-        <include refid="selectReceiveStockinVo"/>
-        <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
-             <if test="materialDesc !=null and materialDesc!=''">
-                 and rs.stockin_id in (
-                 select distinct stockin_id from receive_stockin_detail rsd
-                 left join bas_product bp on rsd.product_id = bp.product_id
-                 where bp.product_name like concat('%',#{materialDesc},'%')
-                 )
-             </if>
-            <if test="lotNo !=null and lotNo!=''">
-                and rs.stockin_id in (
-                select distinct stockin_id from receive_stockin_detail rsd
-                where rsd.lot_no like concat('%',#{lotNo},'%')
-                )
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-             order by rs.create_date desc
-    </select>
-
-    <select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
-        <include refid="selectReceiveStockinVo"/>
-        where rs.stockin_guid = #{stockinGuid}
-    </select>
-
-    <insert id="insertReceiveStockin" parameterType="ReceiveStockin">
-        insert into receive_stockin
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-         </trim>
-    </insert>
-    <insert id="insertReceiveStockinHistory">
-        insert into receive_stockin_finish
-        select * from receive_stockin where stockin_guid = #{stockinGuid}
-    </insert>
-
-    <update id="updateReceiveStockin" parameterType="ReceiveStockin">
-        update receive_stockin
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteReceiveStockinByStockinGuid" parameterType="String">
-        delete from receive_stockin where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteReceiveStockinByStockinGuids" parameterType="String">
-        delete from receive_stockin where stockin_guid in
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml
deleted file mode 100644
index 56a21c2..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.log.mapper.RequestLogMapper">
-    
-    <resultMap type="RequestLog" id="RequestLogResult">
-        <result property="requestId"    column="request_id"    />
-        <result property="requestTime"    column="request_time"    />
-        <result property="sourceSystem"    column="source_system"    />
-        <result property="targetSystem"    column="target_system"    />
-        <result property="endpoint"    column="endpoint"    />
-        <result property="requestUrl"    column="request_url"    />
-        <result property="requestMethod"    column="request_method"    />
-        <result property="requestHeaders"    column="request_headers"    />
-        <result property="requestBody"    column="request_body"    />
-        <result property="responseTime"    column="response_time"    />
-        <result property="responseBody"    column="response_body"    />
-        <result property="responseStatus"    column="response_status"    />
-        <result property="errorDetails"    column="error_details"    />
-        <result property="duration"    column="duration"    />
-        <result property="isSuccessful"    column="Is_successful"    />
-    </resultMap>
-
-    <sql id="selectRequestLogVo">
-        select request_id, request_time, source_system, target_system, endpoint, request_url, request_method, request_headers, request_body, response_time, response_body, response_status, error_details, duration, Is_successful from request_log
-    </sql>
-
-    <select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
-        <include refid="selectRequestLogVo"/>
-        <where>  
-            <if test="requestTime != null  and requestTime != ''"> and request_time like concat("%", #{requestTime}, "%")</if>
-            <if test="sourceSystem != null  and sourceSystem != ''"> and source_system like concat("%", #{sourceSystem}, "%")</if>
-            <if test="targetSystem != null  and targetSystem != ''"> and target_system like concat("%", #{targetSystem}, "%")</if>
-            <if test="endpoint != null  and endpoint != ''"> and endpoint like concat("%", #{endpoint}, "%")</if>
-            <if test="requestUrl != null  and requestUrl != ''"> and request_url like concat("%", #{requestUrl}, "%")</if>
-            <if test="requestMethod != null  and requestMethod != ''"> and request_method like concat("%", #{requestMethod}, "%")</if>
-            <if test="requestHeaders != null  and requestHeaders != ''"> and request_headers like concat("%", #{requestHeaders}, "%")</if>
-            <if test="requestBody != null  and requestBody != ''"> and request_body like concat("%", #{requestBody}, "%")</if>
-            <if test="responseTime != null  and responseTime != ''"> and response_time like concat("%", #{responseTime}, "%")</if>
-            <if test="responseBody != null  and responseBody != ''"> and response_body like concat("%", #{responseBody}, "%")</if>
-            <if test="responseStatus != null  and responseStatus != ''"> and response_status like concat("%", #{responseStatus}, "%")</if>
-            <if test="errorDetails != null  and errorDetails != ''"> and error_details like concat("%", #{errorDetails}, "%")</if>
-            <if test="duration != null  and duration != ''"> and duration like concat("%", #{duration}, "%")</if>
-            <if test="isSuccessful != null  and isSuccessful != ''"> and Is_successful like concat("%", #{isSuccessful}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectRequestLogByRequestId" parameterType="Long" resultMap="RequestLogResult">
-        <include refid="selectRequestLogVo"/>
-        where request_id = #{requestId}
-    </select>
-
-    <insert id="insertRequestLog" parameterType="RequestLog" useGeneratedKeys="true" keyProperty="requestId">
-        insert into request_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="requestTime != null">request_time,</if>
-            <if test="sourceSystem != null">source_system,</if>
-            <if test="targetSystem != null">target_system,</if>
-            <if test="endpoint != null">endpoint,</if>
-            <if test="requestUrl != null">request_url,</if>
-            <if test="requestMethod != null">request_method,</if>
-            <if test="requestHeaders != null">request_headers,</if>
-            <if test="requestBody != null">request_body,</if>
-            <if test="responseTime != null">response_time,</if>
-            <if test="responseBody != null">response_body,</if>
-            <if test="responseStatus != null">response_status,</if>
-            <if test="errorDetails != null">error_details,</if>
-            <if test="duration != null">duration,</if>
-            <if test="isSuccessful != null">Is_successful,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="requestTime != null">#{requestTime},</if>
-            <if test="sourceSystem != null">#{sourceSystem},</if>
-            <if test="targetSystem != null">#{targetSystem},</if>
-            <if test="endpoint != null">#{endpoint},</if>
-            <if test="requestUrl != null">#{requestUrl},</if>
-            <if test="requestMethod != null">#{requestMethod},</if>
-            <if test="requestHeaders != null">#{requestHeaders},</if>
-            <if test="requestBody != null">#{requestBody},</if>
-            <if test="responseTime != null">#{responseTime},</if>
-            <if test="responseBody != null">#{responseBody},</if>
-            <if test="responseStatus != null">#{responseStatus},</if>
-            <if test="errorDetails != null">#{errorDetails},</if>
-            <if test="duration != null">#{duration},</if>
-            <if test="isSuccessful != null">#{isSuccessful},</if>
-         </trim>
-    </insert>
-
-    <update id="updateRequestLog" parameterType="RequestLog">
-        update request_log
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="requestTime != null">request_time = #{requestTime},</if>
-            <if test="sourceSystem != null">source_system = #{sourceSystem},</if>
-            <if test="targetSystem != null">target_system = #{targetSystem},</if>
-            <if test="endpoint != null">endpoint = #{endpoint},</if>
-            <if test="requestUrl != null">request_url = #{requestUrl},</if>
-            <if test="requestMethod != null">request_method = #{requestMethod},</if>
-            <if test="requestHeaders != null">request_headers = #{requestHeaders},</if>
-            <if test="requestBody != null">request_body = #{requestBody},</if>
-            <if test="responseTime != null">response_time = #{responseTime},</if>
-            <if test="responseBody != null">response_body = #{responseBody},</if>
-            <if test="responseStatus != null">response_status = #{responseStatus},</if>
-            <if test="errorDetails != null">error_details = #{errorDetails},</if>
-            <if test="duration != null">duration = #{duration},</if>
-            <if test="isSuccessful != null">Is_successful = #{isSuccessful},</if>
-        </trim>
-        where request_id = #{requestId}
-    </update>
-
-    <delete id="deleteRequestLogByRequestId" parameterType="Long">
-        delete from request_log where request_id = #{requestId}
-    </delete>
-
-    <delete id="deleteRequestLogByRequestIds" parameterType="String">
-        delete from request_log where request_id in 
-        <foreach item="requestId" collection="array" open="(" separator="," close=")">
-            #{requestId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml
deleted file mode 100644
index 81e64fe..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.StockSummary.mapper.StockSummaryMapper">
-
-    <resultMap type="StockSummary" id="StockSummaryResult">
-        <result property="onlyIdentity"    column="only_identity"    />
-        <result property="stockId" column="stock_id" />
-        <result property="cargoSpaceId" column="cargo_space_id" />
-        <result property="stockStatus" column="stock_status" />
-        <result property="productStatus" column="product_status" />
-        <result property="lotNo" column="lot_no" />
-        <result property="inDate" column="in_date" />
-        <result property="backDate" column="back_date" />
-        <result property="productGuid" column="product_guid" />
-        <result property="quantity" column="quantity" />
-        <result property="jobId" column="job_id" />
-        <result property="trayCode" column="tray_code" />
-        <result property="outQuantity" column="out_quantity" />
-        <result property="stockinDetailId" column="stockin_detail_id" />
-        <result property="stockinId" column="stockin_id" />
-        <result property="inType" column="in_type" />
-        <result property="inClassId" column="in_class_id" />
-        <result property="warehouseId" column="warehouse_id" />
-        <result property="stackingId" column="stacking_id" />
-        <result property="productId" column="product_id" />
-        <result property="productName" column="product_name" />
-        <result property="voltage" column="voltage" />
-        <result property="power" column="power" />
-        <result property="phase" column="phase" />
-        <result property="orderId" column="order_id" />
-        <result property="cargoSpaceName" column="cargo_space_name" />
-        <result property="cargoSpaceStatus" column="cargo_space_status" />
-        <result property="locked" column="locked" />
-        <result property="spare1" column="spare1" />
-        <result property="spare2" column="spare2" />
-        <result property="spare3" column="spare3" />
-        <result property="spare4" column="spare4" />
-        <result property="spare5" column="spare5" />
-        <result property="spare6" column="spare6" />
-        <result property="spare7" column="spare7" />
-        <result property="spare8" column="spare8" />
-        <result property="netWeight" column="net_weight" />
-        <result property="grossWeight" column="gross_weight" />
-        <result property="distribution" column="distribution" />
-        <result property="model" column="model" />
-    </resultMap>
-
-    <sql id="selectStockSummaryVo">
-        SELECT
-            <choose>
-                <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupByOrderId != null and groupByOrderId or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByStockId != null and groupByStockId or groupByStockStatus != null and groupByStockStatus or groupByProductStatus != null and groupByProductStatus or groupByInDate != null and groupByInDate or groupByBackDate != null and groupByBackDate or groupByProductGuid != null and groupByProductGuid or groupByJobId != null and groupByJobId or groupByTrayCode != null and groupByTrayCode or groupByOutQuantity != null and groupByOutQuantity or groupByStockinDetailId != null and groupByStockinDetailId or groupByStockinId != null and groupByStockinId or groupByInType != null and groupByInType or groupByInClassId != null and groupByInClassId or groupByStackingId != null and groupByStackingId or groupByVoltage != null and groupByVoltage or groupByPower != null and groupByPower or groupByPhase != null and groupByPhase or groupByCargoSpaceName != null and groupByCargoSpaceName or groupByCargoSpaceStatus != null and groupByCargoSpaceStatus or groupByLocked != null and groupByLocked or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupByNetWeight != null and groupByNetWeight or groupByGrossWeight != null and groupByGrossWeight or groupByDistribution != null and groupByDistribution or groupByModel != null and groupByModel">
-                    <if test="groupByStockId != null and groupByStockId">s.stock_id,</if>
-                    <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
-                    <if test="groupByStockStatus != null and groupByStockStatus">s.stock_status,</if>
-                    <if test="groupByProductStatus != null and groupByProductStatus">s.product_status,</if>
-                    <if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
-                    <if test="groupByInDate != null and groupByInDate">s.in_date,</if>
-                    <if test="groupByBackDate != null and groupByBackDate">s.back_date,</if>
-                    <if test="groupByProductGuid != null and groupByProductGuid">s.product_guid,</if>
-                    <if test="groupByJobId != null and groupByJobId">s.job_id,</if>
-                    <if test="groupByTrayCode != null and groupByTrayCode">s.tray_code,</if>
-                    <if test="groupByOutQuantity != null and groupByOutQuantity">s.out_quantity,</if>
-                    <if test="groupByStockinDetailId != null and groupByStockinDetailId">s.stockin_detail_id,</if>
-                    <if test="groupByStockinId != null and groupByStockinId">s.stockin_id,</if>
-                    <if test="groupByInType != null and groupByInType">s.in_type,</if>
-                    <if test="groupByInClassId != null and groupByInClassId">s.in_class_id,</if>
-                    <if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
-                    <if test="groupByStackingId != null and groupByStackingId">s.stacking_id,</if>
-                    <if test="groupByProductId != null and groupByProductId">s.product_id,</if>
-                    <if test="groupByProductName != null and groupByProductName">s.product_name,</if>
-                    <if test="groupByVoltage != null and groupByVoltage">s.voltage,</if>
-                    <if test="groupByPower != null and groupByPower">s.power,</if>
-                    <if test="groupByPhase != null and groupByPhase">s.phase,</if>
-                    <if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
-                    <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">bcs.cargo_space_name,</if>
-                    <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">bcs.status as cargo_space_status,</if>
-                    <if test="groupByLocked != null and groupByLocked">bcs.locked,</if>
-                    <if test="groupBySpare1 != null and groupBySpare1">s.spare1,</if>
-                    <if test="groupBySpare2 != null and groupBySpare2">s.spare2,</if>
-                    <if test="groupBySpare3 != null and groupBySpare3">s.spare3,</if>
-                    <if test="groupBySpare4 != null and groupBySpare4">s.spare4,</if>
-                    <if test="groupBySpare5 != null and groupBySpare5">s.spare5,</if>
-                    <if test="groupBySpare6 != null and groupBySpare6">s.spare6,</if>
-                    <if test="groupBySpare7 != null and groupBySpare7">s.spare7,</if>
-                    <if test="groupBySpare8 != null and groupBySpare8">s.spare8,</if>
-                    <if test="groupByNetWeight != null and groupByNetWeight">s.net_weight,</if>
-                    <if test="groupByGrossWeight != null and groupByGrossWeight">s.gross_weight,</if>
-                    <if test="groupByDistribution != null and groupByDistribution">s.distribution,</if>
-                    <if test="groupByModel != null and groupByModel">s.model,</if>
-                    SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
-                    FROM bas_stock s
-                    LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
-                    <where>
-                        <if test="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
-                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
-                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
-                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
-                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
-                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
-                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
-                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
-                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
-                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
-                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
-                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
-                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
-                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
-                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
-                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
-                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
-                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
-                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
-                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
-                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
-                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
-                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
-                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
-                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
-                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
-                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
-                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
-                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
-                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
-                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
-                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
-                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
-                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
-                    </where>
-                    GROUP BY
-                    <trim prefixOverrides=",">
-                        <if test="groupByStockId != null and groupByStockId">,s.stock_id</if>
-                        <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
-                        <if test="groupByStockStatus != null and groupByStockStatus">,s.stock_status</if>
-                        <if test="groupByProductStatus != null and groupByProductStatus">,s.product_status</if>
-                        <if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
-                        <if test="groupByInDate != null and groupByInDate">,s.in_date</if>
-                        <if test="groupByBackDate != null and groupByBackDate">,s.back_date</if>
-                        <if test="groupByProductGuid != null and groupByProductGuid">,s.product_guid</if>
-                        <if test="groupByJobId != null and groupByJobId">,s.job_id</if>
-                        <if test="groupByTrayCode != null and groupByTrayCode">,s.tray_code</if>
-                        <if test="groupByOutQuantity != null and groupByOutQuantity">,s.out_quantity</if>
-                        <if test="groupByStockinDetailId != null and groupByStockinDetailId">,s.stockin_detail_id</if>
-                        <if test="groupByStockinId != null and groupByStockinId">,s.stockin_id</if>
-                        <if test="groupByInType != null and groupByInType">,s.in_type</if>
-                        <if test="groupByInClassId != null and groupByInClassId">,s.in_class_id</if>
-                        <if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
-                        <if test="groupByStackingId != null and groupByStackingId">,s.stacking_id</if>
-                        <if test="groupByProductId != null and groupByProductId">,s.product_id</if>
-                        <if test="groupByProductName != null and groupByProductName">,s.product_name</if>
-                        <if test="groupByVoltage != null and groupByVoltage">,s.voltage</if>
-                        <if test="groupByPower != null and groupByPower">,s.power</if>
-                        <if test="groupByPhase != null and groupByPhase">,s.phase</if>
-                        <if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
-                        <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">,bcs.cargo_space_name</if>
-                        <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">,bcs.status</if>
-                        <if test="groupByLocked != null and groupByLocked">,bcs.locked</if>
-                        <if test="groupBySpare1 != null and groupBySpare1">,s.spare1</if>
-                        <if test="groupBySpare2 != null and groupBySpare2">,s.spare2</if>
-                        <if test="groupBySpare3 != null and groupBySpare3">,s.spare3</if>
-                        <if test="groupBySpare4 != null and groupBySpare4">,s.spare4</if>
-                        <if test="groupBySpare5 != null and groupBySpare5">,s.spare5</if>
-                        <if test="groupBySpare6 != null and groupBySpare6">,s.spare6</if>
-                        <if test="groupBySpare7 != null and groupBySpare7">,s.spare7</if>
-                        <if test="groupBySpare8 != null and groupBySpare8">,s.spare8</if>
-                        <if test="groupByNetWeight != null and groupByNetWeight">,s.net_weight</if>
-                        <if test="groupByGrossWeight != null and groupByGrossWeight">,s.gross_weight</if>
-                        <if test="groupByDistribution != null and groupByDistribution">,s.distribution</if>
-                        <if test="groupByModel != null and groupByModel">,s.model</if>
-                    </trim>
-                </when>
-                <otherwise>
-                    1 as group_all,
-                    SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
-                    FROM bas_stock s
-                    LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
-                    <where>
-                        <if test="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
-                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
-                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
-                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
-                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
-                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
-                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
-                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
-                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
-                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
-                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
-                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
-                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
-                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
-                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
-                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
-                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
-                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
-                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
-                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
-                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
-                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
-                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
-                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
-                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
-                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
-                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
-                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
-                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
-                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
-                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
-                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
-                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
-                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
-                    </where>
-                </otherwise>
-            </choose>
-    </sql>
-
-    <select id="selectStockSummaryList" parameterType="StockSummary" resultMap="StockSummaryResult">
-        <include refid="selectStockSummaryVo"/>
-    </select>
-
-    <select id="selectStockSummaryByOnlyIdentity" parameterType="Long" resultMap="StockSummaryResult">
-        <include refid="selectStockSummaryVo"/>
-        where only_identity = #{onlyIdentity}
-    </select>
-
-    <insert id="insertStockSummary" parameterType="StockSummary">
-        insert into stock_summary
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">only_identity,</if>
-            <if test="productId != null and productId != ''">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spare10 != null">spare10,</if>
-            <if test="spare11 != null">spare11,</if>
-            <if test="spare12 != null">spare12,</if>
-            <if test="spare13 != null">spare13,</if>
-            <if test="spare14 != null">spare14,</if>
-            <if test="spare15 != null">spare15,</if>
-            <if test="spare16 != null">spare16,</if>
-            <if test="spare17 != null">spare17,</if>
-            <if test="spare18 != null">spare18,</if>
-            <if test="spare19 != null">spare19,</if>
-            <if test="spare20 != null">spare20,</if>
-            <if test="spare21 != null">spare21,</if>
-            <if test="spare22 != null">spare22,</if>
-            <if test="spare23 != null">spare23,</if>
-            <if test="spare24 != null">spare24,</if>
-            <if test="spare25 != null">spare25,</if>
-            <if test="spare26 != null">spare26,</if>
-            <if test="spare27 != null">spare27,</if>
-            <if test="spare28 != null">spare28,</if>
-            <if test="spare29 != null">spare29,</if>
-            <if test="spare30 != null">spare30,</if>
-            <if test="spare31 != null">spare31,</if>
-            <if test="spare32 != null">spare32,</if>
-            <if test="spare33 != null">spare33,</if>
-            <if test="spare34 != null">spare34,</if>
-            <if test="spare35 != null">spare35,</if>
-            <if test="spare36 != null">spare36,</if>
-            <if test="spare37 != null">spare37,</if>
-            <if test="spare38 != null">spare38,</if>
-            <if test="spare39 != null">spare39,</if>
-            <if test="remark != null">remark,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="quantity != null">quantity,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">#{onlyIdentity},</if>
-            <if test="productId != null and productId != ''">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spare10 != null">#{spare10},</if>
-            <if test="spare11 != null">#{spare11},</if>
-            <if test="spare12 != null">#{spare12},</if>
-            <if test="spare13 != null">#{spare13},</if>
-            <if test="spare14 != null">#{spare14},</if>
-            <if test="spare15 != null">#{spare15},</if>
-            <if test="spare16 != null">#{spare16},</if>
-            <if test="spare17 != null">#{spare17},</if>
-            <if test="spare18 != null">#{spare18},</if>
-            <if test="spare19 != null">#{spare19},</if>
-            <if test="spare20 != null">#{spare20},</if>
-            <if test="spare21 != null">#{spare21},</if>
-            <if test="spare22 != null">#{spare22},</if>
-            <if test="spare23 != null">#{spare23},</if>
-            <if test="spare24 != null">#{spare24},</if>
-            <if test="spare25 != null">#{spare25},</if>
-            <if test="spare26 != null">#{spare26},</if>
-            <if test="spare27 != null">#{spare27},</if>
-            <if test="spare28 != null">#{spare28},</if>
-            <if test="spare29 != null">#{spare29},</if>
-            <if test="spare30 != null">#{spare30},</if>
-            <if test="spare31 != null">#{spare31},</if>
-            <if test="spare32 != null">#{spare32},</if>
-            <if test="spare33 != null">#{spare33},</if>
-            <if test="spare34 != null">#{spare34},</if>
-            <if test="spare35 != null">#{spare35},</if>
-            <if test="spare36 != null">#{spare36},</if>
-            <if test="spare37 != null">#{spare37},</if>
-            <if test="spare38 != null">#{spare38},</if>
-            <if test="spare39 != null">#{spare39},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="quantity != null">#{quantity},</if>
-         </trim>
-    </insert>
-
-    <update id="updateStockSummary" parameterType="StockSummary">
-        update stock_summary
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="productId != null and productId != ''">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="spare10 != null">spare10 = #{spare10},</if>
-            <if test="spare11 != null">spare11 = #{spare11},</if>
-            <if test="spare12 != null">spare12 = #{spare12},</if>
-            <if test="spare13 != null">spare13 = #{spare13},</if>
-            <if test="spare14 != null">spare14 = #{spare14},</if>
-            <if test="spare15 != null">spare15 = #{spare15},</if>
-            <if test="spare16 != null">spare16 = #{spare16},</if>
-            <if test="spare17 != null">spare17 = #{spare17},</if>
-            <if test="spare18 != null">spare18 = #{spare18},</if>
-            <if test="spare19 != null">spare19 = #{spare19},</if>
-            <if test="spare20 != null">spare20 = #{spare20},</if>
-            <if test="spare21 != null">spare21 = #{spare21},</if>
-            <if test="spare22 != null">spare22 = #{spare22},</if>
-            <if test="spare23 != null">spare23 = #{spare23},</if>
-            <if test="spare24 != null">spare24 = #{spare24},</if>
-            <if test="spare25 != null">spare25 = #{spare25},</if>
-            <if test="spare26 != null">spare26 = #{spare26},</if>
-            <if test="spare27 != null">spare27 = #{spare27},</if>
-            <if test="spare28 != null">spare28 = #{spare28},</if>
-            <if test="spare29 != null">spare29 = #{spare29},</if>
-            <if test="spare30 != null">spare30 = #{spare30},</if>
-            <if test="spare31 != null">spare31 = #{spare31},</if>
-            <if test="spare32 != null">spare32 = #{spare32},</if>
-            <if test="spare33 != null">spare33 = #{spare33},</if>
-            <if test="spare34 != null">spare34 = #{spare34},</if>
-            <if test="spare35 != null">spare35 = #{spare35},</if>
-            <if test="spare36 != null">spare36 = #{spare36},</if>
-            <if test="spare37 != null">spare37 = #{spare37},</if>
-            <if test="spare38 != null">spare38 = #{spare38},</if>
-            <if test="spare39 != null">spare39 = #{spare39},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-        </trim>
-        where only_identity = #{onlyIdentity}
-    </update>
-
-    <delete id="deleteStockSummaryByOnlyIdentity" parameterType="Long">
-        delete from stock_summary where only_identity = #{onlyIdentity}
-    </delete>
-
-    <delete id="deleteStockSummaryByOnlyIdentitys" parameterType="String">
-        delete from stock_summary where only_identity in
-        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
-            #{onlyIdentity}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml
deleted file mode 100644
index 79a1a0a..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewFlatWarehouseInFlow.mapper.ViewFlatWarehouseInFlowMapper">
-
-    <resultMap type="ViewFlatWarehouseInFlow" id="ViewFlatWarehouseInFlowResult">
-        <result property="id"    column="id"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="inOrOutSotckId"    column="in_or_out_sotck_id"    />
-        <result property="inOrOutSotckDetailId"    column="in_or_out_sotck_detail_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createMan"    column="create_man"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="address"    column="address"    />
-        <result property="cDesc"    column="c_desc"    />
-        <result property="warehouseKind"    column="warehouse_kind"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-        <result property="isCurrent"    column="is_current"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="price"    column="price"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectViewFlatWarehouseInFlowVo">
-        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow vfwif
-    </sql>
-
-    <select id="selectViewFlatWarehouseInFlowList" parameterType="ViewFlatWarehouseInFlow" resultMap="ViewFlatWarehouseInFlowResult">
-        <include refid="selectViewFlatWarehouseInFlowVo"/>
-        <where>
-            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
-            <if test="inOrOutSotckId != null  and inOrOutSotckId != ''"> and in_or_out_sotck_id like concat('%', #{inOrOutSotckId}, '%')</if>
-            <if test="inOrOutSotckDetailId != null  and inOrOutSotckDetailId != ''"> and in_or_out_sotck_detail_id like concat('%', #{inOrOutSotckDetailId}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
-            <if test="createMan != null  and createMan != ''"> and create_man like concat('%', #{createMan}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectViewFlatWarehouseInFlowById" parameterType="Long" resultMap="ViewFlatWarehouseInFlowResult">
-        <include refid="selectViewFlatWarehouseInFlowVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertViewFlatWarehouseInFlow" parameterType="ViewFlatWarehouseInFlow">
-        insert into view_flat_warehouse_in_flow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="inOrOutSotckId != null">in_or_out_sotck_id,</if>
-            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createMan != null">create_man,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="warehouseName != null">warehouse_name,</if>
-            <if test="address != null">address,</if>
-            <if test="cDesc != null">c_desc,</if>
-            <if test="warehouseKind != null">warehouse_kind,</if>
-            <if test="warehouseType != null">warehouse_type,</if>
-            <if test="isCurrent != null">is_current,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="inOrOutSotckId != null">#{inOrOutSotckId},</if>
-            <if test="inOrOutSotckDetailId != null">#{inOrOutSotckDetailId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createMan != null">#{createMan},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="warehouseName != null">#{warehouseName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="cDesc != null">#{cDesc},</if>
-            <if test="warehouseKind != null">#{warehouseKind},</if>
-            <if test="warehouseType != null">#{warehouseType},</if>
-            <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewFlatWarehouseInFlow" parameterType="ViewFlatWarehouseInFlow">
-        update view_flat_warehouse_in_flow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="inOrOutSotckId != null">in_or_out_sotck_id = #{inOrOutSotckId},</if>
-            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id = #{inOrOutSotckDetailId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createMan != null">create_man = #{createMan},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="cDesc != null">c_desc = #{cDesc},</if>
-            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
-            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
-            <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteViewFlatWarehouseInFlowById" parameterType="Long">
-        delete from view_flat_warehouse_in_flow where id = #{id}
-    </delete>
-
-    <delete id="deleteViewFlatWarehouseInFlowByIds" parameterType="String">
-        delete from view_flat_warehouse_in_flow where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
deleted file mode 100644
index 5b617ec..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewFlatWarehouseOutFlow.mapper.ViewFlatWarehouseOutFlowMapper">
-
-    <resultMap type="ViewFlatWarehouseOutFlow" id="ViewFlatWarehouseOutFlowResult">
-        <result property="id"    column="id"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="inOrOutSotckId"    column="in_or_out_sotck_id"    />
-        <result property="inOrOutSotckDetailId"    column="in_or_out_sotck_detail_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createMan"    column="create_man"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="address"    column="address"    />
-        <result property="cDesc"    column="c_desc"    />
-        <result property="warehouseKind"    column="warehouse_kind"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-        <result property="isCurrent"    column="is_current"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-    </resultMap>
-
-    <sql id="selectViewFlatWarehouseOutFlowVo">
-        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow vfwof
-    </sql>
-
-    <select id="selectViewFlatWarehouseOutFlowList" parameterType="ViewFlatWarehouseOutFlow" resultMap="ViewFlatWarehouseOutFlowResult">
-        <include refid="selectViewFlatWarehouseOutFlowVo"/>
-        <where>
-            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
-            <if test="inOrOutSotckId != null  and inOrOutSotckId != ''"> and in_or_out_sotck_id like concat('%', #{inOrOutSotckId}, '%')</if>
-            <if test="inOrOutSotckDetailId != null  and inOrOutSotckDetailId != ''"> and in_or_out_sotck_detail_id like concat('%', #{inOrOutSotckDetailId}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
-            <if test="createMan != null  and createMan != ''"> and create_man like concat('%', #{createMan}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectViewFlatWarehouseOutFlowById" parameterType="Long" resultMap="ViewFlatWarehouseOutFlowResult">
-        <include refid="selectViewFlatWarehouseOutFlowVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertViewFlatWarehouseOutFlow" parameterType="ViewFlatWarehouseOutFlow">
-        insert into view_flat_warehouse_out_flow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="inOrOutSotckId != null">in_or_out_sotck_id,</if>
-            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createMan != null">create_man,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="warehouseName != null">warehouse_name,</if>
-            <if test="address != null">address,</if>
-            <if test="cDesc != null">c_desc,</if>
-            <if test="warehouseKind != null">warehouse_kind,</if>
-            <if test="warehouseType != null">warehouse_type,</if>
-            <if test="isCurrent != null">is_current,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="inOrOutSotckId != null">#{inOrOutSotckId},</if>
-            <if test="inOrOutSotckDetailId != null">#{inOrOutSotckDetailId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createMan != null">#{createMan},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="warehouseName != null">#{warehouseName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="cDesc != null">#{cDesc},</if>
-            <if test="warehouseKind != null">#{warehouseKind},</if>
-            <if test="warehouseType != null">#{warehouseType},</if>
-            <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewFlatWarehouseOutFlow" parameterType="ViewFlatWarehouseOutFlow">
-        update view_flat_warehouse_out_flow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="inOrOutSotckId != null">in_or_out_sotck_id = #{inOrOutSotckId},</if>
-            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id = #{inOrOutSotckDetailId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createMan != null">create_man = #{createMan},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="cDesc != null">c_desc = #{cDesc},</if>
-            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
-            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
-            <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteViewFlatWarehouseOutFlowById" parameterType="Long">
-        delete from view_flat_warehouse_out_flow where id = #{id}
-    </delete>
-
-    <delete id="deleteViewFlatWarehouseOutFlowByIds" parameterType="String">
-        delete from view_flat_warehouse_out_flow where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml
deleted file mode 100644
index 827b64a..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
-    
-    <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
-        <result property="jobId"    column="job_id"    />
-        <result property="status"    column="status"    />
-        <result property="onLineType"    column="on_line_type"    />
-        <result property="taskNo"    column="task_no"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="departmentId"    column="department_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="targetRoadwayId"    column="target_roadway_id"    />
-        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
-        <result property="lineId"    column="line_id"    />
-        <result property="workshopId"    column="workshop_id"    />
-        <result property="priority"    column="priority"    />
-        <result property="executionPhase"    column="execution_phase"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="classId"    column="class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="faultFlag"    column="fault_flag"    />
-        <result property="jobDetailId"    column="job_detail_id"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="stockQuantity"    column="stock_quantity"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-    </resultMap>
-
-    <sql id="selectViewInJobFlowVo">
-        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_in_job_flow
-    </sql>
-
-    <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
-        <include refid="selectViewInJobFlowVo"/>
-        <where>  
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="onLineType != null  and onLineType != ''"> and on_line_type like concat("%", #{onLineType}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="departmentId != null  and departmentId != ''"> and department_id like concat("%", #{departmentId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
-            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
-            <if test="workshopId != null  and workshopId != ''"> and workshop_id like concat("%", #{workshopId}, "%")</if>
-            <if test="priority != null "> and priority like concat("%", #{priority}, "%")</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase like concat("%", #{executionPhase}, "%")</if>
-            <if test="inOrOut != null "> and in_or_out like concat("%", #{inOrOut}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat("%", #{entranceId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="classId != null  and classId != ''"> and class_id like concat("%", #{classId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag like concat("%", #{faultFlag}, "%")</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
-            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity like concat("%", #{inQuantity}, "%")</if>
-            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity like concat("%", #{stockQuantity}, "%")</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectViewInJobFlowByJobId" parameterType="String" resultMap="ViewInJobFlowResult">
-        <include refid="selectViewInJobFlowVo"/>
-        where job_id = #{jobId}
-    </select>
-
-    <insert id="insertViewInJobFlow" parameterType="ViewInJobFlow">
-        insert into view_in_job_flow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="onLineType != null">on_line_type,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="departmentId != null">department_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="targetRoadwayId != null">target_roadway_id,</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
-            <if test="lineId != null">line_id,</if>
-            <if test="workshopId != null">workshop_id,</if>
-            <if test="priority != null">priority,</if>
-            <if test="executionPhase != null">execution_phase,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="entranceId != null">entrance_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="classId != null">class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="faultFlag != null">fault_flag,</if>
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="stockQuantity != null">stock_quantity,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="onLineType != null">#{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="departmentId != null">#{departmentId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
-            <if test="lineId != null">#{lineId},</if>
-            <if test="workshopId != null">#{workshopId},</if>
-            <if test="priority != null">#{priority},</if>
-            <if test="executionPhase != null">#{executionPhase},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="entranceId != null">#{entranceId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="classId != null">#{classId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="faultFlag != null">#{faultFlag},</if>
-            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="stockQuantity != null">#{stockQuantity},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewInJobFlow" parameterType="ViewInJobFlow">
-        update view_in_job_flow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="onLineType != null">on_line_type = #{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="departmentId != null">department_id = #{departmentId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
-            <if test="lineId != null">line_id = #{lineId},</if>
-            <if test="workshopId != null">workshop_id = #{workshopId},</if>
-            <if test="priority != null">priority = #{priority},</if>
-            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="classId != null">class_id = #{classId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-        </trim>
-        where job_id = #{jobId}
-    </update>
-
-    <delete id="deleteViewInJobFlowByJobId" parameterType="String">
-        delete from view_in_job_flow where job_id = #{jobId}
-    </delete>
-
-    <delete id="deleteViewInJobFlowByJobIds" parameterType="String">
-        delete from view_in_job_flow where job_id in 
-        <foreach item="jobId" collection="array" open="(" separator="," close=")">
-            #{jobId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml
deleted file mode 100644
index 0b54225..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
-    
-    <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
-        <result property="jobId"    column="job_id"    />
-        <result property="status"    column="status"    />
-        <result property="onLineType"    column="on_line_type"    />
-        <result property="taskNo"    column="task_no"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="departmentId"    column="department_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="targetRoadwayId"    column="target_roadway_id"    />
-        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
-        <result property="lineId"    column="line_id"    />
-        <result property="workshopId"    column="workshop_id"    />
-        <result property="priority"    column="priority"    />
-        <result property="executionPhase"    column="execution_phase"    />
-        <result property="inOrOut"    column="in_or_out"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="classId"    column="class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="faultFlag"    column="fault_flag"    />
-        <result property="jobDetailId"    column="job_detail_id"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="stockQuantity"    column="stock_quantity"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-    </resultMap>
-
-    <sql id="selectViewOutJobFlowVo">
-        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_out_job_flow
-    </sql>
-
-    <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
-        <include refid="selectViewOutJobFlowVo"/>
-        <where>  
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="onLineType != null  and onLineType != ''"> and on_line_type like concat("%", #{onLineType}, "%")</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
-            <if test="departmentId != null  and departmentId != ''"> and department_id like concat("%", #{departmentId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
-            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
-            <if test="workshopId != null  and workshopId != ''"> and workshop_id like concat("%", #{workshopId}, "%")</if>
-            <if test="priority != null "> and priority like concat("%", #{priority}, "%")</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase like concat("%", #{executionPhase}, "%")</if>
-            <if test="inOrOut != null "> and in_or_out like concat("%", #{inOrOut}, "%")</if>
-            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat("%", #{entranceId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="classId != null  and classId != ''"> and class_id like concat("%", #{classId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag like concat("%", #{faultFlag}, "%")</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
-            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity like concat("%", #{inQuantity}, "%")</if>
-            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity like concat("%", #{stockQuantity}, "%")</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectViewOutJobFlowByJobId" parameterType="String" resultMap="ViewOutJobFlowResult">
-        <include refid="selectViewOutJobFlowVo"/>
-        where job_id = #{jobId}
-    </select>
-
-    <insert id="insertViewOutJobFlow" parameterType="ViewOutJobFlow">
-        insert into view_out_job_flow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="onLineType != null">on_line_type,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="departmentId != null">department_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="targetRoadwayId != null">target_roadway_id,</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
-            <if test="lineId != null">line_id,</if>
-            <if test="workshopId != null">workshop_id,</if>
-            <if test="priority != null">priority,</if>
-            <if test="executionPhase != null">execution_phase,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="entranceId != null">entrance_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="classId != null">class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="faultFlag != null">fault_flag,</if>
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="stockQuantity != null">stock_quantity,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="onLineType != null">#{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="departmentId != null">#{departmentId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
-            <if test="lineId != null">#{lineId},</if>
-            <if test="workshopId != null">#{workshopId},</if>
-            <if test="priority != null">#{priority},</if>
-            <if test="executionPhase != null">#{executionPhase},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="entranceId != null">#{entranceId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="classId != null">#{classId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="faultFlag != null">#{faultFlag},</if>
-            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="stockQuantity != null">#{stockQuantity},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewOutJobFlow" parameterType="ViewOutJobFlow">
-        update view_out_job_flow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="onLineType != null">on_line_type = #{onLineType},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="departmentId != null">department_id = #{departmentId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
-            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
-            <if test="lineId != null">line_id = #{lineId},</if>
-            <if test="workshopId != null">workshop_id = #{workshopId},</if>
-            <if test="priority != null">priority = #{priority},</if>
-            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="classId != null">class_id = #{classId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
-            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-        </trim>
-        where job_id = #{jobId}
-    </update>
-
-    <delete id="deleteViewOutJobFlowByJobId" parameterType="String">
-        delete from view_out_job_flow where job_id = #{jobId}
-    </delete>
-
-    <delete id="deleteViewOutJobFlowByJobIds" parameterType="String">
-        delete from view_out_job_flow where job_id in 
-        <foreach item="jobId" collection="array" open="(" separator="," close=")">
-            #{jobId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml
deleted file mode 100644
index 1d1885e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
-    
-    <resultMap type="ViewStockDetail" id="ViewStockDetailResult">
-        <result property="onlyIdentity"    column="only_identity"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="cargoSpaceStatus"    column="cargo_space_status"    />
-        <result property="locked"    column="locked"    />
-    </resultMap>
-
-    <sql id="selectViewStockDetailVo">
-        select only_identity, stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, cargo_space_status, locked from view_stock_detail
-    </sql>
-
-    <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
-        <include refid="selectViewStockDetailVo"/>
-        <where>  
-            <if test="onlyIdentity != null "> and only_identity like concat("%", #{onlyIdentity}, "%")</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat("%", #{backDate}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat("%", #{inClassId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
-            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
-            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
-            <if test="netWeight != null  and netWeight != ''"> and net_weight like concat("%", #{netWeight}, "%")</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat("%", #{grossWeight}, "%")</if>
-            <if test="distribution != null  and distribution != ''"> and distribution like concat("%", #{distribution}, "%")</if>
-            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
-            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cargo_space_status like concat("%", #{cargoSpaceStatus}, "%")</if>
-            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
-        <include refid="selectViewStockDetailVo"/>
-        where only_identity = #{onlyIdentity}
-    </select>
-
-    <insert id="insertViewStockDetail" parameterType="ViewStockDetail">
-        insert into view_stock_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">only_identity,</if>
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status,</if>
-            <if test="locked != null">locked,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">#{onlyIdentity},</if>
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
-            <if test="locked != null">#{locked},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockDetail" parameterType="ViewStockDetail">
-        update view_stock_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id = #{stockId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
-            <if test="locked != null">locked = #{locked},</if>
-        </trim>
-        where only_identity = #{onlyIdentity}
-    </update>
-
-    <delete id="deleteViewStockDetailByOnlyIdentity" parameterType="Long">
-        delete from view_stock_detail where only_identity = #{onlyIdentity}
-    </delete>
-
-    <delete id="deleteViewStockDetailByOnlyIdentitys" parameterType="String">
-        delete from view_stock_detail where only_identity in 
-        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
-            #{onlyIdentity}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml
deleted file mode 100644
index 888dfc5..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper">
-    
-    <resultMap type="ViewStockSecure" id="ViewStockSecureResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="address"    column="address"    />
-        <result property="cDesc"    column="c_desc"    />
-        <result property="warehouseKind"    column="warehouse_kind"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-        <result property="isCurrent"    column="is_current"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spare10"    column="spare10"    />
-        <result property="spare11"    column="spare11"    />
-        <result property="spare12"    column="spare12"    />
-        <result property="spare13"    column="spare13"    />
-        <result property="spare14"    column="spare14"    />
-        <result property="spare15"    column="spare15"    />
-        <result property="spare16"    column="spare16"    />
-        <result property="spare17"    column="spare17"    />
-        <result property="spare18"    column="spare18"    />
-        <result property="spare19"    column="spare19"    />
-        <result property="spare20"    column="spare20"    />
-        <result property="spare21"    column="spare21"    />
-        <result property="spare22"    column="spare22"    />
-        <result property="spare23"    column="spare23"    />
-        <result property="spare24"    column="spare24"    />
-        <result property="spare25"    column="spare25"    />
-        <result property="spare26"    column="spare26"    />
-        <result property="spare27"    column="spare27"    />
-        <result property="spare28"    column="spare28"    />
-        <result property="spare29"    column="spare29"    />
-        <result property="spare30"    column="spare30"    />
-        <result property="spare31"    column="spare31"    />
-        <result property="spare32"    column="spare32"    />
-        <result property="spare33"    column="spare33"    />
-        <result property="spare34"    column="spare34"    />
-        <result property="spare35"    column="spare35"    />
-        <result property="spare36"    column="spare36"    />
-        <result property="spare37"    column="spare37"    />
-        <result property="spare38"    column="spare38"    />
-        <result property="spare39"    column="spare39"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoAreaId"    column="cargo_area_id"    />
-        <result property="theType"    column="the_type"    />
-        <result property="theTypeName"    column="the_type_name"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
-        <result property="cargoStatus"    column="cargo_status"    />
-        <result property="locked"    column="locked"    />
-        <result property="cargoHight"    column="cargo_hight"    />
-        <result property="issDouble"    column="iss_double"    />
-        <result property="groupCodingNo"    column="group_coding_no"    />
-        <result property="groupCoding"    column="group_coding"    />
-        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
-        <result property="thisCargoArea"    column="this_cargo_area"    />
-    </resultMap>
-
-    <sql id="selectViewStockSecureVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
-    </sql>
-
-    <select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
-        <include refid="selectViewStockSecureVo"/>
-        <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat("%", #{isCurrent}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
-            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
-            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
-            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
-            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
-            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
-            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
-            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
-            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
-            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
-            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
-            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
-            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
-            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
-            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
-            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
-            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
-            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
-            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
-            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
-            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
-            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
-            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
-            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
-            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
-            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
-            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
-            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
-            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
-            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
-            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
-            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
-            <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
-            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
-            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
-            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat("%", #{cargoStatus}, "%")</if>
-            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectViewStockSecureByStockId" parameterType="String" resultMap="ViewStockSecureResult">
-        <include refid="selectViewStockSecureVo"/>
-        where stock_id = #{stockId}
-    </select>
-
-    <insert id="insertViewStockSecure" parameterType="ViewStockSecure">
-        insert into view_stock_secure
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="warehouseName != null">warehouse_name,</if>
-            <if test="address != null">address,</if>
-            <if test="cDesc != null">c_desc,</if>
-            <if test="warehouseKind != null">warehouse_kind,</if>
-            <if test="warehouseType != null">warehouse_type,</if>
-            <if test="isCurrent != null">is_current,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spare10 != null">spare10,</if>
-            <if test="spare11 != null">spare11,</if>
-            <if test="spare12 != null">spare12,</if>
-            <if test="spare13 != null">spare13,</if>
-            <if test="spare14 != null">spare14,</if>
-            <if test="spare15 != null">spare15,</if>
-            <if test="spare16 != null">spare16,</if>
-            <if test="spare17 != null">spare17,</if>
-            <if test="spare18 != null">spare18,</if>
-            <if test="spare19 != null">spare19,</if>
-            <if test="spare20 != null">spare20,</if>
-            <if test="spare21 != null">spare21,</if>
-            <if test="spare22 != null">spare22,</if>
-            <if test="spare23 != null">spare23,</if>
-            <if test="spare24 != null">spare24,</if>
-            <if test="spare25 != null">spare25,</if>
-            <if test="spare26 != null">spare26,</if>
-            <if test="spare27 != null">spare27,</if>
-            <if test="spare28 != null">spare28,</if>
-            <if test="spare29 != null">spare29,</if>
-            <if test="spare30 != null">spare30,</if>
-            <if test="spare31 != null">spare31,</if>
-            <if test="spare32 != null">spare32,</if>
-            <if test="spare33 != null">spare33,</if>
-            <if test="spare34 != null">spare34,</if>
-            <if test="spare35 != null">spare35,</if>
-            <if test="spare36 != null">spare36,</if>
-            <if test="spare37 != null">spare37,</if>
-            <if test="spare38 != null">spare38,</if>
-            <if test="spare39 != null">spare39,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoAreaId != null">cargo_area_id,</if>
-            <if test="theType != null">the_type,</if>
-            <if test="theTypeName != null">the_type_name,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
-            <if test="cargoStatus != null">cargo_status,</if>
-            <if test="locked != null">locked,</if>
-            <if test="cargoHight != null">cargo_hight,</if>
-            <if test="issDouble != null">iss_double,</if>
-            <if test="groupCodingNo != null">group_coding_no,</if>
-            <if test="groupCoding != null">group_coding,</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
-            <if test="thisCargoArea != null">this_cargo_area,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="warehouseName != null">#{warehouseName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="cDesc != null">#{cDesc},</if>
-            <if test="warehouseKind != null">#{warehouseKind},</if>
-            <if test="warehouseType != null">#{warehouseType},</if>
-            <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spare10 != null">#{spare10},</if>
-            <if test="spare11 != null">#{spare11},</if>
-            <if test="spare12 != null">#{spare12},</if>
-            <if test="spare13 != null">#{spare13},</if>
-            <if test="spare14 != null">#{spare14},</if>
-            <if test="spare15 != null">#{spare15},</if>
-            <if test="spare16 != null">#{spare16},</if>
-            <if test="spare17 != null">#{spare17},</if>
-            <if test="spare18 != null">#{spare18},</if>
-            <if test="spare19 != null">#{spare19},</if>
-            <if test="spare20 != null">#{spare20},</if>
-            <if test="spare21 != null">#{spare21},</if>
-            <if test="spare22 != null">#{spare22},</if>
-            <if test="spare23 != null">#{spare23},</if>
-            <if test="spare24 != null">#{spare24},</if>
-            <if test="spare25 != null">#{spare25},</if>
-            <if test="spare26 != null">#{spare26},</if>
-            <if test="spare27 != null">#{spare27},</if>
-            <if test="spare28 != null">#{spare28},</if>
-            <if test="spare29 != null">#{spare29},</if>
-            <if test="spare30 != null">#{spare30},</if>
-            <if test="spare31 != null">#{spare31},</if>
-            <if test="spare32 != null">#{spare32},</if>
-            <if test="spare33 != null">#{spare33},</if>
-            <if test="spare34 != null">#{spare34},</if>
-            <if test="spare35 != null">#{spare35},</if>
-            <if test="spare36 != null">#{spare36},</if>
-            <if test="spare37 != null">#{spare37},</if>
-            <if test="spare38 != null">#{spare38},</if>
-            <if test="spare39 != null">#{spare39},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoAreaId != null">#{cargoAreaId},</if>
-            <if test="theType != null">#{theType},</if>
-            <if test="theTypeName != null">#{theTypeName},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
-            <if test="cargoStatus != null">#{cargoStatus},</if>
-            <if test="locked != null">#{locked},</if>
-            <if test="cargoHight != null">#{cargoHight},</if>
-            <if test="issDouble != null">#{issDouble},</if>
-            <if test="groupCodingNo != null">#{groupCodingNo},</if>
-            <if test="groupCoding != null">#{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">#{thisCargoArea},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockSecure" parameterType="ViewStockSecure">
-        update view_stock_secure
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="cDesc != null">c_desc = #{cDesc},</if>
-            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
-            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
-            <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="spare10 != null">spare10 = #{spare10},</if>
-            <if test="spare11 != null">spare11 = #{spare11},</if>
-            <if test="spare12 != null">spare12 = #{spare12},</if>
-            <if test="spare13 != null">spare13 = #{spare13},</if>
-            <if test="spare14 != null">spare14 = #{spare14},</if>
-            <if test="spare15 != null">spare15 = #{spare15},</if>
-            <if test="spare16 != null">spare16 = #{spare16},</if>
-            <if test="spare17 != null">spare17 = #{spare17},</if>
-            <if test="spare18 != null">spare18 = #{spare18},</if>
-            <if test="spare19 != null">spare19 = #{spare19},</if>
-            <if test="spare20 != null">spare20 = #{spare20},</if>
-            <if test="spare21 != null">spare21 = #{spare21},</if>
-            <if test="spare22 != null">spare22 = #{spare22},</if>
-            <if test="spare23 != null">spare23 = #{spare23},</if>
-            <if test="spare24 != null">spare24 = #{spare24},</if>
-            <if test="spare25 != null">spare25 = #{spare25},</if>
-            <if test="spare26 != null">spare26 = #{spare26},</if>
-            <if test="spare27 != null">spare27 = #{spare27},</if>
-            <if test="spare28 != null">spare28 = #{spare28},</if>
-            <if test="spare29 != null">spare29 = #{spare29},</if>
-            <if test="spare30 != null">spare30 = #{spare30},</if>
-            <if test="spare31 != null">spare31 = #{spare31},</if>
-            <if test="spare32 != null">spare32 = #{spare32},</if>
-            <if test="spare33 != null">spare33 = #{spare33},</if>
-            <if test="spare34 != null">spare34 = #{spare34},</if>
-            <if test="spare35 != null">spare35 = #{spare35},</if>
-            <if test="spare36 != null">spare36 = #{spare36},</if>
-            <if test="spare37 != null">spare37 = #{spare37},</if>
-            <if test="spare38 != null">spare38 = #{spare38},</if>
-            <if test="spare39 != null">spare39 = #{spare39},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
-            <if test="theType != null">the_type = #{theType},</if>
-            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
-            <if test="cargoStatus != null">cargo_status = #{cargoStatus},</if>
-            <if test="locked != null">locked = #{locked},</if>
-            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
-            <if test="issDouble != null">iss_double = #{issDouble},</if>
-            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
-            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-
-    <delete id="deleteViewStockSecureByStockId" parameterType="String">
-        delete from view_stock_secure where stock_id = #{stockId}
-    </delete>
-
-    <delete id="deleteViewStockSecureByStockIds" parameterType="String">
-        delete from view_stock_secure where stock_id in 
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
-            #{stockId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml
deleted file mode 100644
index b6edfe6..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper">
-    
-    <resultMap type="ViewStockWarning" id="ViewStockWarningResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="address"    column="address"    />
-        <result property="cDesc"    column="c_desc"    />
-        <result property="warehouseKind"    column="warehouse_kind"    />
-        <result property="warehouseType"    column="warehouse_type"    />
-        <result property="isCurrent"    column="is_current"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spare10"    column="spare10"    />
-        <result property="spare11"    column="spare11"    />
-        <result property="spare12"    column="spare12"    />
-        <result property="spare13"    column="spare13"    />
-        <result property="spare14"    column="spare14"    />
-        <result property="spare15"    column="spare15"    />
-        <result property="spare16"    column="spare16"    />
-        <result property="spare17"    column="spare17"    />
-        <result property="spare18"    column="spare18"    />
-        <result property="spare19"    column="spare19"    />
-        <result property="spare20"    column="spare20"    />
-        <result property="spare21"    column="spare21"    />
-        <result property="spare22"    column="spare22"    />
-        <result property="spare23"    column="spare23"    />
-        <result property="spare24"    column="spare24"    />
-        <result property="spare25"    column="spare25"    />
-        <result property="spare26"    column="spare26"    />
-        <result property="spare27"    column="spare27"    />
-        <result property="spare28"    column="spare28"    />
-        <result property="spare29"    column="spare29"    />
-        <result property="spare30"    column="spare30"    />
-        <result property="spare31"    column="spare31"    />
-        <result property="spare32"    column="spare32"    />
-        <result property="spare33"    column="spare33"    />
-        <result property="spare34"    column="spare34"    />
-        <result property="spare35"    column="spare35"    />
-        <result property="spare36"    column="spare36"    />
-        <result property="spare37"    column="spare37"    />
-        <result property="spare38"    column="spare38"    />
-        <result property="spare39"    column="spare39"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoAreaId"    column="cargo_area_id"    />
-        <result property="theType"    column="the_type"    />
-        <result property="theTypeName"    column="the_type_name"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
-        <result property="cargoStatus"    column="cargo_status"    />
-        <result property="locked"    column="locked"    />
-        <result property="cargoHight"    column="cargo_hight"    />
-        <result property="issDouble"    column="iss_double"    />
-        <result property="groupCodingNo"    column="group_coding_no"    />
-        <result property="groupCoding"    column="group_coding"    />
-        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
-        <result property="thisCargoArea"    column="this_cargo_area"    />
-    </resultMap>
-
-    <sql id="selectViewStockWarningVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
-    </sql>
-
-    <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
-        <include refid="selectViewStockWarningVo"/>
-        <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
-            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
-            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
-            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
-            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
-            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
-            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
-            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
-            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
-            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
-            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
-            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
-            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
-            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
-            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
-            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
-            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
-            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
-            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
-            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
-            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
-            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
-            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
-            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
-            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
-            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
-            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
-            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
-            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
-            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
-            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
-            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
-            <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
-            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
-            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
-            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat("%", #{cargoStatus}, "%")</if>
-            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectViewStockWarningByStockId" parameterType="String" resultMap="ViewStockWarningResult">
-        <include refid="selectViewStockWarningVo"/>
-        where stock_id = #{stockId}
-    </select>
-
-    <insert id="insertViewStockWarning" parameterType="ViewStockWarning">
-        insert into view_stock_warning
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="warehouseName != null">warehouse_name,</if>
-            <if test="address != null">address,</if>
-            <if test="cDesc != null">c_desc,</if>
-            <if test="warehouseKind != null">warehouse_kind,</if>
-            <if test="warehouseType != null">warehouse_type,</if>
-            <if test="isCurrent != null">is_current,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spare10 != null">spare10,</if>
-            <if test="spare11 != null">spare11,</if>
-            <if test="spare12 != null">spare12,</if>
-            <if test="spare13 != null">spare13,</if>
-            <if test="spare14 != null">spare14,</if>
-            <if test="spare15 != null">spare15,</if>
-            <if test="spare16 != null">spare16,</if>
-            <if test="spare17 != null">spare17,</if>
-            <if test="spare18 != null">spare18,</if>
-            <if test="spare19 != null">spare19,</if>
-            <if test="spare20 != null">spare20,</if>
-            <if test="spare21 != null">spare21,</if>
-            <if test="spare22 != null">spare22,</if>
-            <if test="spare23 != null">spare23,</if>
-            <if test="spare24 != null">spare24,</if>
-            <if test="spare25 != null">spare25,</if>
-            <if test="spare26 != null">spare26,</if>
-            <if test="spare27 != null">spare27,</if>
-            <if test="spare28 != null">spare28,</if>
-            <if test="spare29 != null">spare29,</if>
-            <if test="spare30 != null">spare30,</if>
-            <if test="spare31 != null">spare31,</if>
-            <if test="spare32 != null">spare32,</if>
-            <if test="spare33 != null">spare33,</if>
-            <if test="spare34 != null">spare34,</if>
-            <if test="spare35 != null">spare35,</if>
-            <if test="spare36 != null">spare36,</if>
-            <if test="spare37 != null">spare37,</if>
-            <if test="spare38 != null">spare38,</if>
-            <if test="spare39 != null">spare39,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoAreaId != null">cargo_area_id,</if>
-            <if test="theType != null">the_type,</if>
-            <if test="theTypeName != null">the_type_name,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
-            <if test="cargoStatus != null">cargo_status,</if>
-            <if test="locked != null">locked,</if>
-            <if test="cargoHight != null">cargo_hight,</if>
-            <if test="issDouble != null">iss_double,</if>
-            <if test="groupCodingNo != null">group_coding_no,</if>
-            <if test="groupCoding != null">group_coding,</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
-            <if test="thisCargoArea != null">this_cargo_area,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="warehouseName != null">#{warehouseName},</if>
-            <if test="address != null">#{address},</if>
-            <if test="cDesc != null">#{cDesc},</if>
-            <if test="warehouseKind != null">#{warehouseKind},</if>
-            <if test="warehouseType != null">#{warehouseType},</if>
-            <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spare10 != null">#{spare10},</if>
-            <if test="spare11 != null">#{spare11},</if>
-            <if test="spare12 != null">#{spare12},</if>
-            <if test="spare13 != null">#{spare13},</if>
-            <if test="spare14 != null">#{spare14},</if>
-            <if test="spare15 != null">#{spare15},</if>
-            <if test="spare16 != null">#{spare16},</if>
-            <if test="spare17 != null">#{spare17},</if>
-            <if test="spare18 != null">#{spare18},</if>
-            <if test="spare19 != null">#{spare19},</if>
-            <if test="spare20 != null">#{spare20},</if>
-            <if test="spare21 != null">#{spare21},</if>
-            <if test="spare22 != null">#{spare22},</if>
-            <if test="spare23 != null">#{spare23},</if>
-            <if test="spare24 != null">#{spare24},</if>
-            <if test="spare25 != null">#{spare25},</if>
-            <if test="spare26 != null">#{spare26},</if>
-            <if test="spare27 != null">#{spare27},</if>
-            <if test="spare28 != null">#{spare28},</if>
-            <if test="spare29 != null">#{spare29},</if>
-            <if test="spare30 != null">#{spare30},</if>
-            <if test="spare31 != null">#{spare31},</if>
-            <if test="spare32 != null">#{spare32},</if>
-            <if test="spare33 != null">#{spare33},</if>
-            <if test="spare34 != null">#{spare34},</if>
-            <if test="spare35 != null">#{spare35},</if>
-            <if test="spare36 != null">#{spare36},</if>
-            <if test="spare37 != null">#{spare37},</if>
-            <if test="spare38 != null">#{spare38},</if>
-            <if test="spare39 != null">#{spare39},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoAreaId != null">#{cargoAreaId},</if>
-            <if test="theType != null">#{theType},</if>
-            <if test="theTypeName != null">#{theTypeName},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
-            <if test="cargoStatus != null">#{cargoStatus},</if>
-            <if test="locked != null">#{locked},</if>
-            <if test="cargoHight != null">#{cargoHight},</if>
-            <if test="issDouble != null">#{issDouble},</if>
-            <if test="groupCodingNo != null">#{groupCodingNo},</if>
-            <if test="groupCoding != null">#{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">#{thisCargoArea},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockWarning" parameterType="ViewStockWarning">
-        update view_stock_warning
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="cDesc != null">c_desc = #{cDesc},</if>
-            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
-            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
-            <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="spare10 != null">spare10 = #{spare10},</if>
-            <if test="spare11 != null">spare11 = #{spare11},</if>
-            <if test="spare12 != null">spare12 = #{spare12},</if>
-            <if test="spare13 != null">spare13 = #{spare13},</if>
-            <if test="spare14 != null">spare14 = #{spare14},</if>
-            <if test="spare15 != null">spare15 = #{spare15},</if>
-            <if test="spare16 != null">spare16 = #{spare16},</if>
-            <if test="spare17 != null">spare17 = #{spare17},</if>
-            <if test="spare18 != null">spare18 = #{spare18},</if>
-            <if test="spare19 != null">spare19 = #{spare19},</if>
-            <if test="spare20 != null">spare20 = #{spare20},</if>
-            <if test="spare21 != null">spare21 = #{spare21},</if>
-            <if test="spare22 != null">spare22 = #{spare22},</if>
-            <if test="spare23 != null">spare23 = #{spare23},</if>
-            <if test="spare24 != null">spare24 = #{spare24},</if>
-            <if test="spare25 != null">spare25 = #{spare25},</if>
-            <if test="spare26 != null">spare26 = #{spare26},</if>
-            <if test="spare27 != null">spare27 = #{spare27},</if>
-            <if test="spare28 != null">spare28 = #{spare28},</if>
-            <if test="spare29 != null">spare29 = #{spare29},</if>
-            <if test="spare30 != null">spare30 = #{spare30},</if>
-            <if test="spare31 != null">spare31 = #{spare31},</if>
-            <if test="spare32 != null">spare32 = #{spare32},</if>
-            <if test="spare33 != null">spare33 = #{spare33},</if>
-            <if test="spare34 != null">spare34 = #{spare34},</if>
-            <if test="spare35 != null">spare35 = #{spare35},</if>
-            <if test="spare36 != null">spare36 = #{spare36},</if>
-            <if test="spare37 != null">spare37 = #{spare37},</if>
-            <if test="spare38 != null">spare38 = #{spare38},</if>
-            <if test="spare39 != null">spare39 = #{spare39},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
-            <if test="theType != null">the_type = #{theType},</if>
-            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
-            <if test="cargoStatus != null">cargo_status = #{cargoStatus},</if>
-            <if test="locked != null">locked = #{locked},</if>
-            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
-            <if test="issDouble != null">iss_double = #{issDouble},</if>
-            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
-            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
-            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
-            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-
-    <delete id="deleteViewStockWarningByStockId" parameterType="String">
-        delete from view_stock_warning where stock_id = #{stockId}
-    </delete>
-
-    <delete id="deleteViewStockWarningByStockIds" parameterType="String">
-        delete from view_stock_warning where stock_id in 
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
-            #{stockId}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml
deleted file mode 100644
index dfcd35f..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper">
-    
-    <resultMap type="ViewStockinHistory" id="ViewStockinHistoryResult">
-        <result property="stockinGuid"    column="stockin_guid"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="finishDate"    column="finish_date"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="erpBill"    column="erp_bill"    />
-        <result property="stockSource"    column="stock_source"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="classNo"    column="class_no"    />
-        <result property="supplierNo"    column="supplier_no"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="remark"    column="remark"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="cjgx"    column="cjgx"    />
-        <result property="scwl"    column="scwl"    />
-        <result property="dcwl"    column="dcwl"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="productName"    column="product_name"    />
-    </resultMap>
-
-    <sql id="selectViewStockinHistoryVo">
-        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, lot_no, stockin_detail_id, product_guid, product_id, quantity, quantity_j, quantity_x, remark, assign_num, assign_num_j, assign_num_x, unit, spec, cjgx, scwl, dcwl, scan_num, scan_num_j, scan_num_x, product_name from view_stockin_history
-    </sql>
-
-    <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
-        <include refid="selectViewStockinHistoryVo"/>
-        <where>  
-            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="cjgx != null  and cjgx != ''"> and cjgx like concat("%", #{cjgx}, "%")</if>
-            <if test="scwl != null  and scwl != ''"> and scwl like concat("%", #{scwl}, "%")</if>
-            <if test="dcwl != null  and dcwl != ''"> and dcwl like concat("%", #{dcwl}, "%")</if>
-            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectViewStockinHistoryByStockinGuid" parameterType="String" resultMap="ViewStockinHistoryResult">
-        <include refid="selectViewStockinHistoryVo"/>
-        where stockin_guid = #{stockinGuid}
-    </select>
-
-    <insert id="insertViewStockinHistory" parameterType="ViewStockinHistory">
-        insert into view_stockin_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="inType != null and inType != ''">in_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="finishDate != null">finish_date,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="erpBill != null">erp_bill,</if>
-            <if test="stockSource != null">stock_source,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="classNo != null">class_no,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="remark != null">remark,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="cjgx != null">cjgx,</if>
-            <if test="scwl != null">scwl,</if>
-            <if test="dcwl != null">dcwl,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="productName != null">product_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="inType != null and inType != ''">#{inType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="finishDate != null">#{finishDate},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="erpBill != null">#{erpBill},</if>
-            <if test="stockSource != null">#{stockSource},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="classNo != null">#{classNo},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="cjgx != null">#{cjgx},</if>
-            <if test="scwl != null">#{scwl},</if>
-            <if test="dcwl != null">#{dcwl},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="productName != null">#{productName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockinHistory" parameterType="ViewStockinHistory">
-        update view_stockin_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
-            <if test="inType != null and inType != ''">in_type = #{inType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="finishDate != null">finish_date = #{finishDate},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="erpBill != null">erp_bill = #{erpBill},</if>
-            <if test="stockSource != null">stock_source = #{stockSource},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="classNo != null">class_no = #{classNo},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="cjgx != null">cjgx = #{cjgx},</if>
-            <if test="scwl != null">scwl = #{scwl},</if>
-            <if test="dcwl != null">dcwl = #{dcwl},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-        </trim>
-        where stockin_guid = #{stockinGuid}
-    </update>
-
-    <delete id="deleteViewStockinHistoryByStockinGuid" parameterType="String">
-        delete from view_stockin_history where stockin_guid = #{stockinGuid}
-    </delete>
-
-    <delete id="deleteViewStockinHistoryByStockinGuids" parameterType="String">
-        delete from view_stockin_history where stockin_guid in 
-        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
-            #{stockinGuid}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml
deleted file mode 100644
index 88e434d..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper">
-    
-    <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
-        <result property="stockoutGuid"    column="stockout_guid"    />
-        <result property="stockoutId"    column="stockout_id"    />
-        <result property="outType"    column="out_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="departmentNo"    column="department_no"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="stockoutSource"    column="stockout_source"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="classNowId"    column="class_now_id"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="productId"    column="product_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="remark"    column="remark"    />
-        <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
-        <result property="productName"    column="product_name"    />
-        <result property="cjgx"    column="cjgx"    />
-        <result property="scwl"    column="scwl"    />
-        <result property="dcwl"    column="dcwl"    />
-        <result property="spare9"    column="spare9"    />
-    </resultMap>
-
-    <sql id="selectViewStockoutHistoryVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, spare1, spare2, spare3, spare4, spare5, stockout_detail_id, lot_no, product_id, quantity, assign_num, allot_quantity, remark, unit, spec, product_name, cjgx, scwl, dcwl, spare9 from view_stockout_history
-    </sql>
-
-    <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
-        <include refid="selectViewStockoutHistoryVo"/>
-        <where>  
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
-            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
-            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
-            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
-            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
-            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="cjgx != null  and cjgx != ''"> and cjgx like concat("%", #{cjgx}, "%")</if>
-            <if test="scwl != null  and scwl != ''"> and scwl like concat("%", #{scwl}, "%")</if>
-            <if test="dcwl != null  and dcwl != ''"> and dcwl like concat("%", #{dcwl}, "%")</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat("%", #{spare9}, "%")</if>
-        </where>
-    </select>
-    
-    <select id="selectViewStockoutHistoryByStockoutGuid" parameterType="String" resultMap="ViewStockoutHistoryResult">
-        <include refid="selectViewStockoutHistoryVo"/>
-        where stockout_guid = #{stockoutGuid}
-    </select>
-
-    <insert id="insertViewStockoutHistory" parameterType="ViewStockoutHistory">
-        insert into view_stockout_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
-            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null and outType != ''">out_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="departmentNo != null">department_no,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="stockoutSource != null">stockout_source,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="classNowId != null">class_now_id,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="allotQuantity != null">allot_quantity,</if>
-            <if test="remark != null">remark,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="cjgx != null">cjgx,</if>
-            <if test="scwl != null">scwl,</if>
-            <if test="dcwl != null">dcwl,</if>
-            <if test="spare9 != null">spare9,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
-            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null and outType != ''">#{outType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="departmentNo != null">#{departmentNo},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="stockoutSource != null">#{stockoutSource},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="classNowId != null">#{classNowId},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="cjgx != null">#{cjgx},</if>
-            <if test="scwl != null">#{scwl},</if>
-            <if test="dcwl != null">#{dcwl},</if>
-            <if test="spare9 != null">#{spare9},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
-        update view_stockout_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
-            <if test="outType != null and outType != ''">out_type = #{outType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="departmentNo != null">department_no = #{departmentNo},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="classNowId != null">class_now_id = #{classNowId},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="cjgx != null">cjgx = #{cjgx},</if>
-            <if test="scwl != null">scwl = #{scwl},</if>
-            <if test="dcwl != null">dcwl = #{dcwl},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-        </trim>
-        where stockout_guid = #{stockoutGuid}
-    </update>
-
-    <delete id="deleteViewStockoutHistoryByStockoutGuid" parameterType="String">
-        delete from view_stockout_history where stockout_guid = #{stockoutGuid}
-    </delete>
-
-    <delete id="deleteViewStockoutHistoryByStockoutGuids" parameterType="String">
-        delete from view_stockout_history where stockout_guid in 
-        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
-            #{stockoutGuid}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml
deleted file mode 100644
index 58d3edd..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper">
-
-    <resultMap type="BasStockFreezeRecord" id="BasStockFreezeRecordResult">
-        <result property="whGuid"    column="wh_guid"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="oldStatus"    column="old_status"    />
-        <result property="currStatus"    column="curr_status"    />
-        <result property="method"    column="method"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="stockDetailId"    column="stock_detail_id"    />
-        <result property="operatingTarget"    column="operating_target"    />
-        <result property="barCodeOldQuantity"    column="bar_code_old_quantity"    />
-        <result property="barCodeQuantity"    column="bar_code_quantity"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-    </resultMap>
-
-    <sql id="selectBasStockFreezeRecordVo">
-        select wh_guid, stock_id, bsfr.cargo_space_id,bw.warehouse_name,  bcs.cargo_space_name, bsfr.tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, bsfr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
-        from bas_stock_freeze_record bsfr
-        left join bas_cargo_space bcs on bsfr.cargo_space_id=bcs.cargo_space_id
-        left join bas_warehouse bw on bsfr.warehouse_id=bw.warehouse_id
-    </sql>
-
-    <select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
-        <include refid="selectBasStockFreezeRecordVo"/>
-        <where>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsfr.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and bsfr.tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="oldStatus != null  and oldStatus != ''"> and old_status like concat("%", #{oldStatus}, "%")</if>
-            <if test="currStatus != null  and currStatus != ''"> and curr_status like concat("%", #{currStatus}, "%")</if>
-            <if test="method != null  and method != ''"> and method like concat("%", #{method}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bsfr.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id like concat("%", #{stockDetailId}, "%")</if>
-            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target like concat("%", #{operatingTarget}, "%")</if>
-            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity like concat("%", #{barCodeOldQuantity}, "%")</if>
-            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity like concat("%", #{barCodeQuantity}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-             order by create_time desc
-    </select>
-
-    <select id="selectBasStockFreezeRecordByWhGuid" parameterType="String" resultMap="BasStockFreezeRecordResult">
-        <include refid="selectBasStockFreezeRecordVo"/>
-        where wh_guid = #{whGuid}
-    </select>
-
-    <insert id="insertBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
-        insert into bas_stock_freeze_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="whGuid != null">wh_guid,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="oldStatus != null">old_status,</if>
-            <if test="currStatus != null">curr_status,</if>
-            <if test="method != null">method,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="stockDetailId != null">stock_detail_id,</if>
-            <if test="operatingTarget != null">operating_target,</if>
-            <if test="barCodeOldQuantity != null">bar_code_old_quantity,</if>
-            <if test="barCodeQuantity != null">bar_code_quantity,</if>
-            <if test="productGuid != null">product_guid,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="whGuid != null">#{whGuid},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="oldStatus != null">#{oldStatus},</if>
-            <if test="currStatus != null">#{currStatus},</if>
-            <if test="method != null">#{method},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="stockDetailId != null">#{stockDetailId},</if>
-            <if test="operatingTarget != null">#{operatingTarget},</if>
-            <if test="barCodeOldQuantity != null">#{barCodeOldQuantity},</if>
-            <if test="barCodeQuantity != null">#{barCodeQuantity},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
-        update bas_stock_freeze_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="oldStatus != null">old_status = #{oldStatus},</if>
-            <if test="currStatus != null">curr_status = #{currStatus},</if>
-            <if test="method != null">method = #{method},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="stockDetailId != null">stock_detail_id = #{stockDetailId},</if>
-            <if test="operatingTarget != null">operating_target = #{operatingTarget},</if>
-            <if test="barCodeOldQuantity != null">bar_code_old_quantity = #{barCodeOldQuantity},</if>
-            <if test="barCodeQuantity != null">bar_code_quantity = #{barCodeQuantity},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-        </trim>
-        where wh_guid = #{whGuid}
-    </update>
-
-    <delete id="deleteBasStockFreezeRecordByWhGuid" parameterType="String">
-        delete from bas_stock_freeze_record where wh_guid = #{whGuid}
-    </delete>
-
-    <delete id="deleteBasStockFreezeRecordByWhGuids" parameterType="String">
-        delete from bas_stock_freeze_record where wh_guid in
-        <foreach item="whGuid" collection="array" open="(" separator="," close=")">
-            #{whGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml
deleted file mode 100644
index 45e5f74..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.stock.maintain.mapper.BasStockMaintainRecordMapper">
-
-    <resultMap type="BasStockMaintainRecord" id="BasStockMaintainRecordResult">
-        <result property="whGuid"    column="wh_guid"    />
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="oldQuantity"    column="old_quantity"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="method"    column="method"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="stockDetailId"    column="stock_detail_id"    />
-        <result property="operatingTarget"    column="operating_target"    />
-        <result property="barCodeOldQuantity"    column="bar_code_old_quantity"    />
-        <result property="barCodeQuantity"    column="bar_code_quantity"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-    </resultMap>
-
-    <sql id="selectBasStockMaintainRecordVo">
-        select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name,  bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
-        from bas_stock_maintain_record bsmr
-         left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id
-         left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id
-    </sql>
-
-    <select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult">
-        <include refid="selectBasStockMaintainRecordVo"/>
-        <where>
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsmr.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and bsmr.tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="oldQuantity != null  and oldQuantity != ''"> and old_quantity like concat("%", #{oldQuantity}, "%")</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
-            <if test="method != null  and method != ''"> and method like concat("%", #{method}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bsmr.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id like concat("%", #{stockDetailId}, "%")</if>
-            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target like concat("%", #{operatingTarget}, "%")</if>
-            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity like concat("%", #{barCodeOldQuantity}, "%")</if>
-            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity like concat("%", #{barCodeQuantity}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by create_time desc
-    </select>
-
-    <select id="selectBasStockMaintainRecordByWhGuid" parameterType="String" resultMap="BasStockMaintainRecordResult">
-        <include refid="selectBasStockMaintainRecordVo"/>
-        where wh_guid = #{whGuid}
-    </select>
-
-    <insert id="insertBasStockMaintainRecord" parameterType="BasStockMaintainRecord">
-        insert into bas_stock_maintain_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="whGuid != null">wh_guid,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="oldQuantity != null">old_quantity,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="method != null">method,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="stockDetailId != null">stock_detail_id,</if>
-            <if test="operatingTarget != null">operating_target,</if>
-            <if test="barCodeOldQuantity != null">bar_code_old_quantity,</if>
-            <if test="barCodeQuantity != null">bar_code_quantity,</if>
-            <if test="productGuid != null">product_guid,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="whGuid != null">#{whGuid},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="oldQuantity != null">#{oldQuantity},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="method != null">#{method},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="stockDetailId != null">#{stockDetailId},</if>
-            <if test="operatingTarget != null">#{operatingTarget},</if>
-            <if test="barCodeOldQuantity != null">#{barCodeOldQuantity},</if>
-            <if test="barCodeQuantity != null">#{barCodeQuantity},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasStockMaintainRecord" parameterType="BasStockMaintainRecord">
-        update bas_stock_maintain_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="method != null">method = #{method},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="stockDetailId != null">stock_detail_id = #{stockDetailId},</if>
-            <if test="operatingTarget != null">operating_target = #{operatingTarget},</if>
-            <if test="barCodeOldQuantity != null">bar_code_old_quantity = #{barCodeOldQuantity},</if>
-            <if test="barCodeQuantity != null">bar_code_quantity = #{barCodeQuantity},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-        </trim>
-        where wh_guid = #{whGuid}
-    </update>
-
-    <delete id="deleteBasStockMaintainRecordByWhGuid" parameterType="String">
-        delete from bas_stock_maintain_record where wh_guid = #{whGuid}
-    </delete>
-
-    <delete id="deleteBasStockMaintainRecordByWhGuids" parameterType="String">
-        delete from bas_stock_maintain_record where wh_guid in
-        <foreach item="whGuid" collection="array" open="(" separator="," close=")">
-            #{whGuid}
-        </foreach>
-    </delete>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml
deleted file mode 100644
index 638437d..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.stock.stock.mapper.BasStockMapper">
-
-    <resultMap type="BasStock" id="BasStockResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="cargoSpaceStatus"    column="locked"    />
-        <result property="cargoSpaceStockStatus"    column="cargoSpaceStockStatus"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId"    column="product_id"    />
-            <result property="materialDesc"    column="product_name"    />
-            <result property="englishDesc"    column="englishDesc"    />
-            <result property="length"    column="length"    />
-            <result property="width"    column="width"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>
-    </resultMap>
-
-    <sql id="selectBasStockVo">
-        select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
-               bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
-               bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
-               bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
-               bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
-               bs.product_name,bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
-               bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus
-        from bas_stock bs
-        left join bas_product bp on bs.product_id = bp.product_id
-        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
-        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
-    </sql>
-
-    <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
-        <include refid="selectBasStockVo"/>
-        <where>
-            <if test="stockId != null  and stockId != ''"> and bs.stock_id like concat("%", #{stockId}, "%")</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status like concat("%", #{stockStatus}, "%")</if>
-            <if test="productStatus != null  and productStatus != ''"> and bs.product_status like concat("%", #{productStatus}, "%")</if>
-            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no like concat("%", #{lotNo}, "%")</if>
-            <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
-            <if test="backDate != null  and backDate != ''"> and bs.back_date like concat("%", #{backDate}, "%")</if>
-            <if test="productGuid != null  and productGuid != ''"> and bs.product_guid like concat("%", #{productGuid}, "%")</if>
-            <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and bs.quantity like concat("%", #{quantity}, "%")</if>
-            <if test="jobId != null  and jobId != ''"> and bs.job_id like concat("%", #{jobId}, "%")</if>
-            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat("%", #{trayCode}, "%")</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity like concat("%", #{outQuantity}, "%")</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
-            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id like concat("%", #{stockinId}, "%")</if>
-            <if test="inType != null  and inType != ''"> and bs.in_type like concat("%", #{inType}, "%")</if>
-            <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id like concat("%", #{inClassId}, "%")</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
-            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id like concat("%", #{stackingId}, "%")</if>
-            <if test="spare1 != null  and spare1 != ''"> and bs.spare1 like concat("%", #{spare1}, "%")</if>
-            <if test="spare2 != null  and spare2 != ''"> and bs.spare2 like concat("%", #{spare2}, "%")</if>
-            <if test="spare3 != null  and spare3 != ''"> and bs.spare3 like concat("%", #{spare3}, "%")</if>
-            <if test="spare4 != null  and spare4 != ''"> and bs.spare4 like concat("%", #{spare4}, "%")</if>
-            <if test="spare5 != null  and spare5 != ''"> and bs.spare5 like concat("%", #{spare5}, "%")</if>
-            <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat("%", #{spare6}, "%")</if>
-            <if test="voltage != null  and voltage != ''"> and bs.voltage like concat("%", #{voltage}, "%")</if>
-            <if test="power != null  and power != ''"> and bs.power like concat("%", #{power}, "%")</if>
-            <if test="phase != null  and phase != ''"> and bs.phase like concat("%", #{phase}, "%")</if>
-            <if test="netWeight != null  and netWeight != ''"> and bs.net_weight like concat("%", #{netWeight}, "%")</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight like concat("%", #{grossWeight}, "%")</if>
-            <if test="distribution != null  and distribution != ''"> and bs.distribution like concat("%", #{distribution}, "%")</if>
-            <if test="model != null  and model != ''"> and bs.model like concat("%", #{model}, "%")</if>
-            <if test="orderId != null  and orderId != ''"> and bs.order_id like concat("%", #{orderId}, "%")</if>
-            <if test="productId != null  and productId != ''"> and bs.product_id like concat("%", #{productId}, "%")</if>
-            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status like concat("%", #{cargoSpaceStockStatus}, "%")</if>
-
-        </where>
-    </select>
-
-    <select id="selectBasStockByStockId" parameterType="String" resultMap="BasStockResult">
-        <include refid="selectBasStockVo"/>
-        where stock_id = #{stockId}
-    </select>
-
-    <insert id="insertBasStock" parameterType="BasStock">
-        insert into bas_stock
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
-         </trim>
-    </insert>
-    <insert id="insertBasStockList">
-        INSERT INTO bas_stock
-            (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7)
-        VALUES
-            <foreach collection="list" item="item" separator=",">
-                (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
-                ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7})
-            </foreach>
-    </insert>
-
-    <update id="updateBasStock" parameterType="BasStock">
-        update bas_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-    <update id="updateStockStatusByTrayCode">
-        update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode}
-    </update>
-    <update id="resetPdRecord">
-        update bas_stock set spare7 = '0'
-    </update>
-
-    <delete id="deleteBasStockByStockId" parameterType="String">
-        delete from bas_stock where stock_id = #{stockId}
-    </delete>
-
-    <delete id="deleteBasStockByStockIds" parameterType="String">
-        delete from bas_stock where stock_id in
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
-            #{stockId}
-        </foreach>
-    </delete>
-
-    <select id="selectKtpStock" parameterType="BasStock" resultMap="BasStockResult">
-        select b.cargo_space_name, b.cargo_space_id  from bas_stock s,bas_cargo_space b
-        <where>
-        s.warehouse_id=#{warehouseId}
-         and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and s.product_id='KTP0001'
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
-        order by b.the_platoon,b.the_floor,b.the_column asc
-    </select>
-
-    <select id="getStockBySerial" parameterType="String" resultMap="BasStockResult">
-        select * from bas_stock where tray_code = #{trayCode}
-    </select>
-
-    <select id="selectHasHalfTray" parameterType="InStockinDetail" resultMap="BasStockResult">
-        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where  bs.spare4=#{spare4} and bs.product_id like concat("%", #{productId}, "%")
-                                                                                                                                               and bs.spare2 like concat("%", #{spare2}, "%")
-                                                                                                                                                 and bs.model=0 and bcs.status=2
-        union
-        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}
-                                                                                                                                               and bs.spare2 like concat("%", #{spare2}, "%")
-                                                                                                                                                 and  bs.model=0 and bcs.status=2
-        UNION
-        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}  and bs.model=0 and bcs.status=2
-    </select>
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml
deleted file mode 100644
index 79869d6..0000000
--- a/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.work.mapper.ViewNoDoneOutWorkMapper">
-    
-    <resultMap type="ViewNoDoneOutWork" id="ViewNoDoneOutWorkResult">
-        <result property="workName"    column="work_name"    />
-        <result property="workValue"    column="work_value"    />
-        <result property="workNum"    column="work_num"    />
-        <result property="by1"    column="by1"    />
-        <result property="by2"    column="by2"    />
-        <result property="by3"    column="by3"    />
-        <result property="by4"    column="by4"    />
-        <result property="by5"    column="by5"    />
-    </resultMap>
-
-    <select id="selectViewNoDoneOutWorkList1" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
-        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_is_done_in_work
-    </select>
-    <select id="selectViewNoDoneOutWorkList2" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
-        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_is_done_out_work
-    </select>
-    <select id="selectViewNoDoneOutWorkList3" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
-        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_no_done_in_work
-    </select>
-    <select id="selectViewNoDoneOutWorkList4" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
-        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_no_done_out_work
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
index 0e81ed7..9162384 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</if>
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat('%', #{stockoutGuid}, '%')</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
             <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
index 53077b5..4168ae0 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
@@ -158,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat('%', #{erpStockoutId}, '%')</if>
             <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
             <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
+            <if test="spare4 != null  and spare4 != ''"> and d.spare4 like concat('%', #{spare4}, '%')</if>
             <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
             <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index f52bdaf..61c9efc 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare6"    column="spare6"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
+        <result property="accountSetNo"    column="account_set_no"    />
     </resultMap>
 
     <sql id="selectOutStockoutVo">
@@ -61,17 +62,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exitId != null  and exitId != ''"> and o.exit_id like concat('%', #{exitId}, '%')</if>
             <if test="carNumber != null  and carNumber != ''"> and o.car_number like concat('%', #{carNumber}, '%')</if>
             <if test="FID != null  and FID != ''"> and o.FID like concat('%', #{FID}, '%')</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat('%', #{erpStockoutId}, '%')</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id = #{erpStockoutId}</if>
             <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
             <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
             <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and d.spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and o.spare8 like concat('%', #{spare8}, '%')</if>
-
+            <if test="accountSetNo != null  and accountSetNo != ''"> and o.account_set_no = #{accountSetNo}</if>
 
         </where>
         order by o.create_date desc
@@ -213,6 +214,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  )
             }
     </select>
+
+    <update id="updateOutStockouts" parameterType="OutStockout">
+        update out_stockout
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="carNumber != null">car_number = #{carNumber},</if>
+            <if test="FID != null">FID = #{FID},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
+        </trim>
+        where stockout_guid = #{stockoutGuid}
+    </update>
+
+
+
     <select id="selectOutStockoutByStockoutId" resultMap="OutStockoutResult">
         select distinct o.stockout_guid,
                         o.stockout_id,
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index 65018da..a5fc899 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper">
-    
+
     <resultMap type="ViewHandAllotStock" id="ViewHandAllotStockResult">
         <result property="stockId"    column="stock_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
@@ -53,10 +53,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectViewHandAllotStockVo">
         select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, roadway_id, the_platoon, the_column, the_floor, status, locked from view_hand_allot_stock
     </sql>
+    <sql id="selectViewHandAllotStockHcVo">
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8 from view_hand_allot_stock_hc
+    </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
-        <include refid="selectViewHandAllotStockVo"/>
-        <where>  
+        <choose>
+            <!-- 当 warehouseCode = 1 时，使用原片段 -->
+            <when test="warehouseCode != null and warehouseCode == 1">
+                <include refid="selectViewHandAllotStockVo"/>
+            </when>
+            <!-- 其他情况，使用 HC 片段 -->
+            <otherwise>
+                <include refid="selectViewHandAllotStockHcVo"/>
+            </otherwise>
+        </choose>
+        <where>
             <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
             <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
@@ -100,11 +112,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
             <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="locked != null  and locked != ''"> and locked like concat('%', #{locked}, '%')</if>
+
+            <if test="ktpType != null and ktpType == 2">
+                and product_id not in ('KTP0001', 'KTP0002')
+            </if>
+            <if test="ktpType != null and ktpType == 1">
+                and product_id  in ('KTP0001', 'KTP0002')
+            </if>
+
         </where>
     </select>
-    
+
     <select id="selectViewHandAllotStockByStockId" parameterType="String" resultMap="ViewHandAllotStockResult">
+<choose>
+    <when test="warehouseCode !=null and warehouseCode='1'">
         <include refid="selectViewHandAllotStockVo"/>
+    </when>
+<otherwise>
+    <include refid="selectViewHandAllotStockHcVo"/>
+</otherwise>
+</choose>
+
+
+
         where stock_id = #{stockId}
     </select>
 
@@ -256,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewHandAllotStockByStockIds" parameterType="String">
-        delete from view_hand_allot_stock where stock_id in 
+        delete from view_hand_allot_stock where stock_id in
         <foreach item="stockId" collection="array" open="(" separator="," close=")">
             #{stockId}
         </foreach>
diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
index f2e0f0d..d31df4a 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -155,5 +155,50 @@
               )}
 
     </select>
+    <select id="completeInPk" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_complete_in_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                                  #{v_in_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                                  #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                                  #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
+                                  #{v_result,mode=OUT,jdbcType=INTEGER},
+                                  #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+    </select>
+    <select id="selectByTrayCodeAndProduct" parameterType="string" resultType="java.lang.Integer">
+        select count(1)
+        from mydo_job_detail
+        where job_id in (select job_id from mydo_job where tray_code = #{trayCode} and in_or_out > 20)
+          and product_id = #{productId}
+    </select>
+    <select id="completeOutPk" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_complete_out_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                                   #{v_out_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                                   #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                                   #{v_stock_id,mode=IN,jdbcType=VARCHAR},
+                                   #{v_result,mode=OUT,jdbcType=INTEGER},
+                                   #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+    </select>
+    <select id="FillFinishAllot" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_fill_finish(
+                                   #{v_result,mode=OUT,jdbcType=INTEGER},
+                                   #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+
+    </select>
+
+    <select id="FillFinishAllotOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_fill_finish_out(
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+
+    </select>
+    <select id="bindTrayCheck" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_bind_tray_msg_check(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_is_bound_accord,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
 
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
index c5e87c1..bae57b6 100644
--- a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
@@ -112,6 +112,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from request_log where request_id = #{requestId}
     </delete>
 
+    <select id="getMethod" resultType="string">
+        select endpoint from request_log group by endpoint
+    </select>
+
+    <select id="getSource" resultType="string">
+        select source_system from request_log group by source_system
+    </select>
+    <select id="getTarget" resultType="string">
+        select target_system from request_log group by target_system
+    </select>
+
     <delete id="deleteRequestLogByRequestIds" parameterType="String">
         delete from request_log where request_id in 
         <foreach item="requestId" collection="array" open="(" separator="," close=")">
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
deleted file mode 100644
index 40efd25..0000000
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.stock.hcstock.mapper.BasStockHcMapper">
-    
-    <resultMap type="BasStockHc" id="BasStockHcResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-    </resultMap>
-
-    <sql id="selectBasStockHcVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8 from bas_stock_hc
-    </sql>
-
-    <select id="selectBasStockHcList" parameterType="BasStockHc" resultMap="BasStockHcResult">
-        <include refid="selectBasStockHcVo"/>
-        <where>  
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
-            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
-            <if test="netWeight != null  and netWeight != ''"> and net_weight = #{netWeight}</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
-        </where>
-    </select>
-    
-    <select id="selectBasStockHcByStockId" parameterType="String" resultMap="BasStockHcResult">
-        <include refid="selectBasStockHcVo"/>
-        where stock_id = #{stockId}
-    </select>
-
-    <insert id="insertBasStockHc" parameterType="BasStockHc">
-        insert into bas_stock_hc
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBasStockHc" parameterType="BasStockHc">
-        update bas_stock_hc
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-
-    <delete id="deleteBasStockHcByStockId" parameterType="String">
-        delete from bas_stock_hc where stock_id = #{stockId}
-    </delete>
-
-    <delete id="deleteBasStockHcByStockIds" parameterType="String">
-        delete from bas_stock_hc where stock_id in 
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
-            #{stockId}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index b5072eb..ffa78de 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -1,135 +1,283 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.stock.stock.mapper.BasStockMapper">
 
     <resultMap type="BasStock" id="BasStockResult">
-        <result property="stockId"    column="stock_id"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="cargoSpaceStatus"    column="locked"    />
-        <result property="cargoSpaceStockStatus"    column="cargoSpaceStockStatus"    />
-        <result property="warehouseName"    column="warehouse_name"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
+        <result property="stockId" column="stock_id"/>
+        <result property="cargoSpaceId" column="cargo_space_id"/>
+        <result property="stockStatus" column="stock_status"/>
+        <result property="productStatus" column="product_status"/>
+        <result property="lotNo" column="lot_no"/>
+        <result property="inDate" column="in_date"/>
+        <result property="backDate" column="back_date"/>
+        <result property="productGuid" column="product_guid"/>
+        <result property="quantity" column="quantity"/>
+        <result property="jobId" column="job_id"/>
+        <result property="trayCode" column="tray_code"/>
+        <result property="outQuantity" column="out_quantity"/>
+        <result property="stockinDetailId" column="stockin_detail_id"/>
+        <result property="stockinId" column="stockin_id"/>
+        <result property="inType" column="in_type"/>
+        <result property="inClassId" column="in_class_id"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="stackingId" column="stacking_id"/>
+        <result property="spare1" column="spare1"/>
+        <result property="spare2" column="spare2"/>
+        <result property="spare3" column="spare3"/>
+        <result property="spare4" column="spare4"/>
+        <result property="spare5" column="spare5"/>
+        <result property="spare6" column="spare6"/>
+        <result property="voltage" column="voltage"/>
+        <result property="power" column="power"/>
+        <result property="phase" column="phase"/>
+        <result property="netWeight" column="net_weight"/>
+        <result property="grossWeight" column="gross_weight"/>
+        <result property="distribution" column="distribution"/>
+        <result property="model" column="model"/>
+        <result property="orderId" column="order_id"/>
+        <result property="cargoSpaceStatus" column="locked"/>
+        <result property="cargoSpaceStockStatus" column="cargoSpaceStockStatus"/>
+        <result property="warehouseName" column="warehouse_name"/>
+        <result property="cargoSpaceName" column="cargo_space_name"/>
+        <result property="productId" column="product_id"/>
+        <result property="productName" column="product_name"/>
         <association property="extraField" javaType="ExtraField">
-            <result property="productId"    column="product_id"    />
-            <result property="materialDesc"    column="product_name"    />
-            <result property="englishDesc"    column="englishDesc"    />
-            <result property="length"    column="length"    />
-            <result property="width"    column="width"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
+            <result property="productId" column="product_id"/>
+            <result property="materialDesc" column="product_name"/>
+            <result property="englishDesc" column="englishDesc"/>
+            <result property="length" column="length"/>
+            <result property="width" column="width"/>
+            <result property="height" column="height"/>
+            <result property="volume" column="volume"/>
+            <result property="netWeight" column="netWeight"/>
         </association>
     </resultMap>
 
     <sql id="selectBasStockVo">
-        select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
-               bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
-               bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
-               bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
-               bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
-               bs.product_name,bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
-               bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus
+        select bs.stock_id,
+               bs.cargo_space_id,
+               bs.stock_status,
+               bs.product_status,
+               bs.lot_no,
+               bs.in_date,
+               bs.back_date,
+               bs.product_guid,
+               bs.quantity,
+               bs.job_id,
+               bs.tray_code,
+               bs.out_quantity,
+               bs.stockin_detail_id,
+               bs.stockin_id,
+               bs.in_type,
+               bs.in_class_id,
+               bs.warehouse_id,
+               bs.stacking_id,
+               bs.spare1,
+               bs.spare2,
+               bs.spare3,
+               bs.spare4,
+               bs.spare5,
+               bs.spare6,
+               bs.voltage,
+               bs.power,
+               bs.phase,
+               bs.net_weight,
+               bs.gross_weight,
+               bs.distribution,
+               bs.model,
+               bs.order_id,
+               bs.product_name,
+               bp.spare1 as  englishDesc,
+               bp.spare2 as  netWeight,
+               bp.spare5 as  length,
+               bp.spare6 as  width,
+               bp.spare7 as  height,
+               bp.spare8 as  volume,
+               bw.warehouse_name,
+               bs.product_id,
+               bcs.locked,
+               bcs.cargo_space_name,
+               bcs.status as cargoSpaceStockStatus
         from bas_stock bs
-        left join bas_product bp on bs.product_id = bp.product_id
-        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
-        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+                 left join bas_product bp on bs.product_id = bp.product_id
+                 left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+                 left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
     </sql>
-    <sql id="selectBasStockHcVo">
-        select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
-               bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
-               bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
-               bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
-               bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
-               bs.product_name
-        from bas_stock_hc bs
-    </sql>
-
-
 
 
     <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
         <include refid="selectBasStockVo"/>
         <where>
-            <if test="stockId != null  and stockId != ''"> and bs.stock_id like concat('%', #{stockId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status like concat('%', #{stockStatus}, '%')</if>
-            <if test="productStatus != null  and productStatus != ''"> and bs.product_status like concat('%', #{productStatus}, '%')</if>
-            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
-            <if test="backDate != null  and backDate != ''"> and bs.back_date like concat('%', #{backDate}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and bs.product_guid like concat('%', #{productGuid}, '%')</if>
-            <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and bs.quantity like concat('%', #{quantity}, '%')</if>
-            <if test="jobId != null  and jobId != ''"> and bs.job_id like concat('%', #{jobId}, '%')</if>
-            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity like concat('%', #{outQuantity}, '%')</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id like concat('%', #{stockinId}, '%')</if>
-            <if test="inType != null  and inType != ''"> and bs.in_type like concat('%', #{inType}, '%')</if>
-            <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id like concat('%', #{inClassId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and bs.spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and bs.spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare3 != null  and spare3 != ''"> and bs.spare3 like concat('%', #{spare3}, '%')</if>
-            <if test="spare4 != null  and spare4 != ''"> and bs.spare4 like concat('%', #{spare4}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and bs.spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="voltage != null  and voltage != ''"> and bs.voltage like concat('%', #{voltage}, '%')</if>
-            <if test="power != null  and power != ''"> and bs.power like concat('%', #{power}, '%')</if>
-            <if test="phase != null  and phase != ''"> and bs.phase like concat('%', #{phase}, '%')</if>
-            <if test="netWeight != null  and netWeight != ''"> and bs.net_weight like concat('%', #{netWeight}, '%')</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight like concat('%', #{grossWeight}, '%')</if>
-            <if test="distribution != null  and distribution != ''"> and bs.distribution like concat('%', #{distribution}, '%')</if>
-            <if test="model != null  and model != ''"> and bs.model like concat('%', #{model}, '%')</if>
-            <if test="orderId != null  and orderId != ''"> and bs.order_id like concat('%', #{orderId}, '%')</if>
-            <if test="productId != null  and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
-            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status like concat('%', #{cargoSpaceStockStatus}, '%')</if>
+            <if test="stockId != null  and stockId != ''">and bs.stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">and bs.cargo_space_id like concat('%',
+                #{cargoSpaceId}, '%')
+            </if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''">and bcs.cargo_space_name like concat('%',
+                #{cargoSpaceName}, '%')
+            </if>
+            <if test="stockStatus != null  and stockStatus != ''">and bs.stock_status like concat('%', #{stockStatus},
+                '%')
+            </if>
+            <if test="productStatus != null  and productStatus != ''">and bs.product_status like concat('%',
+                #{productStatus}, '%')
+            </if>
+            <if test="lotNo != null  and lotNo != ''">and bs.lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''">and bs.in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''">and bs.back_date like concat('%', #{backDate}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''">and bs.product_guid like concat('%', #{productGuid},
+                '%')
+            </if>
+            <if test="productName != null  and productName != ''">and bs.product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">and bs.quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''">and bs.job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''">and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''">and bs.out_quantity like concat('%', #{outQuantity},
+                '%')
+            </if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''">and bs.stockin_detail_id like concat('%',
+                #{stockinDetailId}, '%')
+            </if>
+            <if test="stockinId != null  and stockinId != ''">and bs.stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''">and bs.in_type like concat('%', #{inType}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''">and bs.in_class_id like concat('%', #{inClassId}, '%')
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">and bs.warehouse_id like concat('%', #{warehouseId},
+                '%')
+            </if>
+            <if test="stackingId != null  and stackingId != ''">and bs.stacking_id like concat('%', #{stackingId},
+                '%')
+            </if>
+            <if test="spare1 != null  and spare1 != ''">and bs.spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''">and bs.spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''">and bs.spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''">and bs.spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''">and bs.spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''">and bs.spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="voltage != null  and voltage != ''">and bs.voltage like concat('%', #{voltage}, '%')</if>
+            <if test="power != null  and power != ''">and bs.power like concat('%', #{power}, '%')</if>
+            <if test="phase != null  and phase != ''">and bs.phase like concat('%', #{phase}, '%')</if>
+            <if test="netWeight != null  and netWeight != ''">and bs.net_weight like concat('%', #{netWeight}, '%')</if>
+            <if test="grossWeight != null  and grossWeight != ''">and bs.gross_weight like concat('%', #{grossWeight},
+                '%')
+            </if>
+            <if test="distribution != null  and distribution != ''">and bs.distribution like concat('%',
+                #{distribution}, '%')
+            </if>
+            <if test="model != null  and model != ''">and bs.model like concat('%', #{model}, '%')</if>
+            <if test="orderId != null  and orderId != ''">and bs.order_id like concat('%', #{orderId}, '%')</if>
+            <if test="productId != null  and productId != ''">and bs.product_id like concat('%', #{productId}, '%')</if>
+            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''">and bcs.status like concat('%',
+                #{cargoSpaceStockStatus}, '%')
+            </if>
 
         </where>
     </select>
 
+    <select id="selectBasStockList2" parameterType="BasStock" resultMap="BasStockResult">
+        <choose>
+            <when test="warehouseCode !=null and warehouseCode==1">
+                <include refid="selectBasStockVo"/>
+            </when>
+            <when test="warehouseCode !=null and warehouseCode==2">
+                <include refid="selectBasStockHcVo"/>
+            </when>
+            <otherwise>
+                <include refid="selectBasStockVo"/>
+            </otherwise>
+        </choose>
+
+        <where>
+            <if test="stockId != null  and stockId != ''">and bs.stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">and bs.cargo_space_id like concat('%',
+                #{cargoSpaceId}, '%')
+            </if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''">and bcs.cargo_space_name like concat('%',
+                #{cargoSpaceName}, '%')
+            </if>
+            <if test="stockStatus != null  and stockStatus != ''">and bs.stock_status like concat('%', #{stockStatus},
+                '%')
+            </if>
+            <if test="productStatus != null  and productStatus != ''">and bs.product_status like concat('%',
+                #{productStatus}, '%')
+            </if>
+            <if test="lotNo != null  and lotNo != ''">and bs.lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''">and bs.in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''">and bs.back_date like concat('%', #{backDate}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''">and bs.product_guid like concat('%', #{productGuid},
+                '%')
+            </if>
+            <if test="productName != null  and productName != ''">and bs.product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">and bs.quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''">and bs.job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''">and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''">and bs.out_quantity like concat('%', #{outQuantity},
+                '%')
+            </if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''">and bs.stockin_detail_id like concat('%',
+                #{stockinDetailId}, '%')
+            </if>
+            <if test="stockinId != null  and stockinId != ''">and bs.stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''">and bs.in_type like concat('%', #{inType}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''">and bs.in_class_id like concat('%', #{inClassId}, '%')
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">and bs.warehouse_id like concat('%', #{warehouseId},
+                '%')
+            </if>
+            <if test="stackingId != null  and stackingId != ''">and bs.stacking_id like concat('%', #{stackingId},
+                '%')
+            </if>
+            <if test="spare1 != null  and spare1 != ''">and bs.spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''">and bs.spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''">and bs.spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''">and bs.spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''">and bs.spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''">and bs.spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="voltage != null  and voltage != ''">and bs.voltage like concat('%', #{voltage}, '%')</if>
+            <if test="power != null  and power != ''">and bs.power like concat('%', #{power}, '%')</if>
+            <if test="phase != null  and phase != ''">and bs.phase like concat('%', #{phase}, '%')</if>
+            <if test="netWeight != null  and netWeight != ''">and bs.net_weight like concat('%', #{netWeight}, '%')</if>
+            <if test="grossWeight != null  and grossWeight != ''">and bs.gross_weight like concat('%', #{grossWeight},
+                '%')
+            </if>
+            <if test="distribution != null  and distribution != ''">and bs.distribution like concat('%',
+                #{distribution}, '%')
+            </if>
+            <if test="model != null  and model != ''">and bs.model like concat('%', #{model}, '%')</if>
+            <if test="orderId != null  and orderId != ''">and bs.order_id like concat('%', #{orderId}, '%')</if>
+            <if test="productId != null  and productId != ''">and bs.product_id like concat('%', #{productId}, '%')</if>
+            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''">and bcs.status like concat('%',
+                #{cargoSpaceStockStatus}, '%')
+            </if>
+
+        </where>
+    </select>
+
+
     <select id="selectBasStockByStockId" parameterType="String" resultMap="BasStockResult">
         <include refid="selectBasStockVo"/>
         where stock_id = #{stockId}
     </select>
 
+    <select id="selectBasStockByStockId2" parameterType="String" resultMap="BasStockResult">
+        <choose>
+            <when test="warehouseCode !=null and warehouseCode ==1 ">
+                <include refid="selectBasStockVo"/>
+            </when>
+            <when test="warehouseCode !=null and warehouseCode==2">
+                <include refid="selectBasStockHcVo"/>
+            </when>
+        </choose>
+
+        where stock_id = #{stockId}
+    </select>
+
+
     <insert id="insertBasStock" parameterType="BasStock">
         insert into bas_stock
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -158,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
             <if test="productId != null">product_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null and stockId != ''">#{stockId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
@@ -185,18 +333,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
             <if test="productId != null">#{productId},</if>
-         </trim>
+        </trim>
     </insert>
     <insert id="insertBasStockList">
         INSERT INTO bas_stock
-            (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7)
+        (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7)
         VALUES
-            <foreach collection="list" item="item" separator=",">
-                (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
-                ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7})
-            </foreach>
+        <foreach collection="list" item="item" separator=",">
+            (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
+            ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7})
+        </foreach>
     </insert>
 
+    <update id="updateBasStock2" parameterType="BasStock">
+        <choose>
+            <when test="warehouseCode != null and warehouseCode==1">
+                update bas_stock
+            </when>
+            <when test="warehouseCode != null and warehouseCode==2">
+                update bas_stock_hc
+            </when>
+            <otherwise>
+                update bas_stock
+            </otherwise>
+        </choose>
+
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+        </trim>
+
+        WHERE stock_id = #{stockId}
+    </update>
+
+
     <update id="updateBasStock" parameterType="BasStock">
         update bas_stock
         <trim prefix="SET" suffixOverrides=",">
@@ -228,14 +420,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where stock_id = #{stockId}
     </update>
     <update id="updateStockStatusByTrayCode">
-        update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode}
+        update bas_stock
+        set stock_status = #{stockStatus}
+        where tray_code = #{trayCode}
     </update>
     <update id="resetPdRecord">
-        update bas_stock set spare7 = '0'
+        update bas_stock
+        set spare7 = '0'
     </update>
 
     <delete id="deleteBasStockByStockId" parameterType="String">
-        delete from bas_stock where stock_id = #{stockId}
+        delete
+        from bas_stock
+        where stock_id = #{stockId}
     </delete>
 
     <delete id="deleteBasStockByStockIds" parameterType="String">
@@ -245,11 +442,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <delete id="deleteBasStockByStockIds2" parameterType="String">
+        <choose>
+            <when test="warehouseCode !=null and warehouseCode ==1">
+                delete from bas_stock where stock_id in
+            </when>
+            <when test="warehouseCode !=null and warehouseCode ==2">
+                delete from bas_stock_hc where stock_id in
+            </when>
+            <otherwise>
+                delete from bas_stock where stock_id in
+            </otherwise>
+        </choose>
+        <foreach item="stockId" collection="stockIds" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+
+
     <select id="selectKtpStock" parameterType="BasStock" resultMap="BasStockResult">
-        select b.cargo_space_name, b.cargo_space_id  from bas_stock s,bas_cargo_space b
+        select b.cargo_space_name, b.cargo_space_id from bas_stock s,bas_cargo_space b
         <where>
-        s.warehouse_id=#{warehouseId}
-         and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and s.product_id='KTP0001'
+            s.warehouse_id=#{warehouseId}
+            and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and
+            s.product_id='KTP0001'
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>
@@ -258,174 +474,271 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getStockBySerial" parameterType="String" resultMap="BasStockResult">
-        select * from bas_stock where tray_code = #{trayCode}
+        select *
+        from bas_stock
+        where tray_code = #{trayCode}
     </select>
 
     <select id="selectHasHalfTray" parameterType="InStockinDetail" resultMap="BasStockResult">
         select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where  bs.spare4=#{spare4} and bs.product_id like concat('%', #{productId}, '%')
-                                                                                                                                               and bs.spare2 like concat('%', #{spare2}, '%')
-                                                                                                                                                 and bs.model=0 and bcs.status=2
+        and bs.spare2 like concat('%', #{spare2}, '%')
+        and bs.model=0 and bcs.status=2
+        and bcs.group_coding_no not in (select group_coding_no from bas_cargo_space where status=3 group by group_coding_no)
+        <if test="cargoNo != null and cargoNo != ''">
+            and bs.order_id = #{cargoNo}
+        </if>
         union
         select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}
-                                                                                                                                               and bs.spare2 like concat('%', #{spare2}, '%')
-                                                                                                                                                 and  bs.model=0 and bcs.status=2
+        and bs.spare2 like concat('%', #{spare2}, '%')
+        and  bs.model=0 and bcs.status=2
+        and bcs.group_coding_no not in (select group_coding_no from bas_cargo_space where status=3 group by group_coding_no)
+        <if test="cargoNo != null and cargoNo != ''">
+            and bs.order_id = #{cargoNo}
+        </if>
         UNION
         select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}  and bs.model=0 and bcs.status=2
+        and bcs.group_coding_no not in (select group_coding_no from bas_cargo_space where status=3 group by group_coding_no)
+        <if test="cargoNo != null and cargoNo != ''">
+            and bs.order_id = #{cargoNo}
+        </if>
     </select>
 
+    <select id="selectBasStockHcs" resultMap="BasStockResult">
+        <include refid="selectBasStockHcVo"/>
+        <where>
+
+            <if test="out.lotNo != null  and out.lotNo != ''">and bs.lot_no like concat('%', #{out.lotNo}, '%')</if>
+
+            <if test="trayCode != null  and trayCode != ''">and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+
+            <if test="out.spare4 != null  and out.spare4 != ''">and bs.spare4 like concat('%', #{out.spare4}, '%')</if>
+
+           <if test="out.orderId != null  and out.orderId != ''">and bs.order_id like concat('%', #{out.orderId}, '%')</if>
+            <if test="out.productId != null  and out.productId != ''">and bs.product_id like concat('%', #{out.productId}, '%')</if>
+
+        </where>
+    </select>
+
+    <select id="selectBasStockListTopOne" parameterType="string" resultType="basStock">
+        select top 1* from bas_stock where tray_code=#{trayCode}
+    </select>
+
+
+
     <select id="selectBasStockListHc" parameterType="BasStock" resultMap="BasStockResult">
-            <include refid="selectBasStockHcVo"/>
-            <where>
-                <if test="stockId != null  and stockId != ''"> and bs.stock_id like concat('%', #{stockId}, '%')</if>
-                <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-                <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-                <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status like concat('%', #{stockStatus}, '%')</if>
-                <if test="productStatus != null  and productStatus != ''"> and bs.product_status like concat('%', #{productStatus}, '%')</if>
-                <if test="lotNo != null  and lotNo != ''"> and bs.lot_no like concat('%', #{lotNo}, '%')</if>
-                <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
-                <if test="backDate != null  and backDate != ''"> and bs.back_date like concat('%', #{backDate}, '%')</if>
-                <if test="productGuid != null  and productGuid != ''"> and bs.product_guid like concat('%', #{productGuid}, '%')</if>
-                <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
-                <if test="quantity != null  and quantity != ''"> and bs.quantity like concat('%', #{quantity}, '%')</if>
-                <if test="jobId != null  and jobId != ''"> and bs.job_id like concat('%', #{jobId}, '%')</if>
-                <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
-                <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity like concat('%', #{outQuantity}, '%')</if>
-                <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-                <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id like concat('%', #{stockinId}, '%')</if>
-                <if test="inType != null  and inType != ''"> and bs.in_type like concat('%', #{inType}, '%')</if>
-                <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id like concat('%', #{inClassId}, '%')</if>
-                <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-                <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id like concat('%', #{stackingId}, '%')</if>
-                <if test="spare1 != null  and spare1 != ''"> and bs.spare1 like concat('%', #{spare1}, '%')</if>
-                <if test="spare2 != null  and spare2 != ''"> and bs.spare2 like concat('%', #{spare2}, '%')</if>
-                <if test="spare3 != null  and spare3 != ''"> and bs.spare3 like concat('%', #{spare3}, '%')</if>
-                <if test="spare4 != null  and spare4 != ''"> and bs.spare4 like concat('%', #{spare4}, '%')</if>
-                <if test="spare5 != null  and spare5 != ''"> and bs.spare5 like concat('%', #{spare5}, '%')</if>
-                <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
-                <if test="voltage != null  and voltage != ''"> and bs.voltage like concat('%', #{voltage}, '%')</if>
-                <if test="power != null  and power != ''"> and bs.power like concat('%', #{power}, '%')</if>
-                <if test="phase != null  and phase != ''"> and bs.phase like concat('%', #{phase}, '%')</if>
-                <if test="netWeight != null  and netWeight != ''"> and bs.net_weight like concat('%', #{netWeight}, '%')</if>
-                <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight like concat('%', #{grossWeight}, '%')</if>
-                <if test="distribution != null  and distribution != ''"> and bs.distribution like concat('%', #{distribution}, '%')</if>
-                <if test="model != null  and model != ''"> and bs.model like concat('%', #{model}, '%')</if>
-                <if test="orderId != null  and orderId != ''"> and bs.order_id like concat('%', #{orderId}, '%')</if>
-                <if test="productId != null  and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
+        <include refid="selectBasStockHcVo"/>
+        <where>
+            <if test="stockId != null  and stockId != ''">and bs.stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">and bs.cargo_space_id like concat('%',
+                #{cargoSpaceId}, '%')
+            </if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''">and bcs.cargo_space_name like concat('%',
+                #{cargoSpaceName}, '%')
+            </if>
+            <if test="stockStatus != null  and stockStatus != ''">and bs.stock_status like concat('%', #{stockStatus},
+                '%')
+            </if>
+            <if test="productStatus != null  and productStatus != ''">and bs.product_status like concat('%',
+                #{productStatus}, '%')
+            </if>
+            <if test="lotNo != null  and lotNo != ''">and bs.lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''">and bs.in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''">and bs.back_date like concat('%', #{backDate}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''">and bs.product_guid like concat('%', #{productGuid},
+                '%')
+            </if>
+            <if test="productName != null  and productName != ''">and bs.product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">and bs.quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''">and bs.job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''">and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''">and bs.out_quantity like concat('%', #{outQuantity},
+                '%')
+            </if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''">and bs.stockin_detail_id like concat('%',
+                #{stockinDetailId}, '%')
+            </if>
+            <if test="stockinId != null  and stockinId != ''">and bs.stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''">and bs.in_type like concat('%', #{inType}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''">and bs.in_class_id like concat('%', #{inClassId}, '%')
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">and bs.warehouse_id like concat('%', #{warehouseId},
+                '%')
+            </if>
+            <if test="stackingId != null  and stackingId != ''">and bs.stacking_id like concat('%', #{stackingId},
+                '%')
+            </if>
+            <if test="spare1 != null  and spare1 != ''">and bs.spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''">and bs.spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''">and bs.spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''">and bs.spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''">and bs.spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''">and bs.spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="voltage != null  and voltage != ''">and bs.voltage like concat('%', #{voltage}, '%')</if>
+            <if test="power != null  and power != ''">and bs.power like concat('%', #{power}, '%')</if>
+            <if test="phase != null  and phase != ''">and bs.phase like concat('%', #{phase}, '%')</if>
+            <if test="netWeight != null  and netWeight != ''">and bs.net_weight like concat('%', #{netWeight}, '%')</if>
+            <if test="grossWeight != null  and grossWeight != ''">and bs.gross_weight like concat('%', #{grossWeight},
+                '%')
+            </if>
+            <if test="distribution != null  and distribution != ''">and bs.distribution like concat('%',
+                #{distribution}, '%')
+            </if>
+            <if test="model != null  and model != ''">and bs.model like concat('%', #{model}, '%')</if>
+            <if test="orderId != null  and orderId != ''">and bs.order_id like concat('%', #{orderId}, '%')</if>
+            <if test="productId != null  and productId != ''">and bs.product_id like concat('%', #{productId}, '%')</if>
 
-            </where>
+        </where>
 
     </select>
-<select id="selectBasStockHcCount" parameterType="BasStock" resultMap="BasStockResult">
-    <include refid="selectBasStockHcVo"/>
-    <where>
-        <if test="stockId != null  and stockId != ''">
-            and bs.stock_id like concat('%', #{stockId}, '%')
-        </if>
-        <if test="cargoSpaceId != null  and cargoSpaceId != ''">
-            and bs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
-        </if>
-        <if test="cargoSpaceName != null  and cargoSpaceName != ''">
-            and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')
-        </if>
-        <if test="stockStatus != null  and stockStatus != ''">
-            and bs.stock_status like concat('%', #{stockStatus}, '%')
-        </if>
-        <if test="productStatus != null  and productStatus != ''">
-            and bs.product_status like concat('%', #{productStatus}, '%')
-        </if>
-        <if test="lotNo != null  and lotNo != ''">
-            and bs.lot_no like concat('%', #{lotNo}, '%')
-        </if>
-        <if test="inDate != null  and inDate != ''">
-            and bs.in_date like concat('%', #{inDate}, '%')
-        </if>
-        <if test="backDate != null  and backDate != ''">
-            and bs.back_date like concat('%', #{backDate}, '%')
-        </if>
-        <if test="productGuid != null  and productGuid != ''">
-            and bs.product_guid like concat('%', #{productGuid}, '%')
-        </if>
-        <if test="productName != null  and productName != ''">
-            and bs.product_name like concat('%', #{productName}, '%')
-        </if>
-        <if test="quantity != null  and quantity != ''">
-            and bs.quantity like concat('%', #{quantity}, '%')
-        </if>
-        <if test="jobId != null  and jobId != ''">
-            and bs.job_id like concat('%', #{jobId}, '%')
-        </if>
-        <if test="trayCode != null  and trayCode != ''">
-            and bs.tray_code like concat('%', #{trayCode}, '%')
-        </if>
-        <if test="outQuantity != null  and outQuantity != ''">
-            and bs.out_quantity like concat('%', #{outQuantity}, '%')
-        </if>
-        <if test="stockinDetailId != null  and stockinDetailId != ''">
-            and bs.stockin_detail_id like concat('%', #{stockinDetailId}, '%')
-        </if>
-        <if test="stockinId != null  and stockinId != ''">
-            and bs.stockin_id like concat('%', #{stockinId}, '%')
-        </if>
-        <if test="inType != null  and inType != ''">
-            and bs.in_type like concat('%', #{inType}, '%')
-        </if>
-        <if test="inClassId != null  and inClassId != ''">
-            and bs.in_class_id like concat('%', #{inClassId}, '%')
-        </if>
-        <if test="warehouseId != null  and warehouseId != ''">
-            and bs.warehouse_id like concat('%', #{warehouseId}, '%')
-        </if>
-        <if test="stackingId != null  and stackingId != ''">
-            and bs.stacking_id like concat('%', #{stackingId}, '%')
-        </if>
-        <if test="spare1 != null  and spare1 != ''">
-            and bs.spare1 like concat('%', #{spare1}, '%')
-        </if>
-        <if test="spare2 != null  and spare2 != ''">
-            and bs.spare2 like concat('%', #{spare2}, '%')
-        </if>
-        <if test="spare3 != null  and spare3 != ''">
-            and bs.spare3 like concat('%', #{spare3}, '%')
-        </if>
-        <if test="spare4 != null  and spare4 != ''">
-            and bs.spare4 like concat('%', #{spare4}, '%')
-        </if>
-        <if test="spare5 != null  and spare5 != ''">
-            and bs.spare5 like concat('%', #{spare5}, '%')
-        </if>
-        <if test="spare6 != null  and spare6 != ''">
-            and bs.spare6 like concat('%', #{spare6}, '%')
-        </if>
-        <if test="voltage != null  and voltage != ''">
-            and bs.voltage like concat('%', #{voltage}, '%')
-        </if>
-        <if test="power != null  and power != ''">
-            and bs.power like concat('%', #{power}, '%')
-        </if>
-        <if test="phase != null  and phase != ''">
-            and bs.phase like concat('%', #{phase}, '%')
-        </if>
-        <if test="netWeight != null  and netWeight != ''">
-            and bs.net_weight like concat('%', #{netWeight}, '%')
-        </if>
-        <if test="grossWeight != null  and grossWeight != ''">
-            and bs.gross_weight like concat('%', #{grossWeight}, '%')
-        </if>
-        <if test="distribution != null  and distribution != ''">
-            and bs.distribution like concat('%', #{distribution}, '%')
-        </if>
-        <if test="model != null  and model != ''">
-            and bs.model like concat('%', #{model}, '%')
-        </if>
-        <if test="orderId != null  and orderId != ''">
-            and bs.order_id like concat('%', #{orderId}, '%')
-        </if>
-        <if test="productId != null  and productId != ''">
-            and bs.product_id like concat('%', #{productId}, '%')
-        </if>
-    </where>
-</select>
-
+    <select id="selectBasStockHcCount" parameterType="BasStock" resultMap="BasStockResult">
+        <include refid="selectBasStockHcVo"/>
+        <where>
+            <if test="stockId != null  and stockId != ''">
+                and bs.stock_id like concat('%', #{stockId}, '%')
+            </if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
+                and bs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
+            </if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''">
+                and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')
+            </if>
+            <if test="stockStatus != null  and stockStatus != ''">
+                and bs.stock_status like concat('%', #{stockStatus}, '%')
+            </if>
+            <if test="productStatus != null  and productStatus != ''">
+                and bs.product_status like concat('%', #{productStatus}, '%')
+            </if>
+            <if test="lotNo != null  and lotNo != ''">
+                and bs.lot_no like concat('%', #{lotNo}, '%')
+            </if>
+            <if test="inDate != null  and inDate != ''">
+                and bs.in_date like concat('%', #{inDate}, '%')
+            </if>
+            <if test="backDate != null  and backDate != ''">
+                and bs.back_date like concat('%', #{backDate}, '%')
+            </if>
+            <if test="productGuid != null  and productGuid != ''">
+                and bs.product_guid like concat('%', #{productGuid}, '%')
+            </if>
+            <if test="productName != null  and productName != ''">
+                and bs.product_name like concat('%', #{productName}, '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">
+                and bs.quantity like concat('%', #{quantity}, '%')
+            </if>
+            <if test="jobId != null  and jobId != ''">
+                and bs.job_id like concat('%', #{jobId}, '%')
+            </if>
+            <if test="trayCode != null  and trayCode != ''">
+                and bs.tray_code like concat('%', #{trayCode}, '%')
+            </if>
+            <if test="outQuantity != null  and outQuantity != ''">
+                and bs.out_quantity like concat('%', #{outQuantity}, '%')
+            </if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''">
+                and bs.stockin_detail_id like concat('%', #{stockinDetailId}, '%')
+            </if>
+            <if test="stockinId != null  and stockinId != ''">
+                and bs.stockin_id like concat('%', #{stockinId}, '%')
+            </if>
+            <if test="inType != null  and inType != ''">
+                and bs.in_type like concat('%', #{inType}, '%')
+            </if>
+            <if test="inClassId != null  and inClassId != ''">
+                and bs.in_class_id like concat('%', #{inClassId}, '%')
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">
+                and bs.warehouse_id like concat('%', #{warehouseId}, '%')
+            </if>
+            <if test="stackingId != null  and stackingId != ''">
+                and bs.stacking_id like concat('%', #{stackingId}, '%')
+            </if>
+            <if test="spare1 != null  and spare1 != ''">
+                and bs.spare1 like concat('%', #{spare1}, '%')
+            </if>
+            <if test="spare2 != null  and spare2 != ''">
+                and bs.spare2 like concat('%', #{spare2}, '%')
+            </if>
+            <if test="spare3 != null  and spare3 != ''">
+                and bs.spare3 like concat('%', #{spare3}, '%')
+            </if>
+            <if test="spare4 != null  and spare4 != ''">
+                and bs.spare4 like concat('%', #{spare4}, '%')
+            </if>
+            <if test="spare5 != null  and spare5 != ''">
+                and bs.spare5 like concat('%', #{spare5}, '%')
+            </if>
+            <if test="spare6 != null  and spare6 != ''">
+                and bs.spare6 like concat('%', #{spare6}, '%')
+            </if>
+            <if test="voltage != null  and voltage != ''">
+                and bs.voltage like concat('%', #{voltage}, '%')
+            </if>
+            <if test="power != null  and power != ''">
+                and bs.power like concat('%', #{power}, '%')
+            </if>
+            <if test="phase != null  and phase != ''">
+                and bs.phase like concat('%', #{phase}, '%')
+            </if>
+            <if test="netWeight != null  and netWeight != ''">
+                and bs.net_weight like concat('%', #{netWeight}, '%')
+            </if>
+            <if test="grossWeight != null  and grossWeight != ''">
+                and bs.gross_weight like concat('%', #{grossWeight}, '%')
+            </if>
+            <if test="distribution != null  and distribution != ''">
+                and bs.distribution like concat('%', #{distribution}, '%')
+            </if>
+            <if test="model != null  and model != ''">
+                and bs.model like concat('%', #{model}, '%')
+            </if>
+            <if test="orderId != null  and orderId != ''">
+                and bs.order_id like concat('%', #{orderId}, '%')
+            </if>
+            <if test="productId != null  and productId != ''">
+                and bs.product_id like concat('%', #{productId}, '%')
+            </if>
+        </where>
+    </select>
+    <sql id="selectBasStockHcVo">
+        select bs.stock_id,
+               bs.cargo_space_id,
+               bs.stock_status,
+               bs.product_status,
+               bs.lot_no,
+               bs.in_date,
+               bs.back_date,
+               bs.product_guid,
+               bs.quantity,
+               bs.job_id,
+               bs.tray_code,
+               bs.out_quantity,
+               bs.stockin_detail_id,
+               bs.stockin_id,
+               bs.in_type,
+               bs.in_class_id,
+               bs.warehouse_id,
+               bs.stacking_id,
+               bs.spare1,
+               bs.spare2,
+               bs.spare3,
+               bs.spare4,
+               bs.spare5,
+               bs.spare6,
+               bs.voltage,
+               bs.power,
+               bs.phase,
+               bs.net_weight,
+               bs.gross_weight,
+               bs.distribution,
+               bs.model,
+               bs.order_id,
+               bs.product_name,
+               bs.product_id
+        from bas_stock_hc bs
+    </sql>
 
 </mapper>
 
diff --git a/ruoyi-ui/src/api/out/outStockout.js b/ruoyi-ui/src/api/out/outStockout.js
index 8fbea28..ec9bb84 100644
--- a/ruoyi-ui/src/api/out/outStockout.js
+++ b/ruoyi-ui/src/api/out/outStockout.js
@@ -62,7 +62,7 @@ export function getOutStockoutDetail(query) {
   export function autoAllot(data) {
     return request({
       url: '/out/outStockout/autoAllot',
-      method: 'post',
+      method: 'get',
       params: data
     })
   }
diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue
index bb89556..87f6125 100644
--- a/ruoyi-ui/src/views/bas/traycode/index.vue
+++ b/ruoyi-ui/src/views/bas/traycode/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
-      <!--      <el-form-item label="格式ID" prop="formatId">-->
-      <!--&lt;!&ndash;        <el-input-->
-      <!--          v-model="queryParams.formatId"-->
-      <!--          placeholder="请输入格式ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />&ndash;&gt;-->
-      <!--        <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
-      <!--          <el-option-->
-      <!--            v-for="item in traycodeFormatList"-->
-      <!--            :key="item.id"-->
-      <!--            :label="item.remarks"-->
-      <!--            :value="item.id"-->
-      <!--          />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+<!--      <el-form-item label="格式ID" prop="formatId">-->
+<!--&lt;!&ndash;        <el-input-->
+<!--          v-model="queryParams.formatId"-->
+<!--          placeholder="请输入格式ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />&ndash;&gt;-->
+<!--        <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
+<!--          <el-option-->
+<!--            v-for="item in traycodeFormatList"-->
+<!--            :key="item.id"-->
+<!--            :label="item.remarks"-->
+<!--            :value="item.id"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="条码" prop="trayCode">
         <el-input
           v-model="queryParams.trayCode"
@@ -101,16 +101,16 @@
 
     <el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
       <el-table-column type="selection" width="55" align="center" />
-      <!--      <el-table-column label="序号" align="center" prop="id" />-->
-      <!--      <el-table-column label="格式ID" align="left" prop="formatName"  />-->
+<!--      <el-table-column label="序号" align="center" prop="id" />-->
+<!--      <el-table-column label="格式ID" align="left" prop="formatName"  />-->
       <el-table-column label="条码" align="center" prop="trayCode"  />
-      <!--      <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
+<!--      <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
       <el-table-column label="是否可用" align="center" prop="spare2" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
+<!--      <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
@@ -161,7 +161,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="数量" prop="spare1" v-if="form.id == null">
+         <el-form-item label="数量" prop="spare1" v-if="form.id == null">
           <el-input v-model="form.spare1" placeholder="请输入数量" />
         </el-form-item>
         <el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
@@ -205,7 +205,6 @@
 import { listTraycode, getTraycode, delTraycode, addTraycode, updateTraycode } from "@/api/bas/traycode"
 import { listTraycodeFormat } from "@/api/bas/traycodeFormat"
 import vueEasyPrint from 'vue-easy-print'
-import VueQr from 'vue-qr'
 import VueBarcode from 'vue-barcode'
 
 export default {
@@ -451,11 +450,6 @@ export default {
   font-family: Arial, sans-serif;
 }
 
-.vue-qr {
-  display: block;
-  margin: 20px auto;
-  max-width: 100%;
-}
 
 @media print {
   @page {
@@ -468,7 +462,7 @@ export default {
   }
 
   .vue-easy-print {
-    padding: 20px;
+    padding: 5px;
   }
 
   .num {
@@ -476,8 +470,5 @@ export default {
     margin-top: 10px;
   }
 
-  .vue-qr {
-    margin: 10px auto;
-  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index 9344b79..8df60cb 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -670,15 +670,9 @@ export default {
           console.log(data)
           // 这里需要调用保存接口
           saveCheckStock(data).then(response => {
-           if (response.code==200){
-             this.$modal.msgSuccess('保存成功：' + response.msg);
-             this.$tab.refreshPage(this.$route);
-           }
-           else {
-             this.$modal.msgError('建单失败：' + response.msg);
-           }
-
 
+            this.$modal.msgSuccess('保存成功：' + response.msg);
+            this.$tab.refreshPage(this.$route);
             // this.reset();
           });
         }
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index eeb7c94..a150dde 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -135,7 +135,7 @@
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
       max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="作业编码" align="left" prop="jobId" fixed width="160" />
+      <el-table-column label="作业编码" align="left" prop="jobId" fixed width="140" />
       <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -249,7 +249,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: null,
+        status: '1',
         onLineType: null,
         taskNo: null,
         supplierId: null,
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 3a416ea..8044138 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -21,62 +21,54 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="单据来源" prop="stockSource">&lt;!&ndash;单据来源&ndash;&gt;-->
-      <!--        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>-->
-      <!--          <el-option-->
-      <!--            v-for="dict in dict.type.bill_resource"-->
-      <!--            :key="dict.value"-->
-      <!--            :label="dict.label"-->
-      <!--            :value="dict.value"-->
-      <!--          />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+      <el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
+        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
+          <el-option
+            v-for="dict in dict.type.bill_resource"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="项目号" prop="departmentNo">
+      <el-input
+        v-model="queryParams.departmentNo"
+        placeholder="请输入项目号"
+        clearable
+        @keyup.enter.native="handleQuery"
+      />
+    </el-form-item>
+      <el-form-item label="合同号" prop="spare1">
         <el-input
-          v-model="queryParams.departmentNo"
-          placeholder="请输入项目号"
+          v-model="queryParams.spare1"
+          placeholder="请输入合同号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="合同号" prop="spare1">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.spare1"-->
-      <!--          placeholder="请输入合同号"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <el-form-item label="erp单据号" prop="erpBill">
+      <el-form-item label="销售订单号" prop="spare2">
         <el-input
-          v-model="queryParams.erpBill"
-          placeholder="请输入erp单据号"
+          v-model="queryParams.spare2"
+          placeholder="请输入销售订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="存货名称" prop="productName"><!--品名-->
+      <el-form-item label="存货名称" prop="materialDesc"><!--品名-->
         <el-input
-          v-model="queryParams.productName"
+          v-model="queryParams.materialDesc"
           placeholder="请输入存货名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="存货编码" prop="productId"><!--品名-->
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入存货编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-      <el-form-item label="组件号" prop="cargoNo"><!--品名-->
+      <el-form-item label="批次号" prop="lotNo"><!--品名-->
         <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入组件号"
+          v-model="queryParams.lotNo"
+          placeholder="请输入批次号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -160,18 +152,18 @@
         >单据确认<!--单据确认-->
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="detailMultiple"
-          @click="handleBarcodePrinting"
-          v-hasPermi="['in:stockIn:barcodePrinting']"
-        >打印条码<!--打印条码-->
-        </el-button>
-      </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="info"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                :disabled="detailMultiple"
+                @click="handleBarcodePrinting"
+                v-hasPermi="['in:stockIn:barcodePrinting']"
+              >打印条码<!--打印条码-->
+              </el-button>
+            </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -180,7 +172,6 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
       <el-table-column label="入库单据号" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
-      <el-table-column label="erp单据号" align="left" prop="erpBill" width="150" sortable/><!--入库订单-->
       <el-table-column label="单据类型" align="left" prop="inType"><!--入库类型-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -197,17 +188,17 @@
         </template>
       </el-table-column>
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
-      <el-table-column label="供应商代码" align="left" prop="supplierNo" width="140"/><!--仓库-->
-      <el-table-column label="供应商名称" align="left" prop="classNo" width="140"/><!--供应商-->
-      <el-table-column label="制单人" align="left" prop="createManId" width="140"/><!--创建人-->
-      <el-table-column label="项目号" align="left" prop="departmentNo" width="140"/><!--部门-->
-      <el-table-column label="单据时间" align="left" prop="createDate" width="160" sortable/><!--建立时间-->
-      <el-table-column label="确认时间" align="left" prop="finishDate" width="160" sortable/><!--完成日期-->
-      <el-table-column label="合同号" align="left" prop="spare1" width="140" sortable/><!--完成日期-->
-      <el-table-column label="销售单号" align="left" prop="spare2" width="140" sortable/><!--完成日期-->
-      <el-table-column label="审核时间" align="left" prop="spare3" width="160" sortable/><!--完成日期-->
-      <el-table-column label="审核人" align="left" prop="spare4"/><!--完成日期-->
-      <el-table-column label="备注" align="left" prop="spare5"/><!--完成日期-->
+      <el-table-column label="供应商代码" align="left" prop="supplierNo"/><!--仓库-->
+      <el-table-column label="供应商名称" align="left" prop="classNo" /><!--供应商-->
+      <el-table-column label="制单人" align="left" prop="createManId"/><!--创建人-->
+      <el-table-column label="项目号" align="left" prop="departmentNo"/><!--部门-->
+      <el-table-column label="单据时间" align="left" prop="createDate" sortable/><!--建立时间-->
+      <el-table-column label="确认时间" align="left" prop="finishDate" sortable/><!--完成日期-->
+      <el-table-column label="合同号" align="left" prop="spare1" sortable/><!--完成日期-->
+      <el-table-column label="销售单号" align="left" prop="spare2" sortable/><!--完成日期-->
+      <el-table-column label="审核时间" align="left" prop="spare3" sortable/><!--完成日期-->
+      <el-table-column label="审核人" align="left" prop="spare4" /><!--完成日期-->
+      <el-table-column label="备注" align="left" prop="spare5" /><!--完成日期-->
     </el-table>
 
     <pagination
@@ -220,24 +211,19 @@
 
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160"/><!--子单ID-->
+      <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" sortable/><!--子单ID-->
       <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
-      <el-table-column label="存货编码" align="left" prop="productId"/><!--品号-->
+      <el-table-column label="存货编码" align="left" prop="productId" sortable/><!--品号-->
       <el-table-column label="存货名称" align="left" prop="productName" width="160"/><!--品号-->
-      <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
+      <el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
       <el-table-column label="单位" align="left" prop="unit"/><!--机型-->
       <el-table-column label="规格型号" align="left" prop="spec"/><!--规格-->
       <el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="计划数量" align="left" prop="quantity"/><!--计划数量-->
-      <el-table-column label="扫码数量" align="left" prop="scanNum"/><!--扫码数量-->
-      <el-table-column label="实际数量" align="left" prop="assignNum"/><!--实际数量-->
-      <el-table-column label="货位号" align="left" prop="spare9"/><!--实际数量-->
-      <el-table-column label="托盘号" align="left" prop="spare8"/><!--实际数量-->
-      <el-table-column label="条码号" align="left" prop="barCode"/><!--实际数量-->
-      <el-table-column label="组件号" align="left" prop="cargoNo"/><!--组件号-->
-      <el-table-column label="项目号" align="left" prop="spare4"/><!--项目号-->
+      <el-table-column label="计划数量" align="left" prop="quantity" sortable/><!--计划数量-->
+      <el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
+      <el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
 
     </el-table>
     <pagination
@@ -254,7 +240,7 @@
            class="vue-easy-print">
         <vue-qr :text='item.stockinDetailId' :size="150" :margin="10" :align-item="center" :correctLevel="2"></vue-qr>
         <div>
-          <span class="num">{{ item.productId }} {{ item.productName }}</span>
+          <span class="num">{{ item.stockinDetailId }}</span>
         </div>
       </div>
     </vue-easy-print>
@@ -342,8 +328,7 @@ export default {
         spare2: null,
         spare4: null,
         spare3: null,
-        spare5: null,
-        cargoNo: null
+        spare5: null
       },
       queryDetailParams: {
         pageNum: 1,
@@ -562,6 +547,11 @@ export default {
   font-family: Arial, sans-serif;
 }
 
+.vue-qr {
+  display: block;
+  margin: 20px auto;
+  max-width: 100%;
+}
 
 @media print {
   @page {
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index fbb950b..5c940d5 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 主表信息录入 -->
     <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-<!--      <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;
+      <el-form-item :label="'仓库'" prop="warehouseId" required><!--仓库-->
         <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>
           <el-option
             v-for="dict in warehouseOptions"
@@ -11,7 +11,7 @@
             :value="dict.warehouseId"
           />
         </el-select>
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item label="项目号" prop="departmentNo">
         <el-input v-model="formData.departmentNo" placeholder="请输入项目号"/>
       </el-form-item>
@@ -265,9 +265,9 @@ export default {
       customerTotal: 0,
       // 表单验证规则
       rules: {
-        // warehouseId: [
-        //   { required: true, message: '请选择仓库', trigger: "change" }
-        // ],
+        warehouseId: [
+          { required: true, message: '请选择仓库', trigger: "change" }
+        ],
         customerNo: [
           { required: true, message: '请输入客商编号', trigger: "blur" }
         ],
@@ -403,10 +403,10 @@ export default {
     },
     /** 打开选择存货弹窗 */
     handleSelectMaterials() {
-      /*if (!this.formData.warehouseId) {
+      if (!this.formData.warehouseId) {
         this.$modal.msgError('请选择仓库');
         return;
-      }*/
+      }
       if (!this.formData.departmentNo) {
         this.$modal.msgError('请输入项目号');
         return;
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index 473dd2e..c796934 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -2,21 +2,21 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item :label="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <el-select-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          :placeholder="'请选择仓库'"-->
-<!--          clearable-->
-<!--          @change="handleQuery"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <el-form-item :label="'仓库'" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          :placeholder="'请选择仓库'"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'出库单编号'" prop="stockoutId"> <!-- 出库单编号 -->
         <el-input
           v-model="queryParams.stockoutId"
@@ -25,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'erp单据号'" prop="erpStockoutId"> <!-- 出库单编号 -->
-        <el-input
-          v-model="queryParams.erpStockoutId"
-          :placeholder="'请输入出库单编号'"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="'出库类型'" prop="outType"> <!-- 出库类型 -->
         <el-select v-model="queryParams.outType" :placeholder="'请选择出库类型'" clearable>
           <el-option
@@ -43,19 +35,6 @@
           />
         </el-select>
       </el-form-item>
-
-
-      <el-form-item :label="'出库方向'" prop="spare8"> <!-- 出库方向  -->
-        <el-select v-model="queryParams.spare8" :placeholder="'请选择出库方向'" clearable>
-          <el-option
-            v-for="dict in dict.type.out_location"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item :label="'单据状态'" prop="status"> <!-- 单据状态 -->
         <el-select v-model="queryParams.status" :placeholder="'请选择单据状态'" clearable>
           <el-option
@@ -66,18 +45,10 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item :label="'客商名称'" prop="customerName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.customerName"-->
-<!--          :placeholder="'请输入客商名称'"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item :label="'存货编码'" prop="productId">
+      <el-form-item :label="'客商名称'" prop="customerName">
         <el-input
-          v-model="queryParams.productId"
-          :placeholder="'请输入存货编码'"
+          v-model="queryParams.customerName"
+          :placeholder="'请输入客商名称'"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -166,7 +137,6 @@
     <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
-      <el-table-column :label="'erp单据号'" align="left" prop="erpStockoutId" />
       <el-table-column :label="'出库类型'" align="left" prop="outType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -197,16 +167,10 @@
       <!--      <el-table-column :label="'销售订单号'" align="left" prop="spare2" />-->
       <el-table-column :label="'审核时间'" align="left" prop="spare3" />
       <el-table-column :label="'审核人'" align="left" prop="spare4" />
-      <el-table-column :label="'出库方向'" align="left" prop="spare8" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_location" :value="scope.row.spare8"/>
-        </template>
-      </el-table-column>
       <el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
       <el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
       <el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
       <el-table-column :label="'备注'" align="left" prop="spare5" />
-
     </el-table>
 
     <pagination
@@ -224,7 +188,7 @@
       <el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
       <el-table-column :label="'存货名称'" align="center" prop="productName" />
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/>
-<!--      <el-table-column :label="'供应商编码'" align="center" prop="fid"/>-->
+      <el-table-column :label="'供应商编码'" align="center" prop="fid"/>
       <el-table-column :label="'计量单位'" align="center" prop="unit"/>
       <el-table-column :label="'规格型号'" align="center" prop="spec"/>
       <el-table-column :label="'层次关系'" align="center" prop="spare1"/>
@@ -236,9 +200,6 @@
       <el-table-column :label="'出库数量'" align="center" prop="quantity"/>
       <el-table-column :label="'分配数量'" align="center" prop="allotQuantity"/>
       <el-table-column :label="'实际数量'" align="center" prop="assignNum"/>
-      <el-table-column :label="'货位号'" align="center" prop="cargoSpaceId"/>
-      <el-table-column :label="'托盘号'" align="center" prop="trayCode"/>
-      <el-table-column :label="'条码号'" align="center" prop="trayCode"/>
       <!--      <el-table-column :label="'备注'" align="center" prop="remark"/>-->
     </el-table>
 
@@ -375,7 +336,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
-  dicts: ['out_bill_type', 'out_bill_status', 'out_method', 'bill_resource','out_location'],
+  dicts: ['out_bill_type', 'out_bill_status', 'out_method', 'bill_resource'],
   data() {
     return {
       // 遮罩层
@@ -418,8 +379,8 @@ export default {
       },
       // 出口选项
       exitOptions: [
-        { exitId: '1', exitName: '缓存'},
-        { exitId: '2', exitName: '线边'},
+        { exitId: '1', exitName: '一楼'},
+        { exitId: '2', exitName: '二楼'},
 
       ],
 
@@ -432,15 +393,13 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockoutId: null,
-        erpStockoutId:null,
         outType: null,
         customerNo: null,
         customerName: null,
         productName: null,
         startDate: null,
         finishDate: null,
-        status: null,
-        spare8:null
+        status: null
       },
       // 子表分页参数
       detailQueryParams: {
@@ -625,14 +584,8 @@ export default {
         this.$modal.msgError('请先审核出库单')
          return
       }
-      if (this.queryParams.spare8==''||this.queryParams.spare8==null){
-        this.$modal.msgError('请选择出库方向后，再次点击分配！')
-        return
-      }
-
       let data = {
-        stockoutId: stockoutIds[0],
-        spare8:this.queryParams.spare8
+        stockoutId: stockoutIds[0]
       }
       autoAllot(data).then(response => {
         if (response.code !== 200){
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index 5fab1a6..ba4cce7 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -25,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘条码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
         <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
           <el-option
@@ -44,14 +36,14 @@
         </el-select>
       </el-form-item>
 
-      <!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
-              <el-date-picker clearable
-                              v-model="queryParams.inDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择入库时间">
-              </el-date-picker>
-            </el-form-item>-->
+<!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
+        <el-date-picker clearable
+                        v-model="queryParams.inDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择入库时间">
+        </el-date-picker>
+      </el-form-item>-->
 
 
       <el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
@@ -63,28 +55,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="托盘类型" prop="ktpType"> <!-- 作业类型 -->
-        <el-select v-model="queryParams.ktpType" placeholder="请选择托盘类型" clearable>
-          <el-option
-            v-for="item in ktpType"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="物料类型" prop="model"> <!-- 作业类型 -->
-        <el-select v-model="queryParams.model" placeholder="请选择物料类型" clearable>
-          <el-option
-            v-for="item in productType"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
@@ -129,36 +99,36 @@
     </el-row>
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
-      <el-table-column type="selection" align="center"/>
+      <el-table-column type="selection" align="center" />
       <el-table-column label="库存编码" align="left" prop="stockId" width="180" sortable/>
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="180"/>
-      <el-table-column width="180" label="库存状态" align="center" prop="stockStatus">
+      <el-table-column width="180" label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column width="180" label="物料编码" align="left" prop="productId"/>
-      <el-table-column width="180" label="物料名称" align="left" prop="productName"/>
-      <el-table-column width="180" label="批次号" align="left" prop="lotNo"/>
-      <el-table-column label="托盘条码" align="center" prop="trayCode" width="160" sortable/>
-      <el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
+      <el-table-column width="180"  label="物料编码" align="left" prop="productId" />
+      <el-table-column width="180"  label="物料名称" align="left" prop="productName" />
+      <el-table-column width="180"  label="批次号" align="left" prop="lotNo"  />
+<!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
+      <el-table-column width="180" label="入库时间" align="left" prop="inDate"  sortable/>
       <el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
-      <el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>
-      <el-table-column width="180" label="出库数量" align="left" prop="outQuantity"/>
-      <el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
+      <el-table-column width="180" label="作业ID" align="left" prop="jobId"  sortable/>
+      <el-table-column width="180" label="出库数量" align="left" prop="outQuantity" />
+      <el-table-column width="180" label="入库单ID" align="left" prop="stockinId"  sortable/>
       <el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" sortable/>
-      <!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
-      <!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column width="180" label="层级关系" align="left" prop="spare1"/>
-      <el-table-column width="180" label="上层物料" align="left" prop="spare2"/>
-      <el-table-column width="180" label="顶层物料" align="left" prop="spare3"/>
-      <el-table-column width="180" label="项目号" align="left" prop="spare4"/>
-      <el-table-column width="180" label="合同号" align="left" prop="spare5"/>
-      <el-table-column width="180" label="销售订单" align="left" prop="spare6"/>
-      <el-table-column width="180" label="供应商编码" align="left" prop="voltage"/>
-      <el-table-column width="180" label="规格型号" align="left" prop="power"/>
-      <el-table-column width="180" label="计量单位" align="left" prop="phase"/>
-      <!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
+<!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
+<!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
+      <el-table-column width="180" label="层级关系" align="left" prop="spare1" />
+      <el-table-column width="180" label="上层物料" align="left" prop="spare2" />
+      <el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
+      <el-table-column width="180" label="项目号" align="left" prop="spare4" />
+      <el-table-column width="180" label="合同号" align="left" prop="spare5" />
+      <el-table-column width="180" label="销售订单" align="left" prop="spare6" />
+      <el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
+      <el-table-column width="180" label="规格型号" align="left" prop="power" />
+      <el-table-column width="180" label="计量单位" align="left" prop="phase" />
+<!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
           <el-button
@@ -190,12 +160,12 @@
     <!-- 添加或修改库存信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--        <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
-        <!--          <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
-        <!--          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
-        <!--        </el-form-item>-->
+<!--        <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
+<!--          <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
+<!--          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="物料" prop="productId"> <!-- 物料 -->
           <el-input
@@ -237,7 +207,7 @@
         </el-form-item>
 
         <el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
-          <el-input v-model="form.quantity" placeholder="请输入库存数量"/>
+          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
         </el-form-item>
 
       </el-form>
@@ -278,11 +248,11 @@
         @row-click="handleProductRowClick"
         highlight-current-row
         max-height="400">
-        <el-table-column label="品号" align="center" prop="productId"/>
-        <el-table-column label="品名" align="center" prop="productName"/>
-        <el-table-column label="规格" align="center" prop="spec"/>
-        <el-table-column label="型号" align="center" prop="spare1"/>
-        <el-table-column label="单位" align="center" prop="unit"/>
+        <el-table-column label="品号" align="center" prop="productId" />
+        <el-table-column label="品名" align="center" prop="productName" />
+        <el-table-column label="规格" align="center" prop="spec" />
+        <el-table-column label="型号" align="center" prop="spare1" />
+        <el-table-column label="单位" align="center" prop="unit" />
       </el-table>
 
       <pagination
@@ -340,17 +310,17 @@
         @row-click="handleCargoSpaceRowClick"
         highlight-current-row
         max-height="400">
-        <el-table-column label="货位编码" align="center" prop="cargoSpaceId"/>
-        <el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
-        <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
+        <el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
+        <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+        <el-table-column label="仓库名称" align="center" prop="warehouseName" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="排" align="center" prop="thePlatoon"/>
-        <el-table-column label="列" align="center" prop="theColumn"/>
-        <el-table-column label="层" align="center" prop="theFloor"/>
+        <el-table-column label="排" align="center" prop="thePlatoon" />
+        <el-table-column label="列" align="center" prop="theColumn" />
+        <el-table-column label="层" align="center" prop="theFloor" />
       </el-table>
 
       <pagination
@@ -370,14 +340,13 @@
 </template>
 
 <script>
-import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
+import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
 import {listWarehouse} from "@/api/bas/warehouse"
-import {listBasProduct} from "@/api/bas/BasProduct"
-import {listCargoSpace} from "@/api/bas/cargoSpace"
-
+import { listBasProduct } from "@/api/bas/BasProduct"
+import { listCargoSpace } from "@/api/bas/cargoSpace"
 export default {
   name: "Management",
-  dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
+  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
@@ -396,8 +365,6 @@ export default {
       managementList: [],
       // 仓库选项
       warehouseOptions: [],
-      productType: [{label: '半托', value: '0'}, {label: '满托', value: '1'}],
-      ktpType: [{label: '空托盘', value: '1'}, {label: '物料', value: '2'}],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -430,12 +397,10 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null,
-        ktpType: null,
-        model: null
+        spare6: null
       },
       queryWarehouse: {
-        pageNum: 1,
+        pageNum:1,
         pageSize: 99
       },
       // 表单参数
@@ -510,6 +475,8 @@ export default {
         inDate: null,
         backDate: null,
         productGuid: null,
+        productId: null,
+        productName: null,
         quantity: null,
         jobId: null,
         trayCode: null,
@@ -525,9 +492,7 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null,
-        ktpType: null,
-        productType: null
+        spare6: null
       }
       this.resetForm("form")
     },
@@ -546,7 +511,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockId)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -588,13 +553,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function () { // 是否确认删除库存信息编号为
+      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function() { // 是否确认删除库存信息编号为
         return delManagement(stockIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功") // 删除成功
-      }).catch(() => {
-      })
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 39525e7..eba5ad0 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode"><!-- 品名 -->
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘条码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="项目号" prop="spare4"><!-- 品名 -->
         <el-input
           v-model="queryParams.spare4"
@@ -87,20 +79,20 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
+      <el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
       <el-table-column label="入库日期" align="center" prop="inDate" width="160" />
       <el-table-column label="批次号" align="center" prop="lotNo"/>
       <el-table-column label="托盘条码" align="center" prop="trayCode"  width="130" />
       <el-table-column label="存货编码" align="center" prop="productId" />
-      <el-table-column label="存货名称" align="center" prop="productName" width="120"/>
+      <el-table-column label="存货名称" align="center" prop="productName"/>
       <el-table-column label="层级关系" align="center" prop="spare1"/>
       <el-table-column label="上层物料" align="center" prop="spare2"/>
       <el-table-column label="顶层物料" align="center" prop="spare3"/>
       <el-table-column label="项目号" align="center" prop="spare4"/>
       <el-table-column label="合同号" align="center" prop="spare5"/>
       <el-table-column label="销售订单" align="center" prop="spare6"/>
-      <el-table-column label="供应商编码" align="center" prop="voltage" width="120"/>
+      <el-table-column label="供应商编码" align="center" prop="voltage"/>
       <el-table-column label="规格型号" align="center" prop="power"/>
       <el-table-column label="计量单位" align="center" prop="phase"/>
       <el-table-column label="数量" align="center" prop="quantity"/>
@@ -252,8 +244,8 @@ export default {
       },
       // 出口选项
       exitOptions: [
-        {exitId: '1', exitName: '缓存'},
-        {exitId: '2', exitName: '线边'},
+        {exitId: '1', exitName: '一楼'},
+        {exitId: '2', exitName: '二楼'},
 
       ],
 
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index fac19f4..40e140d 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
-const baseUrl = 'http://192.168.188.236:8080' // 后端接口
+const baseUrl = 'http://localhost:8080' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口