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/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/BatchNoGenerator.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java
new file mode 100644
index 0000000..96ecd84
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java
@@ -0,0 +1,78 @@
+package com.ruoyi.api.controller;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class BatchNoGenerator{
+    // 日期格式化模板：固定生成 yyyyMMdd 格式
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+    // 原子引用：存储当前日期，CAS保证【日期判断+重置】的原子性
+    private static final AtomicReference<String> CURRENT_DATE =
+            new AtomicReference<>(LocalDate.now().format(DATE_FORMATTER));
+
+    // 原子整数：流水号计数器，CPU级指令保证自增原子性
+    private static final AtomicInteger SERIAL_NUMBER = new AtomicInteger(1);
+
+    // 流水号最大长度（4位，最大值9999）
+    private static final int MAX_SERIAL = 9999;
+    private static final String SERIAL_FORMAT = "%04d";
+
+    /**
+     * 生成唯一批号（多线程安全，原子操作）
+     * @return yyyyMMdd+4位流水号
+     */
+    public static String generateBatchNo() {
+        // 获取当前系统日期
+        String today = LocalDate.now().format(DATE_FORMATTER);
+
+        // CAS自旋：保证日期判断、重置、计数的原子性
+        while (true) {
+            // 读取缓存的日期
+            String cacheDate = CURRENT_DATE.get();
+
+            // 场景1：当天未跨天，直接生成流水号
+            if (today.equals(cacheDate)) {
+                // 原子自增获取当前序号
+                int currentNum = SERIAL_NUMBER.getAndIncrement();
+
+                // 防止4位流水号溢出（超过9999）
+                if (currentNum > MAX_SERIAL) {
+                    // 重置序号，抛出异常提示
+                    SERIAL_NUMBER.set(1);
+                    throw new RuntimeException("当日批号已达上限：" + MAX_SERIAL);
+                }
+
+                // 拼接日期+4位流水号，返回结果
+                return today + String.format(SERIAL_FORMAT, currentNum);
+            }
+
+            // 场景2：跨天了，CAS原子更新日期并重置流水号
+            if (CURRENT_DATE.compareAndSet(cacheDate, today)) {
+                // 只有一个线程能执行到这里，重置为1
+                SERIAL_NUMBER.set(1);
+                return today + String.format(SERIAL_FORMAT, 1);
+            }
+
+            // CAS更新失败：说明其他线程已完成跨天重置，重新循环
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        // 模拟20个线程同时生成批号
+        for (int i = 0; i < 20; i++) {
+            new Thread(() -> {
+                String batchNo = generateBatchNo();
+                System.out.println("线程：" + Thread.currentThread().getName() + "，生成批号：" + batchNo);
+            }).start();
+        }
+
+        Thread.sleep(1000);
+        System.out.println("=== 所有批号生成完成，无重复、无乱序 ===");
+    }
+}
\ No newline at end of file
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 3b0e3f0..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
@@ -1,13 +1,19 @@
 package com.ruoyi.api.controller;
 
+import cn.hutool.json.JSONUtil;
+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
  */
@@ -19,6 +25,8 @@ public class ToErpApiController {
     private IToErpService toErpService;
     @Autowired
     private IRequestLogService requestLogService;
+    @Autowired
+    private PdaMapper pdaMapper;
 
     /**
      * 接收入出库通知单
@@ -28,7 +36,7 @@ public class ToErpApiController {
     public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) {
 
         AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo);
-        requestLogService.insertRequestLog(requestLogService.getRequestLog(deliveryNoticeVo.toString(), "接收入出库通知单", ajaxResult));
+        requestLogService.insertRequestLog(requestLogService.getRequestLogERP(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult));
         return ajaxResult;
 
 
@@ -36,22 +44,107 @@ public class ToErpApiController {
 
 
     /**
-     * 回传其他入库单
+     * 回传入库单
      */
-//    @Scheduled(fixedDelay = 1500)
+    @Scheduled(fixedDelay = 1500)
     @RequestMapping("/callbackInDeliveryNotice")
     @ResponseBody
-    public void callbackInDeliveryNotice() {
-        toErpService.callbackInDeliveryNotice();
+    public void callbackInDeliveryNoticeNew() {
+        toErpService.callbackInDeliveryNoticeNew();
+    }
+
+
+    /**
+     * 回传出库单(新)
+     */
+    @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/callbackOutDeliveryNotice")
+    @ResponseBody
+    public void callbackDeliveryOutNoticeNew() {
+        toErpService.callbackDeliveryOutNoticeNew();
+    }
+
+
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackOutDeliveryNotice")
+//    @ResponseBody
+//    public void callbackDeliveryOutNoticeNewS() {
+//        toErpService.callbackDeliveryOutNoticeNews();
+//    }
+
+
+
+
+
+//    /**
+//     * 回传其他入库单
+//     */
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackInDeliveryNotice")
+//    @ResponseBody
+//    public void callbackInDeliveryNotice() {
+//        toErpService.callbackInDeliveryNotice();
+//    }
+//
+//    /**
+//     * 回传其他出库单
+//     */
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackOutDeliveryNotice")
+//    @ResponseBody
+//    public void callbackDeliveryOutNotice() {
+//        toErpService.callbackoutDeliveryNotice();
+//    }
+
+    /**
+     * 移库回调接口
+     */
+    @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/moveCargoSpace")
+    @ResponseBody
+    public void moveCargoSpace() {
+        toErpService.moveCargoSpace();
     }
 
     /**
-     * 回传其他出库单
+     * 自动确认入库单据
      */
-    @RequestMapping("/callbackOutDeliveryNotice")
+    @Scheduled(fixedDelay = 10000)
+//    @RequestMapping("/FillFinishAllot")
     @ResponseBody
-    public void callbackDeliveryOutNotice() {
-        toErpService.callbackoutDeliveryNotice();
+    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 be1c869..d8a53c0 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,18 +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);
+        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;
     }
@@ -65,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;
     }
@@ -74,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;
     }
@@ -96,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;
     }
@@ -107,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;
     }
 
 
-
     /**
      * 出库单据保存
      *
@@ -137,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);
@@ -150,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);
@@ -163,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/controller/TwinController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/TwinController.java
index 7cb80c5..007d71d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/TwinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/TwinController.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,6 +24,7 @@ public class TwinController {
     @Autowired
     private ITwinService twinService;
 
+    //获取所有货位
     @Anonymous
     @GetMapping("/getEmptyCargoSpace")
     public AjaxResult getEmptyCargoSpace() {
@@ -30,10 +32,25 @@ public class TwinController {
         return AjaxResult.success(list);
     }
 
+    //获取统计信息
     @Anonymous
     @GetMapping("/getStockList")
     public Map<String, Object> getStockList() {
         return twinService.getStockListOverview();
     }
 
+    //根据货位号获取库存中的物料信息
+    @Anonymous
+    @GetMapping("/getCargo/{cargoSpaceName}")
+    public Map<String, Object> getCargo(@PathVariable("cargoSpaceName") String cargoSpaceName) {
+        return twinService.getCargo(cargoSpaceName);
+    }
+
+    //根据任务号获取作业表中的物料信息
+    @Anonymous
+    @GetMapping("/getTaskCargo/{taskNo}")
+    public Map<String, Object> getTaskCargo(@PathVariable("taskNo") String taskNo) {
+        return twinService.getTaskCargo(taskNo);
+    }
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java
new file mode 100644
index 0000000..90bd28f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java
@@ -0,0 +1,70 @@
+package com.ruoyi.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+@Getter
+@Setter
+public class CallBackErp implements Serializable {
+
+    /**
+
+     * | 方向    | 字段名           | 对应方向 | 字段名   |
+     * | ------- | ---------------- | -------- | -------- |
+     * | ERP→WMS | companyShortName | WMS→ERP  | ccompany |   公司简称
+     * | ERP→WMS | accountSetNo     | WMS→ERP  | cacc_id  |   账套号
+     * | ERP→WMS | warehouseId      | WMS→ERP  | cwhcode  |   仓库
+     * | ERP→WMS | customerId       | WMS→ERP  | cvencode |   客户
+     * | ERP→WMS | customerName     | WMS→ERP  | cvenname |    客户名称
+     * | ERP→WMS | remark           | WMS→ERP  | cmemo    |
+     *
+     */
+    // 公司名称
+    @JsonProperty("ccompany")
+    private String ccompany;
+    // WMS单据号
+    @JsonProperty("ccode")
+    private String ccode;
+    // 操作日期
+    @JsonProperty("ddate")
+    private String ddate;
+    // 业务类型
+    @JsonProperty("cintype")
+    private String cintype;
+    //  供应商编码
+    @JsonProperty("cvencode")
+    private String cvencode;
+    // 供应商名称
+    @JsonProperty("cvenname")
+    private String cvenname;
+    // 出/入库人 操作人
+    @JsonProperty("coptname")
+    private String coptname;
+    //  仓库编码
+    @JsonProperty("cwhcode")
+    private String cwhcode;
+    //  仓库名称
+    @JsonProperty("cwhname")
+    private String cwhname;
+    //  备注
+    @JsonProperty("cmemo")
+    private String cmemo;
+    //  账套号
+    @JsonProperty("cacc_id")
+    private String cacc_id;
+    // 子明细
+    @JsonProperty("details")
+    private List<CallBackErpItems> details;
+
+
+
+
+}
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
new file mode 100644
index 0000000..ac2a858
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
@@ -0,0 +1,68 @@
+package com.ruoyi.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+@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    |
+         */
+
+        @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 8fd3ecd..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
@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.List;
 
 /**
  * 出入库通知单-子表接收对象
@@ -42,7 +45,38 @@ public class DeliveryNoticeItemVo {
     /** 备注 */
     private String remark;
 
+    private List<LocationDetail> locations;
+    /**货位*/
     private String area;
-
+   /**托盘*/
     private String location;
+
+    private String areaBefore;
+
+    private String locationBefore;
+    /** 项目号 */
+    private String projectNo;
+    /**
+     * erp子表主键
+     ***/
+    private String sourceLineId;
+    /**
+     * 条码号
+     ***/
+    private String barCode;
+    /**
+     * 是否批次管理
+     **/
+    private String isBatchManage;
+
+    /**旧项目号**/
+    private String oldProjectNo;
+    /**组件号**/
+    private String groupNum;
+
+
+    /**存放地点  1 立库 2平库*/
+    private String stg_location;
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java
index f11d15f..88f545e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java
@@ -49,6 +49,17 @@ public class DeliveryNoticeVo {
     private String warehouseId;
     /** 备注 */
     private String remark;
+    /** 配送终点 */
+    private String destination;
+    /** 领料车间 */
+    private String workshop;
+
+
+    private String companyShortName;
+    /** 账套号**/
+    private String accountSetNo;
     /** 子表明细列表 */
+
+
     private List<DeliveryNoticeItemVo> detailList;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
new file mode 100644
index 0000000..8b4fc4a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
@@ -0,0 +1,44 @@
+package com.ruoyi.api.domain;
+
+public class LocationDetail {
+
+    private String locationNo;
+
+    private String areaNo;
+
+    private String quantity;
+
+    private String lotNo;
+
+    public String getLocationNo() {
+        return locationNo;
+    }
+
+    public void setLocationNo(String locationNo) {
+        this.locationNo = locationNo;
+    }
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public void setAreaNo(String areaNo) {
+        this.areaNo = areaNo;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+}
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 044d7dd..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
@@ -20,4 +20,8 @@ public class RequestEnter {
     private  String type;
 
     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/moveMsg/controller/MoveMsgController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/controller/MoveMsgController.java
new file mode 100644
index 0000000..69b3893
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/controller/MoveMsgController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.api.moveMsg.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.api.moveMsg.domain.MoveMsg;
+import com.ruoyi.api.moveMsg.service.IMoveMsgService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 移库信息回传Controller
+ * 
+ * @author ruoyi
+ * @date 2026-01-29
+ */
+@RestController
+@RequestMapping("/api/moveMsg")
+public class MoveMsgController extends BaseController
+{
+    @Autowired
+    private IMoveMsgService moveMsgService;
+
+    /**
+     * 查询移库信息回传列表
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MoveMsg moveMsg)
+    {
+        startPage();
+        List<MoveMsg> list = moveMsgService.selectMoveMsgList(moveMsg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出移库信息回传列表
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:export')")
+    @Log(title = "移库信息回传", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MoveMsg moveMsg)
+    {
+        List<MoveMsg> list = moveMsgService.selectMoveMsgList(moveMsg);
+        ExcelUtil<MoveMsg> util = new ExcelUtil<MoveMsg>(MoveMsg.class);
+        util.exportExcel(response, list, "移库信息回传数据");
+    }
+
+    /**
+     * 获取移库信息回传详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(moveMsgService.selectMoveMsgById(id));
+    }
+
+    /**
+     * 新增移库信息回传
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:add')")
+    @Log(title = "移库信息回传", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MoveMsg moveMsg)
+    {
+        return toAjax(moveMsgService.insertMoveMsg(moveMsg));
+    }
+
+    /**
+     * 修改移库信息回传
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:edit')")
+    @Log(title = "移库信息回传", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MoveMsg moveMsg)
+    {
+        return toAjax(moveMsgService.updateMoveMsg(moveMsg));
+    }
+
+    /**
+     * 删除移库信息回传
+     */
+    @PreAuthorize("@ss.hasPermi('api:moveMsg:remove')")
+    @Log(title = "移库信息回传", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(moveMsgService.deleteMoveMsgByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/domain/MoveMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/domain/MoveMsg.java
new file mode 100644
index 0000000..fc8ccad
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/domain/MoveMsg.java
@@ -0,0 +1,202 @@
+package com.ruoyi.api.moveMsg.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;
+
+/**
+ * 移库信息回传对象 move_msg
+ * 
+ * @author ruoyi
+ * @date 2026-01-29
+ */
+public class MoveMsg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private String id;
+
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
+
+    /** 原货位 */
+    @Excel(name = "原货位")
+    private String oldSpace;
+
+    /** 新货位 */
+    @Excel(name = "新货位")
+    private String newSpace;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 发送时间 */
+    @Excel(name = "发送时间")
+    private String sendTime;
+
+    /** 信息 */
+    @Excel(name = "信息")
+    private String msg;
+
+    /** 备用 */
+    @Excel(name = "备用")
+    private String spare1;
+
+    /** 备用 */
+    @Excel(name = "备用")
+    private String spare2;
+
+    /** 备用 */
+    @Excel(name = "备用")
+    private String spare3;
+
+    /** 备用 */
+    @Excel(name = "备用")
+    private String spare4;
+
+    /** 备用 */
+    @Excel(name = "备用")
+    private String spare5;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+
+    public void setTrayCode(String trayCode) 
+    {
+        this.trayCode = trayCode;
+    }
+
+    public String getTrayCode() 
+    {
+        return trayCode;
+    }
+
+    public void setOldSpace(String oldSpace) 
+    {
+        this.oldSpace = oldSpace;
+    }
+
+    public String getOldSpace() 
+    {
+        return oldSpace;
+    }
+
+    public void setNewSpace(String newSpace) 
+    {
+        this.newSpace = newSpace;
+    }
+
+    public String getNewSpace() 
+    {
+        return newSpace;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setSendTime(String sendTime) 
+    {
+        this.sendTime = sendTime;
+    }
+
+    public String getSendTime() 
+    {
+        return sendTime;
+    }
+
+    public void setMsg(String msg) 
+    {
+        this.msg = msg;
+    }
+
+    public String getMsg() 
+    {
+        return msg;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("trayCode", getTrayCode())
+            .append("oldSpace", getOldSpace())
+            .append("newSpace", getNewSpace())
+            .append("status", getStatus())
+            .append("sendTime", getSendTime())
+            .append("msg", getMsg())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/mapper/MoveMsgMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/mapper/MoveMsgMapper.java
new file mode 100644
index 0000000..80a588b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/mapper/MoveMsgMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.api.moveMsg.mapper;
+
+import java.util.List;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
+
+/**
+ * 移库信息回传Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-01-29
+ */
+public interface MoveMsgMapper 
+{
+    /**
+     * 查询移库信息回传
+     * 
+     * @param id 移库信息回传主键
+     * @return 移库信息回传
+     */
+    public MoveMsg selectMoveMsgById(String id);
+
+    /**
+     * 查询移库信息回传列表
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 移库信息回传集合
+     */
+    public List<MoveMsg> selectMoveMsgList(MoveMsg moveMsg);
+
+    /**
+     * 新增移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    public int insertMoveMsg(MoveMsg moveMsg);
+
+    /**
+     * 修改移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    public int updateMoveMsg(MoveMsg moveMsg);
+
+    /**
+     * 删除移库信息回传
+     * 
+     * @param id 移库信息回传主键
+     * @return 结果
+     */
+    public int deleteMoveMsgById(String id);
+
+    /**
+     * 批量删除移库信息回传
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMoveMsgByIds(String[] ids);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/IMoveMsgService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/IMoveMsgService.java
new file mode 100644
index 0000000..23c4ee9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/IMoveMsgService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.api.moveMsg.service;
+
+import java.util.List;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
+
+/**
+ * 移库信息回传Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-01-29
+ */
+public interface IMoveMsgService 
+{
+    /**
+     * 查询移库信息回传
+     * 
+     * @param id 移库信息回传主键
+     * @return 移库信息回传
+     */
+    public MoveMsg selectMoveMsgById(String id);
+
+    /**
+     * 查询移库信息回传列表
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 移库信息回传集合
+     */
+    public List<MoveMsg> selectMoveMsgList(MoveMsg moveMsg);
+
+    /**
+     * 新增移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    public int insertMoveMsg(MoveMsg moveMsg);
+
+    /**
+     * 修改移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    public int updateMoveMsg(MoveMsg moveMsg);
+
+    /**
+     * 批量删除移库信息回传
+     * 
+     * @param ids 需要删除的移库信息回传主键集合
+     * @return 结果
+     */
+    public int deleteMoveMsgByIds(String[] ids);
+
+    /**
+     * 删除移库信息回传信息
+     * 
+     * @param id 移库信息回传主键
+     * @return 结果
+     */
+    public int deleteMoveMsgById(String id);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/impl/MoveMsgServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/impl/MoveMsgServiceImpl.java
new file mode 100644
index 0000000..0334df5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/moveMsg/service/impl/MoveMsgServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.api.moveMsg.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.api.moveMsg.mapper.MoveMsgMapper;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
+import com.ruoyi.api.moveMsg.service.IMoveMsgService;
+
+/**
+ * 移库信息回传Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-01-29
+ */
+@Service
+public class MoveMsgServiceImpl implements IMoveMsgService 
+{
+    @Autowired
+    private MoveMsgMapper moveMsgMapper;
+
+    /**
+     * 查询移库信息回传
+     * 
+     * @param id 移库信息回传主键
+     * @return 移库信息回传
+     */
+    @Override
+    public MoveMsg selectMoveMsgById(String id)
+    {
+        return moveMsgMapper.selectMoveMsgById(id);
+    }
+
+    /**
+     * 查询移库信息回传列表
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 移库信息回传
+     */
+    @Override
+    public List<MoveMsg> selectMoveMsgList(MoveMsg moveMsg)
+    {
+        return moveMsgMapper.selectMoveMsgList(moveMsg);
+    }
+
+    /**
+     * 新增移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    @Override
+    public int insertMoveMsg(MoveMsg moveMsg)
+    {
+        return moveMsgMapper.insertMoveMsg(moveMsg);
+    }
+
+    /**
+     * 修改移库信息回传
+     * 
+     * @param moveMsg 移库信息回传
+     * @return 结果
+     */
+    @Override
+    public int updateMoveMsg(MoveMsg moveMsg)
+    {
+        return moveMsgMapper.updateMoveMsg(moveMsg);
+    }
+
+    /**
+     * 批量删除移库信息回传
+     * 
+     * @param ids 需要删除的移库信息回传主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMoveMsgByIds(String[] ids)
+    {
+        return moveMsgMapper.deleteMoveMsgByIds(ids);
+    }
+
+    /**
+     * 删除移库信息回传信息
+     * 
+     * @param id 移库信息回传主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMoveMsgById(String id)
+    {
+        return moveMsgMapper.deleteMoveMsgById(id);
+    }
+}
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 f140fc6..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
@@ -1,6 +1,7 @@
 package com.ruoyi.api.service;
 
 import com.ruoyi.api.domain.DeliveryNoticeVo;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
 import com.ruoyi.bas.BasProduct.domain.BasProduct;
 import com.ruoyi.common.core.domain.AjaxResult;
 
@@ -16,5 +17,13 @@ public interface IToErpService {
 
     void callbackoutDeliveryNotice();
 
+    void moveCargoSpace();
+
     AjaxResult createWorkshopInboundOrder(BasProduct basProduct);
+
+    void callbackInDeliveryNoticeNew();
+
+    void callbackDeliveryOutNoticeNew();
+
+    void callbackDeliveryOutNoticeNews();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java
index f41f6da..06a32d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java
@@ -59,4 +59,6 @@ public interface IToWmsService {
      * 作废物料
      */
     AjaxResult InvalidProduct(ErpProduct erpProduct);
+
+    AjaxResult requestEnterByTaskNo(RequestEnter requestEnter);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/ITwinService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/ITwinService.java
index 1a7ff85..ae430e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/ITwinService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/ITwinService.java
@@ -4,5 +4,7 @@ import java.util.Map;
 
 public interface ITwinService {
     Map<String, Object> getStockListOverview();
+    Map<String, Object> getCargo(String cargoSpaceName);
+    Map<String, Object> getTaskCargo(String taskNo);
 }
 
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 0841b34..609dbcf 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
@@ -1,8 +1,13 @@
 package com.ruoyi.api.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.api.controller.BatchNoGenerator;
 import com.ruoyi.api.domain.*;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
+import com.ruoyi.api.moveMsg.service.IMoveMsgService;
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.bas.BasProduct.domain.BasProduct;
 import com.ruoyi.bas.basJobId.service.IBasJobIdService;
@@ -27,10 +32,17 @@ import com.ruoyi.log.domain.RequestLog;
 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;
@@ -38,10 +50,15 @@ 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.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;
 
 /**
  * 作业统计 Service 实现
@@ -55,9 +72,10 @@ public class ToErpServiceImpl implements IToErpService {
     private IMydoJobService mydoJobService;
     @Autowired
     private IMydoJobDetailService mydoJobDetailService;
-
     @Autowired
-    private IBasJobIdService  basJobIdService;
+    private IBasJobIdService iBasJobIdService;
+    @Autowired
+    private IBasJobIdService basJobIdService;
 
     @Autowired
     private IRequestLogService requestLogService;
@@ -79,13 +97,24 @@ public class ToErpServiceImpl implements IToErpService {
     private IInStockinBackService inStockinBackService;
     @Autowired
     private IInStockinDetailBackService inStockinDetailBackService;
+    @Autowired
+    private IMoveMsgService moveMsgService;
+
+    @Autowired
+    private IBasStockService basStockService;
+    @Autowired
+    private IOutStockoutBackService outStockoutBackService;
+
+    @Autowired
+    private IOutStockoutDetailBackService outStockoutDetailBackService;
 
     private static final String TO_ERP_URL = "http://192.168.1.100:8080/api/";
 
     //todo 需要调试
-    private static final String WORKSHOP_INBOUND_ORDER_URL = TO_ERP_URL+"TRANSACTION_DOC";
+    private static final String WORKSHOP_INBOUND_ORDER_URL = TO_ERP_URL + "TRANSACTION_DOC";
     //todo 需要调试
-    private static final String OTHER_IN_OUTBOUND_ORDER_URL = TO_ERP_URL+"WIP_TRANSFER_DOC";
+    private static final String OTHER_IN_OUTBOUND_ORDER_URL = TO_ERP_URL + "WIP_TRANSFER_DOC";
+
     /**
      * 处理送货通知单的业务逻辑
      * 根据单据类型和操作类型进行入库单或出库单的增删改操作
@@ -93,24 +122,270 @@ public class ToErpServiceImpl implements IToErpService {
      * @param deliveryNoticeVo 送货通知单数据对象，包含单据基本信息和明细列表
      * @return AjaxResult 操作结果，包含成功或错误信息
      */
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    public AjaxResult receiveDeliveryNotice(DeliveryNoticeVo deliveryNoticeVo) {
+//
+//        if (deliveryNoticeVo == null || deliveryNoticeVo.getDetailList() == null || deliveryNoticeVo.getDetailList().isEmpty()) {
+//            return AjaxResult.error("单据或明细不能为空");
+//        }
+//        String billType = deliveryNoticeVo.getBillType();
+//        String opType = deliveryNoticeVo.getOpType();
+////        String status = deliveryNoticeVo.getStatus();
+//        int type = 0;
+//        try {
+//            type = Integer.parseInt(billType);
+//        } catch (Exception ignored) {
+//        }
+//
+//        // 处理入库单相关操作（单据类型1-4）
+//        if (type >= 1 && type <= 4) {
+//            InStockin param = new InStockin();
+//            param.setErpBill(deliveryNoticeVo.getBillNo());
+//            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
+//            InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null;
+//
+//            // 删除操作（操作类型3）
+//            if ("3".equals(opType)) {
+//                if (exist == null) {
+//                    return AjaxResult.error("单据不存在");
+//                }
+//                if ("3".equals(exist.getStatus())) {
+//                    return AjaxResult.error("单据已执行，禁止删除");
+//                }
+//                if (exist.getStockinGuid() != null) {
+//                    inStockinDetailService.deleteInStockinDetailByStockinGuid(exist.getStockinGuid());
+//                    inStockinService.deleteInStockinByStockinGuid(exist.getStockinGuid());
+//                }
+//
+//                return AjaxResult.success();
+//            }
+//
+//            // 新增或修改操作（操作类型1或2）
+//            if ("2".equals(opType) || "1".equals(opType)) {
+//                if ("2".equals(opType) && exist == null) {
+//                    return AjaxResult.error("单据不存在，无法修改");
+//                }
+//                if ("1".equals(opType) && exist != null) {
+//                    return AjaxResult.error("单据已存在，请勿重复添加");
+//                }
+//                if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType)) {
+//                    return AjaxResult.error("单据已执行，禁止修改");
+//                }
+//                InStockin inStockin = exist != null ? exist : new InStockin();
+//                if (exist == null) {
+//                    inStockin.setStockinGuid(UUID.randomUUID().toString());
+//                }
+//                String rkdId = iBasJobIdService.getJobId("RKD");
+//
+//                inStockin.setStockinId(rkdId);
+//                inStockin.setInType(deliveryNoticeVo.getBillType());
+//                inStockin.setCreateDate(deliveryNoticeVo.getBillDate());
+//                inStockin.setCreateManId(deliveryNoticeVo.getCreateMan());
+//                inStockin.setStatus("2");
+//                inStockin.setWarehouseId(deliveryNoticeVo.getWarehouseId());
+//                inStockin.setErpBill(deliveryNoticeVo.getBillNo());
+//                inStockin.setStockSource("1");
+//                inStockin.setDepartmentNo(deliveryNoticeVo.getProjectNo());//项目号
+//                inStockin.setSupplierNo(deliveryNoticeVo.getCustomerId());//供应商编码
+//                inStockin.setClassNo(deliveryNoticeVo.getCustomerName());//供应商名称
+//                inStockin.setSpare1(deliveryNoticeVo.getContractNo());//合同号
+//                inStockin.setSpare2(deliveryNoticeVo.getSalesOrderNo());//销售订单号
+//                inStockin.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
+//                inStockin.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
+//                inStockin.setSpare5(deliveryNoticeVo.getRemark());
+//                inStockin.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
+//                inStockin.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+//                if (exist == null) {
+//                    inStockinService.insertInStockin(inStockin);
+//                } else {
+//                    inStockinService.updateInStockin(inStockin);
+//                    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.setStockinId(inStockin.getStockinId());
+//                    detail.setProductId(item.getInventoryCode());
+//                    detail.setProductName(item.getInventoryName());
+//                    detail.setSpec(item.getSpecModel());
+//                    detail.setUnit(item.getUnit());
+//                    detail.setQuantity(item.getQuantity());
+//                    if (item.getIsBatchManage().equals("1") && (item.getLotNo().equals("") || item.getLotNo() == null)) {
+//                        // 获取流水号
+//                        detail.setLotNo(BatchNoGenerator.generateBatchNo());
+//                    } else {
+//                        detail.setLotNo(item.getLotNo());
+//                    }
+//                    detail.setSpare1(item.getLevelRelation());
+//                    detail.setSpare2(item.getUpperMaterial());
+//                    detail.setSpare3(item.getTopMaterial());
+//                    detail.setSpare4(item.getProjectNo());
+//                    detail.setSpare6(item.getLineNo());
+//                    detail.setRemark(item.getRemark());
+//                    detail.setAssignNum("0");
+//                    detail.setScanNum("0");
+//                    detail.setSourceLineId(item.getSourceLineId());
+//                    detail.setBarCode(item.getBarCode());
+//                    detail.setIsBatchManage(item.getIsBatchManage());
+//                    detail.setOldProjectNo(item.getOldProjectNo());
+//                    detail.setCargoNo(item.getGroupNum());
+//                    inStockinDetailService.insertInStockinDetail(detail);
+//
+//                }
+//
+//                return AjaxResult.success();
+//            }
+//        }
+//        // 处理出库单相关操作（单据类型5-7）
+//        else if (type >= 5 && type <= 7) {
+//            OutStockout param = new OutStockout();
+//            param.setErpStockoutId(deliveryNoticeVo.getBillNo());
+//            List<OutStockout> outList = outStockoutService.selectOutStockoutList(param);
+//            OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null;
+//
+//            // 删除操作（操作类型3）
+//            if ("3".equals(opType)) {
+//                if (exist == null) {
+//                    return AjaxResult.error("单据不存在");
+//                }
+//                if ("3".equals(exist.getStatus())) {
+//                    return AjaxResult.error("单据已执行，禁止删除");
+//                }
+//                OutStockoutDetail outStockoutDetail = new OutStockoutDetail();
+//                outStockoutDetail.setStockoutId(deliveryNoticeVo.getBillNo());
+//                List<OutStockoutDetail> details = outStockoutDetailService.selectOutStockoutDetailList(outStockoutDetail);
+//                if (details != null && !details.isEmpty()) {
+//                    String[] ids = details.stream().map(OutStockoutDetail::getStockoutDetailId).toArray(String[]::new);
+//                    outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
+//                }
+//                outStockoutService.deleteOutStockoutByStockoutGuid(exist.getStockoutGuid());
+//                return AjaxResult.success();
+//            }
+//
+//            // 新增或修改操作（操作类型1或2）
+//            if ("2".equals(opType) || "1".equals(opType)) {
+//                if ("2".equals(opType) && exist == null) {
+//                    return AjaxResult.error("单据不存在，无法修改");
+//                }
+//                if ("1".equals(opType) && exist != null) {
+//                    return AjaxResult.error("单据已存在，请勿重复添加");
+//                }
+//                if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType)) {
+//                    return AjaxResult.error("单据已执行，禁止修改");
+//                }
+//                OutStockout out = exist != null ? exist : new OutStockout();
+//
+//                if (exist == null) {
+//                    out.setStockoutGuid(UUID.randomUUID().toString());
+//                }
+//                String ckdId = iBasJobIdService.getJobId("CKD");
+//                out.setStockoutId(ckdId);
+//                out.setOutType(deliveryNoticeVo.getBillType());
+//                out.setCreateDate(deliveryNoticeVo.getBillDate());
+//                out.setErpStockoutId(deliveryNoticeVo.getBillNo());
+//                out.setCreateManId(deliveryNoticeVo.getCreateMan());
+//                out.setStatus("2");
+//                out.setWarehouseId(deliveryNoticeVo.getWarehouseId());
+//                out.setStockoutSource("1");
+////                out.setSpare6(deliveryNoticeVo.getOutType());
+//                out.setSpare6("1");
+//                out.setCarNumber(deliveryNoticeVo.getIsProjectOut());
+//                out.setDepartmentNo(deliveryNoticeVo.getProjectNo());
+//                out.setCustomerNo(deliveryNoticeVo.getCustomerId());
+//                out.setClassNowId(deliveryNoticeVo.getCustomerName());
+//                out.setSpare1(deliveryNoticeVo.getContractNo());//合同号
+//                out.setSpare2(deliveryNoticeVo.getSalesOrderNo());//销售订单号
+//                out.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
+//                out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
+//                out.setSpare5(deliveryNoticeVo.getRemark());
+//                out.setSpare7(deliveryNoticeVo.getDestination());
+//                //手动设置出库类型为2 这样会赋值 in_or_out 21
+//                out.setSpare8("2");
+//                out.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
+//                out.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+//
+//                if (exist == null) {
+//                    outStockoutService.insertOutStockout(out);
+//                } else {
+//                    outStockoutService.updateOutStockout(out);
+//                    OutStockoutDetail q2 = new OutStockoutDetail();
+//                    q2.setStockoutId(deliveryNoticeVo.getBillNo());
+//                    List<OutStockoutDetail> oldDetails = outStockoutDetailService.selectOutStockoutDetailList(q2);
+//                    if (oldDetails != null && !oldDetails.isEmpty()) {
+//                        String[] ids = oldDetails.stream().map(OutStockoutDetail::getStockoutDetailId).toArray(String[]::new);
+//                        outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
+//                    }
+//                }
+//                int i = 0;
+//                for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) {
+//                    OutStockoutDetail d = new OutStockoutDetail();
+//                    i += 1;
+//                    d.setStockoutDetailId(out.getStockoutId() + "-" + i);
+//                    d.setStockoutGuid(out.getStockoutGuid());
+//                    d.setStockoutId(out.getStockoutId());
+//                    d.setProductId(item.getInventoryCode());
+//                    d.setProductName(item.getInventoryName());
+//                    d.setLotNo(item.getLotNo());
+//                    d.setSpec(item.getSpecModel());
+//                    d.setUnit(item.getUnit());
+//                    d.setSpare1(item.getLevelRelation());
+//                    d.setSpare2(item.getUpperMaterial());
+//                    d.setSpare3(item.getTopMaterial());
+//                    d.setSpare4(item.getProjectNo());
+//                    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());
+//                    //d.setSpare8(deliveryNoticeVo.getDestination());
+//
+//
+//                    try {
+//                        d.setQuantity(new BigDecimal(item.getQuantity()));
+//                        d.setAllotQuantity(BigDecimal.ZERO);
+//                        d.setAssignNum(BigDecimal.ZERO);
+//                    } catch (Exception e) {
+//                        d.setQuantity(BigDecimal.ZERO);
+//                    }
+//                    outStockoutDetailService.insertOutStockoutDetail(d);
+//
+//                }
+//                return AjaxResult.success();
+//            }
+//        }
+//        return AjaxResult.error("不支持的单据类型或操作类型");
+//
+//    }
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult receiveDeliveryNotice(DeliveryNoticeVo deliveryNoticeVo) {
-
-        if (deliveryNoticeVo == null || deliveryNoticeVo.getDetailList() == null || deliveryNoticeVo.getDetailList().isEmpty()){
+        if (deliveryNoticeVo == null || deliveryNoticeVo.getDetailList() == null || deliveryNoticeVo.getDetailList().isEmpty()) {
             return AjaxResult.error("单据或明细不能为空");
         }
         String billType = deliveryNoticeVo.getBillType();
         String opType = deliveryNoticeVo.getOpType();
-//        String status = deliveryNoticeVo.getStatus();
         int type = 0;
-        try { type = Integer.parseInt(billType); } catch (Exception ignored) {}
+        try {
+            type = Integer.parseInt(billType);
+        } catch (Exception ignored) {
+        }
 
-        // 处理入库单相关操作（单据类型1-4）
-        if (type >= 1 && type <= 4) {
+        // ===================== 入库单 1-4 逻辑完全不变 =====================
+        if ((type >= 1 && type <= 4) || (type >= 10 && type <= 14)) {
             InStockin param = new InStockin();
-            param.setStockinId(deliveryNoticeVo.getBillNo());
-            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
+            param.setErpBill(deliveryNoticeVo.getBillNo());
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+            param.setInType(String.valueOf(type));
+            List<InStockin> existList = inStockinService.selectInStockinListBill(param);
+//            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
             InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null;
 
             // 删除操作（操作类型3）
@@ -125,7 +400,6 @@ public class ToErpServiceImpl implements IToErpService {
                     inStockinDetailService.deleteInStockinDetailByStockinGuid(exist.getStockinGuid());
                     inStockinService.deleteInStockinByStockinGuid(exist.getStockinGuid());
                 }
-
                 return AjaxResult.success();
             }
 
@@ -134,7 +408,7 @@ public class ToErpServiceImpl implements IToErpService {
                 if ("2".equals(opType) && exist == null) {
                     return AjaxResult.error("单据不存在，无法修改");
                 }
-                if("1".equals(opType) && exist != null){
+                if ("1".equals(opType) && exist != null) {
                     return AjaxResult.error("单据已存在，请勿重复添加");
                 }
                 if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType)) {
@@ -144,22 +418,27 @@ public class ToErpServiceImpl implements IToErpService {
                 if (exist == null) {
                     inStockin.setStockinGuid(UUID.randomUUID().toString());
                 }
-                inStockin.setStockinId(deliveryNoticeVo.getBillNo());
+                String rkdId = iBasJobIdService.getJobId("RKD");
+
+                inStockin.setStockinId(rkdId);
                 inStockin.setInType(deliveryNoticeVo.getBillType());
                 inStockin.setCreateDate(deliveryNoticeVo.getBillDate());
                 inStockin.setCreateManId(deliveryNoticeVo.getCreateMan());
-                inStockin.setStatus("1");
+                inStockin.setStatus("2");
                 inStockin.setWarehouseId(deliveryNoticeVo.getWarehouseId());
-//                inStockin.setErpBill(deliveryNoticeVo.getBillNo());
+                inStockin.setErpBill(deliveryNoticeVo.getBillNo());
                 inStockin.setStockSource("1");
-                inStockin.setDepartmentNo(deliveryNoticeVo.getProjectNo());//项目号
-                inStockin.setSupplierNo(deliveryNoticeVo.getCustomerId());//供应商编码
-                inStockin.setClassNo(deliveryNoticeVo.getCustomerName());//供应商名称
-                inStockin.setSpare1(deliveryNoticeVo.getContractNo());//合同号
-                inStockin.setSpare2(deliveryNoticeVo.getSalesOrderNo());//销售订单号
-                inStockin.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
-                inStockin.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
+                inStockin.setDepartmentNo(deliveryNoticeVo.getProjectNo());
+                inStockin.setSupplierNo(deliveryNoticeVo.getCustomerId());
+                inStockin.setClassNo(deliveryNoticeVo.getCustomerName());
+                inStockin.setSpare1(deliveryNoticeVo.getContractNo());
+                inStockin.setSpare2(deliveryNoticeVo.getSalesOrderNo());
+                inStockin.setSpare3(deliveryNoticeVo.getApproveDate());
+                inStockin.setSpare4(deliveryNoticeVo.getApproveMan());
                 inStockin.setSpare5(deliveryNoticeVo.getRemark());
+                inStockin.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
+                inStockin.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+
                 if (exist == null) {
                     inStockinService.insertInStockin(inStockin);
                 } else {
@@ -167,41 +446,53 @@ 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(inStockin.getStockinId()+"-"+item.getLineNo());
+                    detail.setStockinDetailId(inStockin.getStockinId() + '-' + a);
                     detail.setStockinId(inStockin.getStockinId());
                     detail.setProductId(item.getInventoryCode());
                     detail.setProductName(item.getInventoryName());
                     detail.setSpec(item.getSpecModel());
                     detail.setUnit(item.getUnit());
                     detail.setQuantity(item.getQuantity());
-                    detail.setLotNo(item.getLotNo());
+                    if (item.getIsBatchManage().equals("1") && (item.getLotNo().equals("") || item.getLotNo() == null)) {
+                        detail.setLotNo(BatchNoGenerator.generateBatchNo());
+                    } else {
+                        detail.setLotNo(item.getLotNo());
+                    }
                     detail.setSpare1(item.getLevelRelation());
                     detail.setSpare2(item.getUpperMaterial());
                     detail.setSpare3(item.getTopMaterial());
+                    detail.setSpare4(item.getProjectNo());
                     detail.setSpare6(item.getLineNo());
                     detail.setRemark(item.getRemark());
                     detail.setAssignNum("0");
                     detail.setScanNum("0");
+                    detail.setSourceLineId(item.getSourceLineId());
+                    detail.setBarCode(item.getBarCode());
+                    detail.setIsBatchManage(item.getIsBatchManage());
+                    detail.setOldProjectNo(item.getOldProjectNo());
+                    detail.setCargoNo(item.getGroupNum());
                     inStockinDetailService.insertInStockinDetail(detail);
-
                 }
-
                 return AjaxResult.success();
             }
         }
-        // 处理出库单相关操作（单据类型5-7）
-        else if (type >= 5 && type <= 7) {
+
+        // ===================== 出库单 5-7 改造：按立库/平库分两组各1主单多明细 =====================
+        else if ((type >= 5 && type <= 7) || (type >= 15 && type <= 20)) {
             OutStockout param = new OutStockout();
-            param.setStockoutId(deliveryNoticeVo.getBillNo());
+            param.setErpStockoutId(deliveryNoticeVo.getBillNo());
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+            param.setOutType(String.valueOf(type));
             List<OutStockout> outList = outStockoutService.selectOutStockoutList(param);
             OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null;
+            String billNo = deliveryNoticeVo.getBillNo();
 
-            // 删除操作（操作类型3）
+            // 删除操作 不变
             if ("3".equals(opType)) {
                 if (exist == null) {
                     return AjaxResult.error("单据不存在");
@@ -210,7 +501,7 @@ public class ToErpServiceImpl implements IToErpService {
                     return AjaxResult.error("单据已执行，禁止删除");
                 }
                 OutStockoutDetail outStockoutDetail = new OutStockoutDetail();
-                outStockoutDetail.setStockoutId(deliveryNoticeVo.getBillNo());
+                outStockoutDetail.setStockoutId(billNo);
                 List<OutStockoutDetail> details = outStockoutDetailService.selectOutStockoutDetailList(outStockoutDetail);
                 if (details != null && !details.isEmpty()) {
                     String[] ids = details.stream().map(OutStockoutDetail::getStockoutDetailId).toArray(String[]::new);
@@ -220,114 +511,195 @@ public class ToErpServiceImpl implements IToErpService {
                 return AjaxResult.success();
             }
 
-            // 新增或修改操作（操作类型1或2）
+            // 新增/修改
             if ("2".equals(opType) || "1".equals(opType)) {
                 if ("2".equals(opType) && exist == null) {
                     return AjaxResult.error("单据不存在，无法修改");
                 }
-                if ("1".equals(opType) && exist != null){
+                if ("1".equals(opType) && exist != null) {
                     return AjaxResult.error("单据已存在，请勿重复添加");
                 }
-                if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType) ) {
+                if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType)) {
                     return AjaxResult.error("单据已执行，禁止修改");
                 }
-                OutStockout out = exist != null ? exist : new OutStockout();
 
-                if (exist == null) {
-                    out.setStockoutGuid(UUID.randomUUID().toString());
+                List<DeliveryNoticeItemVo> allDetail = deliveryNoticeVo.getDetailList();
+                // 1. 按 stg_location 分组
+                List<DeliveryNoticeItemVo> liKuList = new ArrayList<>();
+                List<DeliveryNoticeItemVo> pingKuList = new ArrayList<>();
+                for (DeliveryNoticeItemVo item : allDetail) {
+                    String loc = item.getStg_location();
+                    if ("2".equals(loc)) {
+                        pingKuList.add(item);
+                    } else {
+                        // 1 或空 都归立库
+                        liKuList.add(item);
+                    }
                 }
-                out.setStockoutId(deliveryNoticeVo.getBillNo());
-                out.setOutType(deliveryNoticeVo.getBillType());
-                out.setCreateDate(deliveryNoticeVo.getBillDate());
-                out.setCreateManId(deliveryNoticeVo.getCreateMan());
-                out.setStatus("1");
-                out.setWarehouseId(deliveryNoticeVo.getWarehouseId());
-                out.setStockoutSource("1");
-                out.setDepartmentNo(deliveryNoticeVo.getProjectNo());
-                out.setCustomerNo(deliveryNoticeVo.getCustomerId());
-                out.setClassNowId(deliveryNoticeVo.getCustomerName());
-                out.setSpare1(deliveryNoticeVo.getContractNo());//合同号
-                out.setSpare2(deliveryNoticeVo.getSalesOrderNo());//销售订单号
-                out.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
-                out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
-                out.setSpare5(deliveryNoticeVo.getRemark());
+
+                // ========== 处理立库：原有主单 + 所有立库明细 ==========
+                OutStockout mainOut = exist != null ? exist : new OutStockout();
+                if (exist == null) {
+                    mainOut.setStockoutGuid(UUID.randomUUID().toString());
+                }
+                if (liKuList.size() > 0) {
+                    String ckdId = iBasJobIdService.getJobId("CKD");
+                    fillOutStockout(mainOut, deliveryNoticeVo, ckdId);
+                }
+
 
                 if (exist == null) {
-                    outStockoutService.insertOutStockout(out);
+                    String ckdId = iBasJobIdService.getJobId("CKD");
+                    fillOutStockout(mainOut, deliveryNoticeVo, ckdId);
+                    outStockoutService.insertOutStockout(mainOut);
                 } else {
-                    outStockoutService.updateOutStockout(out);
+                    outStockoutService.updateOutStockouts(mainOut);
+                    // 修改先删旧明细
                     OutStockoutDetail q2 = new OutStockoutDetail();
-                    q2.setStockoutId(deliveryNoticeVo.getBillNo());
+                    q2.setStockoutId(billNo);
                     List<OutStockoutDetail> oldDetails = outStockoutDetailService.selectOutStockoutDetailList(q2);
                     if (oldDetails != null && !oldDetails.isEmpty()) {
-                        String[] ids = oldDetails.stream().map(OutStockoutDetail::getStockoutDetailId).toArray(String[]::new);
+                        String[] ids = oldDetails.stream()
+                                .map(OutStockoutDetail::getStockoutDetailId)
+                                .toArray(String[]::new);
                         outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
                     }
                 }
+                if (liKuList.size() > 0) {
+                    // 保存所有立库明细到主单
+                    saveOutDetailList(mainOut, liKuList, "1");
+                }
 
-                for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) {
-                    OutStockoutDetail d = new OutStockoutDetail();
 
-                    d.setStockoutDetailId(out.getStockoutId()+"-"+item.getLineNo());
-                    d.setStockoutGuid(out.getStockoutGuid());
-                    d.setStockoutId(out.getStockoutId());
-                    d.setProductId(item.getInventoryCode());
-                    d.setProductId(item.getInventoryCode());
-                    d.setLotNo(item.getLotNo());
-                    d.setSpec(item.getSpecModel());
-                    d.setUnit(item.getUnit());
-                    d.setSpare1(item.getLevelRelation());
-                    d.setSpare2(item.getUpperMaterial());
-                    d.setSpare3(item.getTopMaterial());
-                    d.setSpare6(item.getLineNo());
-                    d.setRemark(item.getRemark());
-
-                    try {
-                        d.setQuantity(new BigDecimal(item.getQuantity()));
-                        d.setAllotQuantity(BigDecimal.ZERO);
-                        d.setAssignNum(BigDecimal.ZERO);
-                    } catch (Exception e) {
-                        d.setQuantity(BigDecimal.ZERO);
+                // ========== 处理平库：新建一张独立主单 + 所有平库明细 ==========
+                if (CollUtil.isNotEmpty(pingKuList)) {
+                    OutStockout pingKuOut = new OutStockout();
+                    pingKuOut.setStockoutGuid(UUID.randomUUID().toString());
+                    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");
                     }
-                    outStockoutDetailService.insertOutStockoutDetail(d);
+
 
                 }
                 return AjaxResult.success();
             }
         }
         return AjaxResult.error("不支持的单据类型或操作类型");
-
     }
 
 
+    /**
+     * 填充出库单主表公共字段
+     */
+    private void fillOutStockout(OutStockout out, DeliveryNoticeVo vo, String ckdId) {
+        out.setStockoutId(ckdId);
+        out.setOutType(vo.getBillType());
+        out.setCreateDate(vo.getBillDate());
+        out.setErpStockoutId(vo.getBillNo());
+        out.setCreateManId(vo.getCreateMan());
+        out.setStatus("2");
+        out.setWarehouseId(vo.getWarehouseId());
+        out.setStockoutSource("1");
+        out.setSpare6(vo.getOutType());  // 搬运方式  1人工 2agv
+        out.setCarNumber(vo.getIsProjectOut());
+        out.setDepartmentNo(vo.getProjectNo());
+        out.setCustomerNo(vo.getCustomerId());
+        out.setClassNowId(vo.getCustomerName());
+        out.setSpare1(vo.getContractNo());
+        out.setSpare2(vo.getSalesOrderNo());
+        out.setSpare3(vo.getApproveDate());
+        out.setSpare4(vo.getApproveMan());
+        out.setSpare5(vo.getRemark());
+        out.setSpare7(vo.getDestination());  // 配送终点
+        out.setSpare8("2");  // 配送去向  1 缓存 2 线边 默认线边
+        out.setCompanyShortName(vo.getCompanyShortName());
+        out.setAccountSetNo(vo.getAccountSetNo());
+        out.setFID(vo.getIsProjectOut()); // 是否按项目出 1是 0否
+    }
+
+    /**
+     * 批量保存出库明细列表
+     */
+    private void saveOutDetailList(OutStockout out, List<DeliveryNoticeItemVo> detailList, String warehouseId) {
+        if (CollUtil.isEmpty(detailList)) {
+            return;
+        }
+        int i = 0;
+        for (DeliveryNoticeItemVo item : detailList) {
+            i++;
+            OutStockoutDetail d = new OutStockoutDetail();
+            d.setStockoutDetailId(out.getStockoutId() + "-" + i);
+            d.setStockoutGuid(out.getStockoutGuid());
+            d.setStockoutId(out.getStockoutId());
+            d.setProductId(item.getInventoryCode());
+            d.setProductName(item.getInventoryName());
+            d.setLotNo(item.getLotNo());
+            d.setSpec(item.getSpecModel());
+            d.setUnit(item.getUnit());
+            d.setSpare1(item.getLevelRelation());
+            d.setSpare2(item.getUpperMaterial());
+            d.setSpare3(item.getTopMaterial());
+            d.setSpare4(item.getProjectNo());
+            d.setSpare6(item.getLineNo());
+            d.setRemark(item.getRemark());
+            d.setSourceLineId(item.getSourceLineId());
+            d.setBarCode(item.getBarCode());
+            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);
+                d.setAssignNum(BigDecimal.ZERO);
+            } catch (Exception e) {
+                d.setQuantity(BigDecimal.ZERO);
+            }
+            outStockoutDetailService.insertOutStockoutDetail(d);
+        }
+        out.setWarehouseId(warehouseId);
+        outStockoutService.updateOutStockout(out);
+    }
+
     @Override
     public void callbackInDeliveryNotice() {
 
         InStockinBack inStockin = inStockinBackService.selectTopInStockin();
+        if (inStockin == null) {
+            return;
+        }
         DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo();
         deliveryNoticeVo.setBillNo(inStockin.getStockinId());
         deliveryNoticeVo.setNoteBillNo(inStockin.getStockinId());
         deliveryNoticeVo.setBillType(inStockin.getInType());
+        deliveryNoticeVo.setOpType("1");
         deliveryNoticeVo.setBillDate(inStockin.getCreateDate());
-        deliveryNoticeVo.setCreateMan(inStockin.getCreateManId());
+//        deliveryNoticeVo.setCreateMan(inStockin.getCreateManId());
         deliveryNoticeVo.setWarehouseId(inStockin.getWarehouseId());
         deliveryNoticeVo.setProjectNo(inStockin.getDepartmentNo());
         deliveryNoticeVo.setCustomerId(inStockin.getSupplierNo());
         deliveryNoticeVo.setCustomerName(inStockin.getClassNo()); // 对应receiveDeliveryNotice中的映射
         deliveryNoticeVo.setContractNo(inStockin.getSpare1());
-        deliveryNoticeVo.setSalesOrderNo(inStockin.getSpare2());
-        deliveryNoticeVo.setApproveDate(inStockin.getSpare3());
-        deliveryNoticeVo.setApproveMan(inStockin.getSpare4());
-        deliveryNoticeVo.setRemark(inStockin.getSpare5());
+//        deliveryNoticeVo.setSalesOrderNo(inStockin.getSpare2());
+//        deliveryNoticeVo.setApproveDate(inStockin.getSpare3());
+//        deliveryNoticeVo.setApproveMan(inStockin.getSpare4());
+//        deliveryNoticeVo.setRemark(inStockin.getSpare5());
 
         InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
         inStockinDetailParam.setStockinId(inStockin.getStockinId());
         List<InStockinDetailBack> inStockinDetails = inStockinDetailBackService.selectInStockinDetailBackList(inStockinDetailParam);
-        
+
         List<DeliveryNoticeItemVo> detailList = new ArrayList<>();
         if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
             for (InStockinDetailBack detail : inStockinDetails) {
                 DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
+
                 item.setLineNo(detail.getStockinDetailId());
                 item.setNotelineNo(detail.getStockinDetailId());
                 item.setBillNo(detail.getStockinId());
@@ -336,29 +708,240 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setSpecModel(detail.getSpec());
                 item.setUnit(detail.getUnit());
                 item.setQuantity(detail.getAssignNum());
-                item.setLotNo(detail.getLotNo());
+//                item.setLotNo(detail.getLotNo());
                 item.setLevelRelation(detail.getSpare1());
                 item.setUpperMaterial(detail.getSpare2());
                 item.setTopMaterial(detail.getSpare3());
                 item.setRemark(detail.getRemark());
-                item.setArea(detail.getSpare9());
-                item.setLocation(detail.getSpare8());
+                String[] splitArea = detail.getSpare9().split(",");
+                String[] splitLocation = detail.getSpare8().split(",");
+                String[] splitQuantity = detail.getQuantityX().split(",");
+                ArrayList<LocationDetail> locationDetails = new ArrayList<>();
+                for (int i = 0; i < splitArea.length; i++) {
+                    LocationDetail locationDetail = new LocationDetail();
+                    locationDetail.setLocationNo(splitLocation[i]);
+                    locationDetail.setQuantity(splitQuantity[i]);
+                    locationDetail.setAreaNo(splitArea[i]);
+                    locationDetail.setLotNo(detail.getLotNo());
+                    locationDetails.add(locationDetail);
+                }
+                item.setLocations(locationDetails);
+
                 detailList.add(item);
             }
         }
         deliveryNoticeVo.setDetailList(detailList);
 
-        //todo 发送给erp  成功失败改状态
+        String sendMsg = JSONUtil.toJsonStr(deliveryNoticeVo);
+        try {
+            //todo 发送给erp  成功失败改状态
+            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(deliveryNoticeVo), "入库回传", "wms", "erp");
+            if ("1".equals(requestLog.getIsSuccessful())) {
+                inStockin.setSendStatus("1");
+                inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockin.setMsg("成功");
+                inStockinDetailParam.setSendStatus("1");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg("成功");
+
+            } else {
+                inStockin.setSendStatus("2");
+                inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockin.setMsg(requestLog.getErrorDetails());
+                inStockinDetailParam.setSendStatus("2");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg(requestLog.getErrorDetails());
+            }
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+
+        } catch (Exception e) {
+            inStockin.setSendStatus("2");
+            inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockin.setMsg(e.getMessage());
+            inStockinDetailParam.setSendStatus("2");
+            inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockinDetailParam.setMsg(e.getMessage());
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+        }
 
-//        return AjaxResult.success(deliveryNoticeVo);
     }
 
 
     @Override
     public void callbackoutDeliveryNotice() {
+        OutStockoutBack outStockoutBack = outStockoutBackService.selelctTopOutStockout();
+        if (outStockoutBack == null) {
+            return;
+        }
+        DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo();
+        deliveryNoticeVo.setBillNo(outStockoutBack.getStockoutId());
+        deliveryNoticeVo.setNoteBillNo(outStockoutBack.getStockoutId());
+        deliveryNoticeVo.setBillType(outStockoutBack.getOutType());
+        deliveryNoticeVo.setOpType("1");
+        deliveryNoticeVo.setBillDate(outStockoutBack.getCreateDate());
+        deliveryNoticeVo.setWarehouseId(outStockoutBack.getWarehouseId());
+        deliveryNoticeVo.setProjectNo(outStockoutBack.getDepartmentNo());
+        deliveryNoticeVo.setCustomerId(outStockoutBack.getCustomerNo());
+        deliveryNoticeVo.setCustomerName(outStockoutBack.getClassNowId());
+        deliveryNoticeVo.setContractNo(outStockoutBack.getSpare1());
+
+        OutStockoutDetailBack outStockoutDetailBack = new OutStockoutDetailBack();
+        outStockoutDetailBack.setStockoutId(outStockoutBack.getStockoutId());
+//        outStockoutDetailBack.setSendStatus("0");
+        List<OutStockoutDetailBack> outStockoutDetailBacks = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
+        List<DeliveryNoticeItemVo> detailList = new ArrayList<>();
+        if (outStockoutDetailBacks != null && !outStockoutDetailBacks.isEmpty()) {
+            for (OutStockoutDetailBack detail : outStockoutDetailBacks) {
+                DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
+                item.setLineNo(detail.getStockoutDetailId());
+                item.setNotelineNo(detail.getStockoutDetailId());
+                item.setInventoryCode(detail.getProductId());
+                item.setInventoryName(detail.getProductName());
+                item.setSpecModel(detail.getSpec());
+                item.setUnit(detail.getUnit());
+                item.setQuantity(detail.getQuantity().toString());
+                item.setLevelRelation(detail.getSpare1());
+                item.setUpperMaterial(detail.getSpare2());
+                item.setTopMaterial(detail.getSpare3());
+//                item.setLotNo(detail.getLotNo());
+                item.setRemark(detail.getRemark());
+//                item.setArea(detail.getSpare9());
+//                item.setLocation(detail.getSpare8());
+                String[] splitArea = detail.getSpare9().split(",");
+                String[] splitLocation = detail.getSpare8().split(",");
+                String[] splitQuantity = detail.getQuantityX().split(",");
+                String[] lotNo = new String[]{};
+                if (StrUtil.isNotEmpty(detail.getLotNo())) {
+                    lotNo = detail.getLotNo().split(",");
+                }
+                ArrayList<LocationDetail> locationDetails = new ArrayList<>();
+                for (int i = 0; i < splitArea.length; i++) {
+                    LocationDetail locationDetail = new LocationDetail();
+                    locationDetail.setLocationNo(splitLocation[i]);
+                    locationDetail.setQuantity(splitQuantity[i]);
+                    locationDetail.setAreaNo(splitArea[i]);
+                    locationDetail.setLotNo(lotNo[i]);
+                    locationDetails.add(locationDetail);
+                }
+                item.setLocations(locationDetails);
+                detailList.add(item);
+            }
+            deliveryNoticeVo.setDetailList(detailList);
+        }
+
+        try {
+            //todo 发送给erp  成功失败改状态
+            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(deliveryNoticeVo), "出库回传", "wms", "erp");
+            if ("1".equals(requestLog.getIsSuccessful())) {
+                outStockoutBack.setSendStatus("1");
+                outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutBack.setMsg("成功");
+                outStockoutDetailBack.setSendStatus("1");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg("成功");
+
+            } else {
+                outStockoutBack.setSendStatus("2");
+                outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutBack.setMsg(requestLog.getErrorDetails());
+                outStockoutDetailBack.setSendStatus("2");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg(requestLog.getErrorDetails());
+            }
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+
+        } catch (Exception e) {
+            outStockoutBack.setSendStatus("2");
+            outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutBack.setMsg(e.getMessage());
+            outStockoutDetailBack.setSendStatus("2");
+            outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutDetailBack.setMsg(e.getMessage());
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+        }
+    }
+
+    @Override
+    public void moveCargoSpace() {
+        MoveMsg moveMsg1 = new MoveMsg();
+        moveMsg1.setStatus("0");
+        List<MoveMsg> moveMsgs = moveMsgService.selectMoveMsgList(moveMsg1);
+        MoveMsg moveMsg = new MoveMsg();
+        if (moveMsgs.size() > 0) {
+            moveMsg = moveMsgs.get(0);
+        } else {
+            return;
+        }
+
+        try {
+            BasStock basStock = new BasStock();
+            basStock.setTrayCode(moveMsg.getTrayCode());
+            List<BasStock> basStocks = basStockService.selectBasStockList(basStock);
+            //将basStocks按照stockinId分组
+            Map<String, List<BasStock>> basStocksMap = basStocks.stream().collect(Collectors.groupingBy(BasStock::getStockinId));
+            for (Map.Entry<String, List<BasStock>> entry : basStocksMap.entrySet()) {
+                // 获取 stockinId（键）
+                String stockinId = entry.getKey();
+
+                // 获取对应的 basStock 列表（值）
+                List<BasStock> basStockList = entry.getValue();
+                DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo();
+                deliveryNoticeVo.setBillNo(basStockList.get(0).getStockinId());
+                //deliveryNoticeVo.setNoteBillNo(basStockList.get(0).getStockinId());
+                deliveryNoticeVo.setBillDate(DateUtil.formatDateTime(new Date()));
+                deliveryNoticeVo.setWarehouseId(basStockList.get(0).getWarehouseId());
+                deliveryNoticeVo.setProjectNo(basStockList.get(0).getSpare4());
+                deliveryNoticeVo.setBillType("9");
+                ArrayList<DeliveryNoticeItemVo> deliveryNoticeItemVos = new ArrayList<>();
+                for (BasStock basStock1 : basStockList) {
+                    DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
+                    item.setLineNo(basStock1.getStockinDetailId());
+                    //item.setNotelineNo(basStock1.getStockinDetailId());
+                    item.setInventoryCode(basStock1.getProductId());
+                    item.setInventoryName(basStock1.getProductName());
+                    item.setSpecModel(basStock1.getPower());
+                    item.setUnit(basStock1.getPhase());
+                    item.setQuantity(basStock1.getQuantity());
+                    item.setLevelRelation(basStock1.getSpare1());
+                    item.setUpperMaterial(basStock1.getSpare2());
+                    item.setTopMaterial(basStock1.getSpare3());
+                    item.setLotNo(basStock1.getLotNo());
+                    item.setAreaBefore(moveMsg.getOldSpace());
+                    //item.setLocationBefore(moveMsg.getTrayCode());
+                    item.setArea(moveMsg.getNewSpace());
+                    item.setLocation(moveMsg.getTrayCode());
+                    deliveryNoticeItemVos.add(item);
+                }
+                deliveryNoticeVo.setDetailList(deliveryNoticeItemVos);
+
+
+                //code success msg
+                RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=2", JSONUtil.toJsonStr(deliveryNoticeVo), "移库回传", "wms", "erp");
+                moveMsg.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                if ("1".equals(requestLog.getIsSuccessful())) {
+                    moveMsg.setStatus("1");
+                    moveMsg.setMsg("成功");
+                } else {
+                    moveMsg.setStatus("2");
+                    moveMsg.setMsg(requestLog.getErrorDetails());
+                }
+
+                moveMsgService.updateMoveMsg(moveMsg);
+            }
+        } catch (Exception e) {
+            moveMsg.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            moveMsg.setStatus("2");
+            moveMsg.setMsg(e.getMessage());
+            moveMsgService.updateMoveMsg(moveMsg);
+        }
 
     }
 
+
     @Override
     public AjaxResult createWorkshopInboundOrder(BasProduct basProduct) {
         ErpInterfaceParam<WipTransferDoc> param = new ErpInterfaceParam<>();
@@ -382,19 +965,249 @@ public class ToErpServiceImpl implements IToErpService {
         objectErpParameter.setDatas(List.of(wipTransferDoc));
         erpStdData.setParameter(objectErpParameter);
         param.setStd_data(erpStdData);
-        RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单","wms","erp");
+        RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单", "wms", "erp");
 //        String post = requestLog.getResponseBody();
 //        ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
 //        if ("0".equals(bean.getStd_data().getExecution().getCode())) {
 //            return AjaxResult.success();
 //        }
-        if(requestLog != null && "1".equals(requestLog.getIsSuccessful())){
+        if (requestLog != null && "1".equals(requestLog.getIsSuccessful())) {
             return AjaxResult.success();
-        }else{
+        } else {
             return AjaxResult.error();
         }
     }
 
+    @Override
+    public void callbackInDeliveryNoticeNew() {
+
+        InStockinBack inStockin = inStockinBackService.selectTopInStockin();
+        if (inStockin == null) {
+            return;
+        }
+        CallBackErp callBackErp = new CallBackErp();
+        callBackErp.setCcompany(inStockin.getCompanyShortName());  // 公司简称
+        callBackErp.setCcode(inStockin.getStockinId());    // wms 单据号 需要改成作业号
+        callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));       // 操作日期
+        callBackErp.setCintype(inStockin.getInType());     // 业务类型
+        callBackErp.setCvencode(inStockin.getSupplierNo()); // 供应商编码
+        callBackErp.setCvenname(inStockin.getClassNo());   // 供应商名称
+        callBackErp.setCoptname(inStockin.getCreateManId());  // 操作人
+        callBackErp.setCmemo(inStockin.getRemark());    // 备注
+        callBackErp.setCacc_id(inStockin.getAccountSetNo());    // 账套号
+        callBackErp.setCwhcode("01");   // 仓库编码
+        callBackErp.setCwhname("立体库");   //  仓库名称
+
+
+        // TODO 以下需要重新编写根据给的字段
+        InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
+        inStockinDetailParam.setStockinId(inStockin.getStockinId());
+        inStockinDetailParam.setSendStatus("0");
+        List<InStockinDetailBack> inStockinDetails = inStockinDetailBackService.selectInStockinDetailBackList(inStockinDetailParam);
+
+        List<CallBackErpItems> detailList = new ArrayList<>();
+        if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
+            for (InStockinDetailBack detail : inStockinDetails) {
+                CallBackErpItems item = new CallBackErpItems();
+                // 存货编码11
+                item.setCinvcode(detail.getProductId());
+                // 存货名称
+                item.setCinvname(detail.getProductName());
+                // 规格型号
+                item.setCinvstd(detail.getSpec());
+                // 单位
+                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.setCbatch(detail.getLotNo());
+                // 数量
+                item.setIquantity(Integer.valueOf(detail.getAssignNum()));
+                // 老项目号
+                item.setCxmh(detail.getOldProjectNo());
+                // 新项目号
+                item.setCnewxmh(detail.getSpare4());
+                // erpbillno
+                item.setSrccode(inStockin.getErpBill());
+                // erp来源单子表id
+                item.setSrcids(Integer.valueOf(detail.getSourceLineId()));
+                // erp子表行号
+                item.setSrcrowno(detail.getSpare6());
+                // 是否批次管理
+                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);
+            }
+        }
+        callBackErp.setDetails(detailList);
+
+        String sendMsg = JSONUtil.toJsonStr(callBackErp);
+        System.err.println(sendMsg);
+        try {
+            //todo 发送给erp  成功失败改状态
+            // http://192.168.188.235/app1/api?type=1&key=1
+            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()));
+                inStockin.setMsg("成功");
+                inStockinDetailParam.setSendStatus("1");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg("成功");
+                inStockinDetailBackService.insertInStockInDetailBackFinish(inStockinDetails);
+                inStockinDetailBackService.deleteInStockInDetailList(inStockinDetails);
+            } else {
+                inStockin.setSendStatus("2");
+                inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockin.setMsg(requestLog.getErrorDetails());
+                inStockinDetailParam.setSendStatus("2");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg(requestLog.getErrorDetails());
+            }
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+
+        } catch (Exception e) {
+            inStockin.setSendStatus("2");
+            inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockin.setMsg(e.getMessage());
+            inStockinDetailParam.setSendStatus("2");
+            inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockinDetailParam.setMsg(e.getMessage());
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+        }
+
+    }
+
+    @Override
+    public void callbackDeliveryOutNoticeNew() {
+        OutStockoutBack outStockoutBack = outStockoutBackService.selelctTopOutStockout();
+        if (outStockoutBack == null) {
+            return;
+        }
+        CallBackErp callBackErp = new CallBackErp();
+        callBackErp.setCcompany(outStockoutBack.getCompanyShortName());  // 公司简称
+        callBackErp.setCcode(outStockoutBack.getStockoutId());    // wms 单据号
+        callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));       // 操作日期
+        callBackErp.setCintype(outStockoutBack.getOutType());     // 业务类型
+        callBackErp.setCvencode(outStockoutBack.getCustomerNo()); // 供应商编码
+        callBackErp.setCvenname(outStockoutBack.getCustomerNo());   // 供应商名称
+        callBackErp.setCoptname(outStockoutBack.getCreateManId());  // 操作人
+        callBackErp.setCmemo(outStockoutBack.getRemark());    // 备注
+        callBackErp.setCacc_id(outStockoutBack.getAccountSetNo());    // 账套号
+        callBackErp.setCwhcode("01");   // 仓库编码
+        callBackErp.setCwhname("立体库");   //  仓库名称
+
+
+        OutStockoutDetailBack outStockoutDetailBack = new OutStockoutDetailBack();
+        outStockoutDetailBack.setStockoutId(outStockoutBack.getStockoutId());
+        outStockoutDetailBack.setSendStatus("0");
+//        outStockoutDetailBack.setSendStatus("0");
+        List<OutStockoutDetailBack> outStockoutDetailBacks = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
+        List<CallBackErpItems> detailList = new ArrayList<>();
+        if (outStockoutDetailBacks != null && !outStockoutDetailBacks.isEmpty()) {
+            for (OutStockoutDetailBack detail : outStockoutDetailBacks) {
+                CallBackErpItems item = new CallBackErpItems();
+                // 存货编码
+                item.setCinvcode(detail.getProductId());
+                // 存货名称
+                item.setCinvname(detail.getProductName());
+                // 规格型号
+                item.setCinvstd(detail.getSpec());
+                // 单位
+                item.setCinvm_unit(detail.getUnit());
+                // 货位编码
+                item.setCposcode(detail.getSpare9());
+                // 货位名称
+                item.setCposname("");
+                // 托盘号
+                item.setCtrayname(detail.getSpare8());
+                // 批号
+                item.setCbatch(detail.getLotNo());
+
+                item.setJobid(detail.getStockoutGuid());
+//                item.setLotNo(detail.getLotNo());
+                // 数量
+                item.setIquantity(Integer.parseInt(String.valueOf(detail.getAssignNum())));
+                // 老项目号
+                item.setCxmh(detail.getOldProjectNo());
+                // 新项目号
+                item.setCnewxmh(detail.getSpare4());
+                // erpbillno
+                item.setSrccode(outStockoutBack.getErpStockoutId());
+                // erp来源单子表id
+                item.setSrcids(Integer.valueOf(detail.getSourceLineId()));
+                // erp子表行号
+                item.setSrcrowno(detail.getSpare6());
+                // 是否批次管理
+                item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
+                // 仓库选择 1立库 2 平库
+                item.setStg_location(detail.getProductGuid());
+                // TODO 暂时未启用 等甲方后续通知
+                item.setGroupNum(detail.getEntryid());
+
+                detailList.add(item);
+            }
+            callBackErp.setDetails(detailList);
+
+        }
+
+        try {
+            //todo 发送给erp  成功失败改状态
+            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()));
+                outStockoutBack.setMsg("成功");
+                outStockoutDetailBack.setSendStatus("1");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg("成功");
+                outStockoutDetailBackService.insertOutStockDetailBackFinish(outStockoutDetailBacks);
+                outStockoutDetailBackService.deleteOutStockDetailList(outStockoutDetailBacks);
+
+            } else {
+                outStockoutBack.setSendStatus("2");
+                outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutBack.setMsg(requestLog.getErrorDetails());
+                outStockoutDetailBack.setSendStatus("2");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg(requestLog.getErrorDetails());
+            }
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+
+        } catch (Exception e) {
+            outStockoutBack.setSendStatus("2");
+            outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutBack.setMsg(e.getMessage());
+            outStockoutDetailBack.setSendStatus("2");
+            outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutDetailBack.setMsg(e.getMessage());
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+        }
+
+    }
+
+    @Override
+    public void callbackDeliveryOutNoticeNews() {
+
+    }
+
 
     public AjaxResult createOtherInOutboundOrder(TransferBillCallback transferBillCallback) {
         ErpInterfaceParam<ErpInOutBoundOrder> param = new ErpInterfaceParam<>();
@@ -404,10 +1217,10 @@ public class ToErpServiceImpl implements IToErpService {
         ErpInOutBoundOrder erpInOutBoundOrder = new ErpInOutBoundOrder();
         String docNo = "";
         String docIdDocCode = "";
-        if ("1".equals(transferBillCallback.getType())){
+        if ("1".equals(transferBillCallback.getType())) {
             docNo = basJobIdService.getJobId("11T1");
             docIdDocCode = "11T1";
-        }else {
+        } else {
             docNo = basJobIdService.getJobId("11T2");
             docIdDocCode = "11T2";
         }
@@ -428,7 +1241,7 @@ public class ToErpServiceImpl implements IToErpService {
         for (int i = 0; i < mydoJobDetails.size(); i++) {
             MydoJobDetail mydoJobDetail = mydoJobDetails.get(i);
             ErpTransactionDocD erpTransactionDocD = new ErpTransactionDocD();
-            erpTransactionDocD.setSequenceNumber(i+1);
+            erpTransactionDocD.setSequenceNumber(i + 1);
             erpTransactionDocD.setITEM_ID_ITEM_CODE(mydoJobDetail.getProductId());
             erpTransactionDocD.setITEM_DESCRIPTION(mydoJobDetail.getProductName());
             erpTransactionDocD.setITEM_SPECIFICATION(mydoJobDetail.getSpec());
@@ -444,11 +1257,11 @@ public class ToErpServiceImpl implements IToErpService {
         objectErpParameter.setDatas(list);
         erpStdData.setParameter(objectErpParameter);
         param.setStd_data(erpStdData);
-        RequestLog requestLog = requestLogService.getRequestLog( OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建其他入出库单","wms","erp");
+        RequestLog requestLog = requestLogService.getRequestLog(OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建其他入出库单", "wms", "erp");
 
-        if(requestLog != null && "1".equals(requestLog.getIsSuccessful())){
+        if (requestLog != null && "1".equals(requestLog.getIsSuccessful())) {
             return AjaxResult.success();
-        }else{
+        } else {
             return AjaxResult.error();
         }
 //        String post = requestLog.getResponseBody();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
index 967dda8..0c5e949 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
@@ -33,7 +33,7 @@ public class ToWcsServiceImpl implements IToWcsService {
     @Autowired
     private IAgvContainerTaskService agvContainerTaskService;
 
-    public static final String PUSH_OUT_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveOutMydoJob";
+    public static final String PUSH_OUT_MYDO_JOB = "http://192.168.188.236:8081/wcs2Wms/api/receiveOutMydoJob";
     public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveInMydoJob";
     public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/agv/api/receiveAgvMoveJob";
     public static final String OUT_MYDOJOB_MS = "http://localhost:8081/wcs2Wms/api/outMydojobMakesure";
@@ -43,15 +43,12 @@ public class ToWcsServiceImpl implements IToWcsService {
 
 
     @Override
-//    @Scheduled(fixedDelay=1500)
+    @Scheduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setStatus("1");
-        List<String> list = new ArrayList<>();
-        list.add("21");
-        list.add("26");
-        mydoJobParam.setInOutIds(list);
+        mydoJobParam.setInOut("2");
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {
             RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务","wms","wcs");
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 faa09e5..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
@@ -93,27 +93,29 @@ public class ToWmsServiceImpl implements IToWmsService {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
 
         String trayCode = requestEnter.getTrayCode();
         MydoJob inJob = mydoJobMapper.selectInJobByTrayCode(trayCode);
         if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
-            if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
-                return AjaxResult.success(JSONUtil.toJsonStr(inJob));
-            }else{
-                //分配货位
-                HashMap<String, Object> map = new HashMap<>();
+//            if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
+//                return AjaxResult.success(inJob);
+//            }else{
+//                //分配货位
+//                HashMap<String, Object> map = new HashMap<>();
+//
+//                map.put("v_tray_code", trayCode);
+//                mydoJobMapper.allotInJobSpace(map);
+//                if (!"10".equals(map.get("v_result").toString())) {
+//                    return AjaxResult.error(map.get("v_resultmsg").toString());
+//                }else{
+//
+//                }
+//            }
+
+//            MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
+            return AjaxResult.success(inJob);
 
-                map.put("v_tray_code", trayCode);
-                mydoJobMapper.allotInJobSpace(map);
-                if (!"10".equals(map.get("v_result").toString())) {
-                    return AjaxResult.error(map.get("v_resultmsg").toString());
-                }else{
-                    MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
-                    return AjaxResult.success(JSONUtil.toJsonStr(inJob2));
-                }
-            }
         }else{
             return AjaxResult.error("该条码无入库任务，请扫码绑定！");
         }
@@ -197,9 +199,20 @@ public class ToWmsServiceImpl implements IToWmsService {
                     return AjaxResult.error("任务不存在");
                 }
                 MydoJob outJob = outMydoJobs.get(0);
+                //出库作业
                 outJob.setExecutionPhase("2");
                 mydoJobService.updateMydoJob(outJob);
                 break;
+            case "7":
+                //移库作业
+                mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
+                List<MydoJob> ykMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
+                if (ykMydoJobs.isEmpty()) {
+                    return AjaxResult.error("任务不存在");
+                }
+                MydoJob ykJob = ykMydoJobs.get(0);
+                mydoJobService.ykCompleted(ykJob);
+                break;
 
             default:
                 log.error("作业类型错误");
@@ -385,5 +398,32 @@ public class ToWmsServiceImpl implements IToWmsService {
         return AjaxResult.error(erpProduct.getSys_MainId()+"物料不存在");
     }
 
+    @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())){
+                return AjaxResult.success(inJob);
+            }else{
+                //分配货位
+                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());
+                }else{
+                    MydoJob inJob2 = mydoJobMapper.selectInJobByTaskNo(taskNo);
+                    return AjaxResult.success(inJob2);
+                }
+            }
+        }else{
+            return AjaxResult.error("该条码无入库任务，请扫码绑定！");
+        }
+    }
+
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java
index 33bb28d..467a480 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java
@@ -5,6 +5,10 @@ import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
+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.out.outStockoutFinish.domain.OutStockoutFinish;
 import com.ruoyi.out.outStockoutFinish.service.IOutStockoutFinishService;
 import com.ruoyi.stock.stock.domain.BasStock;
@@ -33,6 +37,10 @@ public class TwinServiceImpl implements ITwinService {
     private IInStockinFinishService inStockinFinishService;
     @Autowired
     private IOutStockoutFinishService outStockoutFinishService;
+    @Autowired
+    private IMydoJobService mydoJobService;
+    @Autowired
+    private IMydoJobDetailService mydoJobDetailService;
 
     @Override
     public Map<String, Object> getStockListOverview() {
@@ -250,4 +258,62 @@ public class TwinServiceImpl implements ITwinService {
         result.put("monthOutStock", monthOutStock);
         return result;
     }
+
+    @Override
+    public Map<String, Object> getCargo(String cargoSpaceName) {
+        BasStock basStock = new BasStock();
+        basStock.setCargoSpaceId(cargoSpaceName);
+        List<BasStock> list = basStockService.selectBasStockList(basStock);
+        List<Map<String, String>> dataList = new ArrayList<>();
+        for (BasStock stock : list) {
+            Map<String, String> dataMap = new HashMap<>();
+            dataMap.put("productId", stock.getProductId());
+            dataMap.put("productName", stock.getProductName());
+            dataMap.put("quantity", stock.getQuantity());
+            dataMap.put("trayCode", stock.getTrayCode());
+            dataList.add(dataMap);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("data", dataList);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getTaskCargo(String taskNo) {
+        MydoJob mydoJob = new MydoJob();
+        mydoJob.setTaskNo(taskNo);
+        List<MydoJob> jobList = mydoJobService.selectMydoJobList(mydoJob);
+        List<Map<String, String>> dataList = new ArrayList<>();
+        if (jobList != null && !jobList.isEmpty()) {
+            MydoJob job = jobList.get(0);
+            String jobId = job.getJobId();
+            String inOrOutStr = job.getInOrOut();
+            int inOrOut = 0;
+            try {
+                inOrOut = Integer.parseInt(inOrOutStr);
+            } catch (Exception e) {
+                // Ignore parse error
+            }
+
+            List<MydoJobDetail> details = mydoJobDetailService.selectMydoJobDetailListByJobId(jobId);
+            for (MydoJobDetail detail : details) {
+                Map<String, String> dataMap = new HashMap<>();
+                dataMap.put("productId", detail.getProductId());
+                dataMap.put("productName", detail.getProductName());
+                
+                String quantity = "0";
+                if (inOrOut < 20) {
+                    quantity = detail.getInQuantity();
+                } else {
+                    quantity = detail.getOutQuantity();
+                }
+                dataMap.put("quantity", quantity);
+                dataMap.put("trayCode", detail.getTrayCode());
+                dataList.add(dataMap);
+            }
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("data", dataList);
+        return result;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/controller/AgvPointController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/controller/AgvPointController.java
new file mode 100644
index 0000000..e447ad0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/controller/AgvPointController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.bas.agvPoint.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.bas.agvPoint.domain.AgvPoint;
+import com.ruoyi.bas.agvPoint.service.IAgvPointService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * agv站点Controller
+ * 
+ * @author ruoyi
+ * @date 2026-03-17
+ */
+@RestController
+@RequestMapping("/bas/agvPoint")
+public class AgvPointController extends BaseController
+{
+    @Autowired
+    private IAgvPointService agvPointService;
+
+    /**
+     * 查询agv站点列表
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AgvPoint agvPoint)
+    {
+        startPage();
+        List<AgvPoint> list = agvPointService.selectAgvPointList(agvPoint);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出agv站点列表
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:export')")
+    @Log(title = "agv站点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AgvPoint agvPoint)
+    {
+        List<AgvPoint> list = agvPointService.selectAgvPointList(agvPoint);
+        ExcelUtil<AgvPoint> util = new ExcelUtil<AgvPoint>(AgvPoint.class);
+        util.exportExcel(response, list, "agv站点数据");
+    }
+
+    /**
+     * 获取agv站点详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(agvPointService.selectAgvPointById(id));
+    }
+
+    /**
+     * 新增agv站点
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:add')")
+    @Log(title = "agv站点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AgvPoint agvPoint)
+    {
+        return toAjax(agvPointService.insertAgvPoint(agvPoint));
+    }
+
+    /**
+     * 修改agv站点
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:edit')")
+    @Log(title = "agv站点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AgvPoint agvPoint)
+    {
+        return toAjax(agvPointService.updateAgvPoint(agvPoint));
+    }
+
+    /**
+     * 删除agv站点
+     */
+    @PreAuthorize("@ss.hasPermi('bas:agvPoint:remove')")
+    @Log(title = "agv站点", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(agvPointService.deleteAgvPointByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvPoint.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvPoint.java
new file mode 100644
index 0000000..c930af2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/domain/AgvPoint.java
@@ -0,0 +1,113 @@
+package com.ruoyi.bas.agvPoint.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;
+
+/**
+ * agv站点对象 agv_point
+ * 
+ * @author ruoyi
+ * @date 2026-03-17
+ */
+public class AgvPoint extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private String id;
+
+    /** 站点编号 */
+    @Excel(name = "站点编号")
+    private String station;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String type;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare1;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare2;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare3;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+
+    public void setStation(String station) 
+    {
+        this.station = station;
+    }
+
+    public String getStation() 
+    {
+        return station;
+    }
+
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("station", getStation())
+            .append("type", getType())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .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/bas/agvPoint/mapper/AgvPointMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/mapper/AgvPointMapper.java
new file mode 100644
index 0000000..f673303
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/mapper/AgvPointMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.bas.agvPoint.mapper;
+
+import java.util.List;
+import com.ruoyi.bas.agvPoint.domain.AgvPoint;
+
+/**
+ * agv站点Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-03-17
+ */
+public interface AgvPointMapper 
+{
+    /**
+     * 查询agv站点
+     * 
+     * @param id agv站点主键
+     * @return agv站点
+     */
+    public AgvPoint selectAgvPointById(String id);
+
+    /**
+     * 查询agv站点列表
+     * 
+     * @param agvPoint agv站点
+     * @return agv站点集合
+     */
+    public List<AgvPoint> selectAgvPointList(AgvPoint agvPoint);
+
+    /**
+     * 新增agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    public int insertAgvPoint(AgvPoint agvPoint);
+
+    /**
+     * 修改agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    public int updateAgvPoint(AgvPoint agvPoint);
+
+    /**
+     * 删除agv站点
+     * 
+     * @param id agv站点主键
+     * @return 结果
+     */
+    public int deleteAgvPointById(String id);
+
+    /**
+     * 批量删除agv站点
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAgvPointByIds(String[] ids);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/IAgvPointService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/IAgvPointService.java
new file mode 100644
index 0000000..f03a444
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/IAgvPointService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.bas.agvPoint.service;
+
+import java.util.List;
+import com.ruoyi.bas.agvPoint.domain.AgvPoint;
+
+/**
+ * agv站点Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-03-17
+ */
+public interface IAgvPointService 
+{
+    /**
+     * 查询agv站点
+     * 
+     * @param id agv站点主键
+     * @return agv站点
+     */
+    public AgvPoint selectAgvPointById(String id);
+
+    /**
+     * 查询agv站点列表
+     * 
+     * @param agvPoint agv站点
+     * @return agv站点集合
+     */
+    public List<AgvPoint> selectAgvPointList(AgvPoint agvPoint);
+
+    /**
+     * 新增agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    public int insertAgvPoint(AgvPoint agvPoint);
+
+    /**
+     * 修改agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    public int updateAgvPoint(AgvPoint agvPoint);
+
+    /**
+     * 批量删除agv站点
+     * 
+     * @param ids 需要删除的agv站点主键集合
+     * @return 结果
+     */
+    public int deleteAgvPointByIds(String[] ids);
+
+    /**
+     * 删除agv站点信息
+     * 
+     * @param id agv站点主键
+     * @return 结果
+     */
+    public int deleteAgvPointById(String id);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/impl/AgvPointServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/impl/AgvPointServiceImpl.java
new file mode 100644
index 0000000..f5176ff
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/agvPoint/service/impl/AgvPointServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.bas.agvPoint.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.bas.agvPoint.mapper.AgvPointMapper;
+import com.ruoyi.bas.agvPoint.domain.AgvPoint;
+import com.ruoyi.bas.agvPoint.service.IAgvPointService;
+
+/**
+ * agv站点Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-03-17
+ */
+@Service
+public class AgvPointServiceImpl implements IAgvPointService 
+{
+    @Autowired
+    private AgvPointMapper agvPointMapper;
+
+    /**
+     * 查询agv站点
+     * 
+     * @param id agv站点主键
+     * @return agv站点
+     */
+    @Override
+    public AgvPoint selectAgvPointById(String id)
+    {
+        return agvPointMapper.selectAgvPointById(id);
+    }
+
+    /**
+     * 查询agv站点列表
+     * 
+     * @param agvPoint agv站点
+     * @return agv站点
+     */
+    @Override
+    public List<AgvPoint> selectAgvPointList(AgvPoint agvPoint)
+    {
+        return agvPointMapper.selectAgvPointList(agvPoint);
+    }
+
+    /**
+     * 新增agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    @Override
+    public int insertAgvPoint(AgvPoint agvPoint)
+    {
+        return agvPointMapper.insertAgvPoint(agvPoint);
+    }
+
+    /**
+     * 修改agv站点
+     * 
+     * @param agvPoint agv站点
+     * @return 结果
+     */
+    @Override
+    public int updateAgvPoint(AgvPoint agvPoint)
+    {
+        return agvPointMapper.updateAgvPoint(agvPoint);
+    }
+
+    /**
+     * 批量删除agv站点
+     * 
+     * @param ids 需要删除的agv站点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAgvPointByIds(String[] ids)
+    {
+        return agvPointMapper.deleteAgvPointByIds(ids);
+    }
+
+    /**
+     * 删除agv站点信息
+     * 
+     * @param id agv站点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAgvPointById(String id)
+    {
+        return agvPointMapper.deleteAgvPointById(id);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
index 2860e5f..78f9860 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
@@ -71,6 +71,7 @@ public class BasTraycodeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BasTraycode basTraycode)
     {
+
         return toAjax(basTraycodeService.insertBasTraycode(basTraycode));
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java
index de122ce..7844fbd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java
@@ -16,16 +16,16 @@ public class BasTraycode extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Excel(name = "${bas.Traycode.id}")
+//    @Excel(name = "${bas.Traycode.id}")
     private Long id;
 
     /** 条码类型id */
-    @Excel(name = "${bas.Traycode.formatId}")
+//    @Excel(name = "${bas.Traycode.formatId}")
     private Long formatId;
     private String formatName;
 
     /** 条码 */
-    @Excel(name = "${bas.Traycode.trayCode}")
+    @Excel(name = "条码")
     private String trayCode;
 
     /** 备用字段1 */
@@ -33,7 +33,7 @@ public class BasTraycode extends BaseEntity
     private String spare1;
 
     /** 备用字段2 */
-//    @Excel(name = "${bas.Traycode.spare2}")
+    @Excel(name = "是否可用",dictType = "sys_yes_no")
     private String spare2;
 
     /** 备用字段3 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
index cb76145..68e80a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
@@ -61,4 +61,6 @@ public interface BasTraycodeMapper
     public int deleteBasTraycodeByIds(Long[] ids);
 
     void insertBasTraycodeList(List<BasTraycode> list);
+
+    Integer selectBasTrayCodeMax();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
index 28793c1..eeae6eb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
@@ -61,4 +61,6 @@ public interface IBasTraycodeService
     public int deleteBasTraycodeById(Long id);
 
     void insertBasTraycodeList(List<BasTraycode> traycodeList);
+
+    Integer selectBasTrayCodeMax();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
index f737b01..69ad881 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
@@ -1,9 +1,12 @@
 package com.ruoyi.bas.traycode.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.bas.traycode.domain.BasTraycode;
 import com.ruoyi.bas.traycode.mapper.BasTraycodeMapper;
 import com.ruoyi.bas.traycode.service.IBasTraycodeService;
+import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat;
+import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +24,8 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
 {
     @Autowired
     private BasTraycodeMapper basTraycodeMapper;
+    @Autowired
+    private IBasTraycodeFormatService basTraycodeFormatService;
 
     /**
      * 查询条码信息
@@ -55,8 +60,33 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
     @Override
     public int insertBasTraycode(BasTraycode basTraycode)
     {
-        basTraycode.setCreateTime(DateUtils.getNowDate());
-        return basTraycodeMapper.insertBasTraycode(basTraycode);
+        try {
+            BasTraycodeFormat basTraycodeFormat = basTraycodeFormatService.selectBasTraycodeFormatById(basTraycode.getFormatId());
+
+
+            int i1 = Integer.parseInt(basTraycode.getSpare1());
+            //如果i<4位数，前面补0
+            String code = "";
+            for (int j = 0; j < i1; j++) {
+                code = String.format("%07d",Convert.toInt( basTraycodeFormat.getSerialRule()) + 1 + j);
+                if(basTraycodeFormat.getMaxNum() < Convert.toLong( code)){
+                    throw new RuntimeException("已生成最大值");
+                }
+                String finalCode = basTraycodeFormat.getBarcodeFormat()+code;
+                basTraycode.setTrayCode(finalCode);
+                basTraycode.setSpare1(null);
+                basTraycode.setCreateTime(DateUtils.getNowDate());
+                basTraycode.setSpare2("Y");
+                basTraycodeMapper.insertBasTraycode(basTraycode);
+
+
+            }
+            basTraycodeFormat.setSerialRule(Convert.toLong( code).toString());
+            basTraycodeFormatService.updateBasTraycodeFormat(basTraycodeFormat);
+        } catch (Exception e) {
+           throw new RuntimeException(e);
+        }
+        return 1;
     }
 
     /**
@@ -103,4 +133,9 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
             basTraycodeMapper.insertBasTraycodeList(list);
         }
     }
+
+    @Override
+    public Integer selectBasTrayCodeMax() {
+        return basTraycodeMapper.selectBasTrayCodeMax();
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
index f9d9031..7b4f3a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java
@@ -1,17 +1,13 @@
 package com.ruoyi.bas.traycodeformat.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.ruoyi.bas.traycode.domain.BasTraycode;
 import com.ruoyi.bas.traycode.service.IBasTraycodeService;
 import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat;
 import com.ruoyi.bas.traycodeformat.mapper.BasTraycodeFormatMapper;
 import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService;
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -79,20 +75,7 @@ public class BasTraycodeFormatServiceImpl implements IBasTraycodeFormatService
     public int updateBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat)
     {
         BasTraycodeFormat old = selectBasTraycodeFormatById(basTraycodeFormat.getId());
-        int oldSerialRule = Convert.toInt(old.getSerialRule());
-        int newSerialRule = Convert.toInt(basTraycodeFormat.getSerialRule());
-
-        List<BasTraycode> traycodeList = new ArrayList<>();
-        for (int i = oldSerialRule; i < newSerialRule; i++) {
-            BasTraycode basTraycode = new BasTraycode();
-            basTraycode.setFormatId(basTraycodeFormat.getId());
-            String traycode = old.getBarcodeFormat()+ StrUtil.padPre(Convert.toStr(i),5,'0');
-            basTraycode.setTrayCode(traycode);
-            traycodeList.add(basTraycode);
-        }
         basTraycodeFormat.setUpdateTime(DateUtils.getNowDate());
-        //插入条码信息
-        basTraycodeService.insertBasTraycodeList(traycodeList);
         return basTraycodeFormatMapper.updateBasTraycodeFormat(basTraycodeFormat);
     }
 
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 e280463..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");
@@ -229,7 +229,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
             checkStockinMapper.autoAllot(map);
             builder.append("行明细：" + checkStockinDetail.getStockCheckDetailId() + "，分配结果：" + map.get("v_resultmsg") + "<br />");
         }
-        iToWcsService.pushOutMydoJob();
+        //iToWcsService.pushOutMydoJob();
 
         return AjaxResult.success(builder.toString());
 
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 e82e973..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,8 +102,54 @@ 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;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
     private List<String> typeData;
 
     public String getStartDate() {
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 6ceece1..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
@@ -73,4 +73,6 @@ public interface IInStockinService
     public int deleteInStockinByStockinGuid(String stockinGuid);
 
     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/stockinback/domain/InStockinBack.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java
index e97d854..e739fe0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java
@@ -95,6 +95,24 @@ public class InStockinBack extends BaseEntity
     private String sendTime;
 
     private String msg;
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
 
     public String getSendStatus() {
         return sendStatus;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java
index 68990fe..233d1f3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java
@@ -152,6 +152,44 @@ public class InStockinDetailBack extends BaseEntity
 
     private String msg;
 
+
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
     public String getSendStatus() {
         return sendStatus;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java
index ede4f51..9ddc0ac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 入库单据子信息Mapper接口
@@ -61,4 +62,8 @@ public interface InStockinDetailBackMapper
      * @return 结果
      */
     public int deleteInStockinDetailBackByStockinDetailIds(String[] stockinDetailIds);
+
+    void insertInStockInDetailBackFinish(@Param("list") List<InStockinDetailBack> inStockinDetailParam);
+
+    void deleteInStockInDetailList(@Param("idList") List<InStockinDetailBack> inStockinDetails);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java
index c511d79..9b1b1fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java
@@ -58,4 +58,8 @@ public interface IInStockinDetailBackService
      * @return 结果
      */
     public int deleteInStockinDetailBackByStockinDetailId(String stockinDetailId);
+
+    void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails);
+
+    void deleteInStockInDetailList(List<InStockinDetailBack> inStockinDetails);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java
index 0821f61..9ec707c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java
@@ -90,4 +90,14 @@ public class InStockinDetailBackServiceImpl implements IInStockinDetailBackServi
     {
         return inStockinDetailBackMapper.deleteInStockinDetailBackByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails) {
+         inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetails);
+    }
+
+    @Override
+    public void deleteInStockInDetailList(List<InStockinDetailBack> inStockinDetails) {
+        inStockinDetailBackMapper.deleteInStockInDetailList(inStockinDetails);
+    }
 }
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 2f00a9d..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
@@ -143,9 +143,13 @@ public class InStockinDetail extends BaseEntity
     private String status;
 
     private ExtraField extraField;
+    private String erpBill;
 
     private String warehouseName;
 
     private String warehouseId;
-
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
index baa5ba4..93bbedd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
@@ -69,4 +69,6 @@ public interface InStockinDetailMapper
     void deleteInStockinDetailByStockinGuid(String stockinGuid);
 
     InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
+
+    List<InStockinDetail> selectStockInByDetailByBarCode(String barCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
index aef8ee6..075e964 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
@@ -81,4 +81,6 @@ public interface IInStockinDetailService
 
 
     public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
+
+    List<InStockinDetail> selectStockInByDetailByBarCode(String barCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
index 1763b66..07d21a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
@@ -127,4 +127,9 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
         return   inStockinDetailMapper.selectStockinByDetailById(inStockinDetail);
 
     }
+
+    @Override
+    public List<InStockinDetail> selectStockInByDetailByBarCode(String barCode) {
+        return   inStockinDetailMapper.selectStockInByDetailByBarCode(barCode);
+    }
 }
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/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
index ad28711..7277d7f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
@@ -102,7 +102,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
     }
 
     @Override
-    @DataScope(warehouseAlias = "is2")
+//    @DataScope(warehouseAlias = "is2")
     public List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin) {
         return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin);
     }
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/domain/PkDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/PkDetail.java
new file mode 100644
index 0000000..dddfbe4
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/PkDetail.java
@@ -0,0 +1,27 @@
+package com.ruoyi.job.mydojob.domain;
+
+import java.io.Serializable;
+
+public class PkDetail implements Serializable {
+    private String stockinDetailId;
+    private String quantity;
+
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+
+}
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 d10a63f..ec2f038 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
@@ -1,5 +1,6 @@
 package com.ruoyi.job.mydojob.mapper;
 
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import org.apache.ibatis.annotations.Param;
 
@@ -82,5 +83,16 @@ public interface MydoJobMapper
 
     MydoJob selectInJobByTrayCode(@Param("trayCode") String trayCode);
 
+    MydoJob selectInJobByTaskNo(@Param("taskNo") String taskNo);
+
+
     void allotInJobSpace(HashMap<String, Object> map);
+
+    void ykCompleted(HashMap<String, Object> map);
+
+    void updateLed(HashMap<String, Object> map);
+
+    void updateLedError(HashMap<String, Object> map);
+
+    Integer selectBySpare4OrCargo(InStockinDetail inStockinDetail);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
index 7bc45ff..0f60062 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
@@ -109,4 +109,6 @@ public interface IMydoJobService
     MydoJob selectMydoJobByEntranceId(MydoJob mydoJob);
 
     List<MydoJob> getInJobBySerial(String serial);
+
+    void ykCompleted(MydoJob outJob);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index f801eb1..9dd3046 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -192,7 +192,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
 
             for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
-                String inOrOutDId = mydoJobDetail.getInOrOutDId();
+                String inOrOutDId = mydoJobDetail.getStockinDetailId();
                 InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
                 BigDecimal stockInNum = Convert.toBigDecimal(inStockinDetail.getScanNum());
                 BigDecimal jobInNum = Convert.toBigDecimal(mydoJobDetail.getInQuantity());
@@ -506,7 +506,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             msg = map.get("v_resultmsg").toString();
             builder.append("托盘：" + basStock.getTrayCode() + "，分配结果：" + msg + "<br/>");
         }
-        iToWcsService.pushOutMydoJob();
+        //iToWcsService.pushOutMydoJob();
         if (!StrUtil.isEmpty(builder)) {
             return AjaxResult.warn(builder.toString());
         }
@@ -527,4 +527,17 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public List<MydoJob> getInJobBySerial(String trayCode) {
         return mydoJobMapper.getInJobBySerial(trayCode);
     }
+
+    @Override
+    public void ykCompleted(MydoJob outJob) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_job_id", outJob.getJobId());
+        map.put("v_result", null);
+        mydoJobMapper.ykCompleted(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            log.error("移库任务处理异常 异常代码{}", map.get("v_result"));
+        }else{
+            log.info("移库任务处理成功 jobId:[{}] trayCode:[{}]", outJob.getJobId(), outJob.getTrayCode());
+        }
+    }
 }
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 bda1022..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
@@ -69,6 +69,7 @@ public interface IRequestLogService
      * @return
      */
     public RequestLog getRequestLog(String url, String param, String remark,String source,String target);
+    public RequestLog getRequestLog(String url, String param, String remark,String source,String target,String billType,String ciccid);
     /**
      * 接收接口记录
      *
@@ -77,4 +78,12 @@ public interface IRequestLogService
      * @return
      */
     public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult);
+
+    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 f605af0..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,6 +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.URLEncodeUtil;
+import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -122,8 +124,10 @@ public class RequestLogServiceImpl implements IRequestLogService
         requestLog.setRequestBody(param);
         requestLog.setRequestUrl(url);
         try {
-            String resStr = HttpUtil.post(url, param);
+//            String resStr = HttpRequest.post(url).contentType("application/x-www-from-urlencoded").timeout(2000).body(param).execute().body();
 
+            String resStr =  HttpUtil.post(url, param);
+            requestLog.setResponseBody(resStr);
             // 判断resStr的状态码，如果不是200抛出异常让catch捕获
             if (!JSONUtil.isJsonObj(resStr)) {
                 throw new RuntimeException("返回结果不是有效的JSON对象");
@@ -133,7 +137,6 @@ public class RequestLogServiceImpl implements IRequestLogService
             if (codeObj == null || !codeObj.toString().equals("200")) {
                 throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null"));
             }
-            requestLog.setResponseBody(resStr);
             requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
             requestLog.setResponseStatus("1");
             requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
@@ -148,6 +151,53 @@ public class RequestLogServiceImpl implements IRequestLogService
         return requestLog;
     }
 
+    @Override
+    public RequestLog getRequestLog(String url, String param, String remark, String source, String target, String billType, String ciccid) {
+        String body = "datajson=" + param
+                + "&ibilltype=" + URLEncodeUtil.encodeAll(billType)
+                + "&cacc_id=" + URLEncodeUtil.encodeAll(ciccid);
+
+        RequestLog requestLog = new RequestLog();
+        requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setSourceSystem(source);
+        requestLog.setTargetSystem(target);
+        requestLog.setEndpoint(remark);
+        requestLog.setRequestMethod("post");
+        requestLog.setRequestHeaders(null);
+        requestLog.setRequestBody(body);
+        requestLog.setRequestUrl(url);
+        try {
+            String resStr = HttpRequest.post(url)
+                    .contentType("application/x-www-form-urlencoded;charset=UTF-8")
+                    .body(body)
+                    .execute().body();
+
+            requestLog.setResponseBody(resStr);
+            // 判断resStr的状态码，如果不是200抛出异常让catch捕获
+            if (!JSONUtil.isJsonObj(resStr)) {
+                throw new RuntimeException("返回结果不是有效的JSON对象");
+            }
+            cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resStr);
+            Object codeObj = jsonObject.get("ErrCode");
+            if (codeObj == null || !codeObj.toString().equals("0")) {
+                throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null"));
+            }
+            requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
+            requestLog.setResponseStatus("1");
+            requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
+            requestLog.setIsSuccessful("1");
+        } catch (Exception e) {
+            requestLog.setErrorDetails(e.getMessage());
+            requestLog.setIsSuccessful("0");
+            requestLog.setResponseStatus("0");
+        } finally {
+            insertRequestLog(requestLog);
+        }
+        return requestLog;
+    }
+
+
+
     /**
      * 插入请求日志
      *
@@ -173,4 +223,46 @@ public class RequestLogServiceImpl implements IRequestLogService
         requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
         return requestLog;
     }
+
+    @Override
+    public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult) {
+        RequestLog requestLog = new RequestLog();
+        requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setRequestBody(param);
+        requestLog.setSourceSystem("erp");
+        requestLog.setTargetSystem("wms");
+        requestLog.setEndpoint(remark);
+        requestLog.setRequestMethod("post");
+        requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
+        requestLog.setResponseStatus("1");
+        if (ajaxResult.isSuccess()){
+            requestLog.setIsSuccessful("1");
+        }else {
+            requestLog.setIsSuccessful("0");
+        }
+        requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
+        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 e438e28..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,17 +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)
     @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/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
index 8403648..ae75547 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
@@ -91,6 +91,9 @@ public class OutStockout extends BaseEntity
     private String spare4;
 
     private String spare5;
+    private String spare6;
+    private String spare7;
+    private String spare8;
 
     private String customerName;
 
@@ -99,9 +102,51 @@ public class OutStockout extends BaseEntity
     private String productId;
 
     private String productName;
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
 
     private List<String> typeData;
 
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }
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 94b2787..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
@@ -73,4 +73,6 @@ public interface IOutStockoutService
     List<OutStockout> selectOutStockoutListApi(OutStockout outStockoutParam);
 
     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 02f0c1f..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
@@ -180,10 +180,11 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         for (OutStockoutDetail detail : outStockoutDetails) {
             if (detail.getAllotQuantity().compareTo(detail.getQuantity()) < 0){
                 map.put("v_stockout_detail_id",  detail.getStockoutDetailId());
+                map.put("v_result", null);
+                map.put("v_resultmsg", null);
                 outStockoutMapper.autoAllot(map);
-                toWcsService.pushOutMydoJob();
                 if (!"10".equals(map.get("v_result"))){
-                    stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultString"));
+                    stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultmsg"));
                 }
             }else{
                 stringBuilder.append(",").append(detail.getStockoutDetailId()+"单据已分配完成");
@@ -209,7 +210,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
             map.put("v_stockout_detail_id", stockoutDetailId);
             map.put("v_stock_id", stock);
             outStockoutMapper.manualAllot(map);
-            toWcsService.pushOutMydoJob();
+            //toWcsService.pushOutMydoJob();
             if (!"10".equals(map.get("v_result"))){
                 stringBuilder.append(",").append(stockoutDetailId+map.get("v_resultString"));
             }
@@ -219,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/outStockoutBack/controller/OutStockoutBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/controller/OutStockoutBackController.java
new file mode 100644
index 0000000..365d554
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/controller/OutStockoutBackController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.out.outStockoutBack.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.out.outStockoutBack.domain.OutStockoutBack;
+import com.ruoyi.out.outStockoutBack.service.IOutStockoutBackService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 出库单据主信息Controller
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@RestController
+@RequestMapping("/out/outStockoutBack")
+public class OutStockoutBackController extends BaseController
+{
+    @Autowired
+    private IOutStockoutBackService outStockoutBackService;
+
+    /**
+     * 查询出库单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OutStockoutBack outStockoutBack)
+    {
+        startPage();
+        List<OutStockoutBack> list = outStockoutBackService.selectOutStockoutBackList(outStockoutBack);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出出库单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:export')")
+    @Log(title = "出库单据主信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OutStockoutBack outStockoutBack)
+    {
+        List<OutStockoutBack> list = outStockoutBackService.selectOutStockoutBackList(outStockoutBack);
+        ExcelUtil<OutStockoutBack> util = new ExcelUtil<OutStockoutBack>(OutStockoutBack.class);
+        util.exportExcel(response, list, "出库单据主信息数据");
+    }
+
+    /**
+     * 获取出库单据主信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:query')")
+    @GetMapping(value = "/{stockoutGuid}")
+    public AjaxResult getInfo(@PathVariable("stockoutGuid") String stockoutGuid)
+    {
+        return success(outStockoutBackService.selectOutStockoutBackByStockoutGuid(stockoutGuid));
+    }
+
+    /**
+     * 新增出库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:add')")
+    @Log(title = "出库单据主信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OutStockoutBack outStockoutBack)
+    {
+        return toAjax(outStockoutBackService.insertOutStockoutBack(outStockoutBack));
+    }
+
+    /**
+     * 修改出库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:edit')")
+    @Log(title = "出库单据主信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OutStockoutBack outStockoutBack)
+    {
+        return toAjax(outStockoutBackService.updateOutStockoutBack(outStockoutBack));
+    }
+
+    /**
+     * 删除出库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutBack:remove')")
+    @Log(title = "出库单据主信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockoutGuids}")
+    public AjaxResult remove(@PathVariable String[] stockoutGuids)
+    {
+        return toAjax(outStockoutBackService.deleteOutStockoutBackByStockoutGuids(stockoutGuids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java
new file mode 100644
index 0000000..d8eca83
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java
@@ -0,0 +1,464 @@
+package com.ruoyi.out.outStockoutBack.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;
+
+/**
+ * 出库单据主信息对象 out_stockout_back
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public class OutStockoutBack extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 546 guid */
+    @Excel(name = "546 guid")
+    private String stockoutGuid;
+
+    /** 546 单据编码 */
+    @Excel(name = "546 单据编码")
+    private String stockoutId;
+
+    /** 546 出库类型 */
+    @Excel(name = "546 出库类型")
+    private String outType;
+
+    /** 546 单据时间 */
+    @Excel(name = "546 单据时间")
+    private String createDate;
+
+    /** 项目号546 */
+    @Excel(name = "项目号546")
+    private String departmentNo;
+
+    /** 客户编码546 */
+    @Excel(name = "客户编码546")
+    private String customerNo;
+
+    /** 制单人546 */
+    @Excel(name = "制单人546")
+    private String createManId;
+
+    /** 546 单据状态 */
+    @Excel(name = "546 单据状态")
+    private String status;
+
+    /** 单据来源0自建单1接口 */
+    @Excel(name = "单据来源0自建单1接口")
+    private String stockoutSource;
+
+    /** 仓库ID546 */
+    @Excel(name = "仓库ID546")
+    private String warehouseId;
+
+    /** 客户名称546 */
+    @Excel(name = "客户名称546")
+    private String classNowId;
+
+    /** 出口 */
+    @Excel(name = "出口")
+    private String exitId;
+
+    /** 出库方式546 */
+    @Excel(name = "出库方式546")
+    private String carNumber;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String FID;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String erpStockoutId;
+
+    /** 546 */
+    @Excel(name = "546")
+    private String startDate;
+
+    /** 546 */
+    @Excel(name = "546")
+    private String finishDate;
+
+    /** 合同号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  1人工2agv */
+    @Excel(name = "配送方式546  1人工2agv")
+    private String spare6;
+
+    /** 出库配送终点546 */
+    @Excel(name = "出库配送终点546")
+    private String spare7;
+
+    /** 1缓存2线边546 */
+    @Excel(name = "1缓存2线边546")
+    private String spare8;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sendStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sendTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String msg;
+
+
+
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
+    public void setStockoutGuid(String stockoutGuid)
+    {
+        this.stockoutGuid = stockoutGuid;
+    }
+
+    public String getStockoutGuid() 
+    {
+        return stockoutGuid;
+    }
+
+    public void setStockoutId(String stockoutId) 
+    {
+        this.stockoutId = stockoutId;
+    }
+
+    public String getStockoutId() 
+    {
+        return stockoutId;
+    }
+
+    public void setOutType(String outType) 
+    {
+        this.outType = outType;
+    }
+
+    public String getOutType() 
+    {
+        return outType;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    public void setDepartmentNo(String departmentNo) 
+    {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getDepartmentNo() 
+    {
+        return departmentNo;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setStockoutSource(String stockoutSource) 
+    {
+        this.stockoutSource = stockoutSource;
+    }
+
+    public String getStockoutSource() 
+    {
+        return stockoutSource;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setClassNowId(String classNowId) 
+    {
+        this.classNowId = classNowId;
+    }
+
+    public String getClassNowId() 
+    {
+        return classNowId;
+    }
+
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
+    }
+
+    public String getExitId() 
+    {
+        return exitId;
+    }
+
+    public void setCarNumber(String carNumber) 
+    {
+        this.carNumber = carNumber;
+    }
+
+    public String getCarNumber() 
+    {
+        return carNumber;
+    }
+
+    public void setFID(String FID) 
+    {
+        this.FID = FID;
+    }
+
+    public String getFID() 
+    {
+        return FID;
+    }
+
+    public void setErpStockoutId(String erpStockoutId) 
+    {
+        this.erpStockoutId = erpStockoutId;
+    }
+
+    public String getErpStockoutId() 
+    {
+        return erpStockoutId;
+    }
+
+    public void setStartDate(String startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public String getStartDate() 
+    {
+        return startDate;
+    }
+
+    public void setFinishDate(String finishDate) 
+    {
+        this.finishDate = finishDate;
+    }
+
+    public String getFinishDate() 
+    {
+        return finishDate;
+    }
+
+    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 setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSendStatus(String sendStatus) 
+    {
+        this.sendStatus = sendStatus;
+    }
+
+    public String getSendStatus() 
+    {
+        return sendStatus;
+    }
+
+    public void setSendTime(String sendTime) 
+    {
+        this.sendTime = sendTime;
+    }
+
+    public String getSendTime() 
+    {
+        return sendTime;
+    }
+
+    public void setMsg(String msg) 
+    {
+        this.msg = msg;
+    }
+
+    public String getMsg() 
+    {
+        return msg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockoutGuid", getStockoutGuid())
+            .append("stockoutId", getStockoutId())
+            .append("outType", getOutType())
+            .append("createDate", getCreateDate())
+            .append("departmentNo", getDepartmentNo())
+            .append("customerNo", getCustomerNo())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("stockoutSource", getStockoutSource())
+            .append("warehouseId", getWarehouseId())
+            .append("classNowId", getClassNowId())
+            .append("exitId", getExitId())
+            .append("carNumber", getCarNumber())
+            .append("FID", getFID())
+            .append("erpStockoutId", getErpStockoutId())
+            .append("startDate", getStartDate())
+            .append("finishDate", getFinishDate())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("sendStatus", getSendStatus())
+            .append("sendTime", getSendTime())
+            .append("msg", getMsg())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/mapper/OutStockoutBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/mapper/OutStockoutBackMapper.java
new file mode 100644
index 0000000..23e6665
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/mapper/OutStockoutBackMapper.java
@@ -0,0 +1,64 @@
+package com.ruoyi.out.outStockoutBack.mapper;
+
+import java.util.List;
+import com.ruoyi.out.outStockoutBack.domain.OutStockoutBack;
+
+/**
+ * 出库单据主信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface OutStockoutBackMapper 
+{
+    /**
+     * 查询出库单据主信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 出库单据主信息
+     */
+    public OutStockoutBack selectOutStockoutBackByStockoutGuid(String stockoutGuid);
+
+
+    public OutStockoutBack selelctTopOutStockout();
+
+    /**
+     * 查询出库单据主信息列表
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 出库单据主信息集合
+     */
+    public List<OutStockoutBack> selectOutStockoutBackList(OutStockoutBack outStockoutBack);
+
+    /**
+     * 新增出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    public int insertOutStockoutBack(OutStockoutBack outStockoutBack);
+
+    /**
+     * 修改出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    public int updateOutStockoutBack(OutStockoutBack outStockoutBack);
+
+    /**
+     * 删除出库单据主信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 结果
+     */
+    public int deleteOutStockoutBackByStockoutGuid(String stockoutGuid);
+
+    /**
+     * 批量删除出库单据主信息
+     * 
+     * @param stockoutGuids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOutStockoutBackByStockoutGuids(String[] stockoutGuids);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/IOutStockoutBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/IOutStockoutBackService.java
new file mode 100644
index 0000000..b45d9f5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/IOutStockoutBackService.java
@@ -0,0 +1,70 @@
+package com.ruoyi.out.outStockoutBack.service;
+
+import java.util.List;
+import com.ruoyi.out.outStockoutBack.domain.OutStockoutBack;
+
+/**
+ * 出库单据主信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface IOutStockoutBackService 
+{
+    /**
+     * 查询出库单据主信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 出库单据主信息
+     */
+    public OutStockoutBack selectOutStockoutBackByStockoutGuid(String stockoutGuid);
+
+
+
+
+    public OutStockoutBack selelctTopOutStockout();
+
+
+
+    /**
+     * 查询出库单据主信息列表
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 出库单据主信息集合
+     */
+    public List<OutStockoutBack> selectOutStockoutBackList(OutStockoutBack outStockoutBack);
+
+    /**
+     * 新增出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    public int insertOutStockoutBack(OutStockoutBack outStockoutBack);
+
+    /**
+     * 修改出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    public int updateOutStockoutBack(OutStockoutBack outStockoutBack);
+
+    /**
+     * 批量删除出库单据主信息
+     * 
+     * @param stockoutGuids 需要删除的出库单据主信息主键集合
+     * @return 结果
+     */
+    public int deleteOutStockoutBackByStockoutGuids(String[] stockoutGuids);
+
+    /**
+     * 删除出库单据主信息信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 结果
+     */
+    public int deleteOutStockoutBackByStockoutGuid(String stockoutGuid);
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/impl/OutStockoutBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/impl/OutStockoutBackServiceImpl.java
new file mode 100644
index 0000000..270369b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/service/impl/OutStockoutBackServiceImpl.java
@@ -0,0 +1,98 @@
+package com.ruoyi.out.outStockoutBack.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.out.outStockoutBack.mapper.OutStockoutBackMapper;
+import com.ruoyi.out.outStockoutBack.domain.OutStockoutBack;
+import com.ruoyi.out.outStockoutBack.service.IOutStockoutBackService;
+
+/**
+ * 出库单据主信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Service
+public class OutStockoutBackServiceImpl implements IOutStockoutBackService 
+{
+    @Autowired
+    private OutStockoutBackMapper outStockoutBackMapper;
+
+    /**
+     * 查询出库单据主信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 出库单据主信息
+     */
+    @Override
+    public OutStockoutBack selectOutStockoutBackByStockoutGuid(String stockoutGuid)
+    {
+        return outStockoutBackMapper.selectOutStockoutBackByStockoutGuid(stockoutGuid);
+    }
+
+    @Override
+    public OutStockoutBack selelctTopOutStockout() {
+        return outStockoutBackMapper.selelctTopOutStockout();
+    }
+
+    /**
+     * 查询出库单据主信息列表
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 出库单据主信息
+     */
+    @Override
+    public List<OutStockoutBack> selectOutStockoutBackList(OutStockoutBack outStockoutBack)
+    {
+        return outStockoutBackMapper.selectOutStockoutBackList(outStockoutBack);
+    }
+
+    /**
+     * 新增出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    @Override
+    public int insertOutStockoutBack(OutStockoutBack outStockoutBack)
+    {
+        return outStockoutBackMapper.insertOutStockoutBack(outStockoutBack);
+    }
+
+    /**
+     * 修改出库单据主信息
+     * 
+     * @param outStockoutBack 出库单据主信息
+     * @return 结果
+     */
+    @Override
+    public int updateOutStockoutBack(OutStockoutBack outStockoutBack)
+    {
+        return outStockoutBackMapper.updateOutStockoutBack(outStockoutBack);
+    }
+
+    /**
+     * 批量删除出库单据主信息
+     * 
+     * @param stockoutGuids 需要删除的出库单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOutStockoutBackByStockoutGuids(String[] stockoutGuids)
+    {
+        return outStockoutBackMapper.deleteOutStockoutBackByStockoutGuids(stockoutGuids);
+    }
+
+    /**
+     * 删除出库单据主信息信息
+     * 
+     * @param stockoutGuid 出库单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOutStockoutBackByStockoutGuid(String stockoutGuid)
+    {
+        return outStockoutBackMapper.deleteOutStockoutBackByStockoutGuid(stockoutGuid);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
index 4027dd2..a67c485 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
@@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity
 
     /** 计划数量（箱） */
     @Excel(name = "计划数量", readConverterExp = "箱=")
-    private BigDecimal quantityX;
+    private String quantityX;
 
     /** 计划数量（件） */
     @Excel(name = "计划数量", readConverterExp = "件=")
@@ -200,6 +200,42 @@ public class OutStockoutDetail extends BaseEntity
 
     private String spare9;
 
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
 
     public String getSpare1() {
         return spare1;
@@ -407,14 +443,12 @@ public class OutStockoutDetail extends BaseEntity
         return quantity;
     }
 
-    public void setQuantityX(BigDecimal quantityX)
-    {
-        this.quantityX = quantityX;
+    public String getQuantityX() {
+        return quantityX;
     }
 
-    public BigDecimal getQuantityX()
-    {
-        return quantityX;
+    public void setQuantityX(String quantityX) {
+        this.quantityX = quantityX;
     }
 
     public void setQuantityJ(BigDecimal quantityJ)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/controller/OutStockoutDetailBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/controller/OutStockoutDetailBackController.java
new file mode 100644
index 0000000..93b9bc9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/controller/OutStockoutDetailBackController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.out.outStockoutDetailBack.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.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
+import com.ruoyi.out.outStockoutDetailBack.service.IOutStockoutDetailBackService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 历史出库单据子信息Controller
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@RestController
+@RequestMapping("/out/outStockoutDetailBack")
+public class OutStockoutDetailBackController extends BaseController
+{
+    @Autowired
+    private IOutStockoutDetailBackService outStockoutDetailBackService;
+
+    /**
+     * 查询历史出库单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OutStockoutDetailBack outStockoutDetailBack)
+    {
+        startPage();
+        List<OutStockoutDetailBack> list = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出历史出库单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:export')")
+    @Log(title = "历史出库单据子信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OutStockoutDetailBack outStockoutDetailBack)
+    {
+        List<OutStockoutDetailBack> list = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
+        ExcelUtil<OutStockoutDetailBack> util = new ExcelUtil<OutStockoutDetailBack>(OutStockoutDetailBack.class);
+        util.exportExcel(response, list, "历史出库单据子信息数据");
+    }
+
+    /**
+     * 获取历史出库单据子信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:query')")
+    @GetMapping(value = "/{stockoutDetailId}")
+    public AjaxResult getInfo(@PathVariable("stockoutDetailId") String stockoutDetailId)
+    {
+        return success(outStockoutDetailBackService.selectOutStockoutDetailBackByStockoutDetailId(stockoutDetailId));
+    }
+
+    /**
+     * 新增历史出库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:add')")
+    @Log(title = "历史出库单据子信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OutStockoutDetailBack outStockoutDetailBack)
+    {
+        return toAjax(outStockoutDetailBackService.insertOutStockoutDetailBack(outStockoutDetailBack));
+    }
+
+    /**
+     * 修改历史出库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:edit')")
+    @Log(title = "历史出库单据子信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OutStockoutDetailBack outStockoutDetailBack)
+    {
+        return toAjax(outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack));
+    }
+
+    /**
+     * 删除历史出库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('out:outStockoutDetailBack:remove')")
+    @Log(title = "历史出库单据子信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockoutDetailIds}")
+    public AjaxResult remove(@PathVariable String[] stockoutDetailIds)
+    {
+        return toAjax(outStockoutDetailBackService.deleteOutStockoutDetailBackByStockoutDetailIds(stockoutDetailIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/domain/OutStockoutDetailBack.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/domain/OutStockoutDetailBack.java
new file mode 100644
index 0000000..9c6aea5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/domain/OutStockoutDetailBack.java
@@ -0,0 +1,645 @@
+package com.ruoyi.out.outStockoutDetailBack.domain;
+
+import java.math.BigDecimal;
+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;
+
+/**
+ * 历史出库单据子信息对象 out_stockout_detail_back
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public class OutStockoutDetailBack extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String stockoutDetailId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String stockoutGuid;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String stockoutId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lotNo;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String productGuid;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String productId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal quantity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String quantityX;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal quantityJ;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal assignNum;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal assignNumX;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal assignNumJ;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal allotQuantity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal allotQuantityX;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal allotQuantityJ;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String price;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String warehouseId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String outId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String bukechaiQuantity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String kechaiQuantity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String entryid;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String flatQuantity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String fid;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String erpStockoutId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String unit;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spec;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String productName;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare1;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare2;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare3;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare4;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare5;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare6;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare7;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare8;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare9;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sendStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sendTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String msg;
+
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId)
+    {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    public String getStockoutDetailId() 
+    {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutGuid(String stockoutGuid) 
+    {
+        this.stockoutGuid = stockoutGuid;
+    }
+
+    public String getStockoutGuid() 
+    {
+        return stockoutGuid;
+    }
+
+    public void setStockoutId(String stockoutId) 
+    {
+        this.stockoutId = stockoutId;
+    }
+
+    public String getStockoutId() 
+    {
+        return stockoutId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setQuantity(BigDecimal quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getQuantity() 
+    {
+        return quantity;
+    }
+
+    public String getQuantityX() {
+        return quantityX;
+    }
+
+    public void setQuantityX(String quantityX) {
+        this.quantityX = quantityX;
+    }
+
+    public void setQuantityJ(BigDecimal quantityJ)
+    {
+        this.quantityJ = quantityJ;
+    }
+
+    public BigDecimal getQuantityJ() 
+    {
+        return quantityJ;
+    }
+
+    public void setAssignNum(BigDecimal assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public BigDecimal getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAssignNumX(BigDecimal assignNumX) 
+    {
+        this.assignNumX = assignNumX;
+    }
+
+    public BigDecimal getAssignNumX() 
+    {
+        return assignNumX;
+    }
+
+    public void setAssignNumJ(BigDecimal assignNumJ) 
+    {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public BigDecimal getAssignNumJ() 
+    {
+        return assignNumJ;
+    }
+
+    public void setAllotQuantity(BigDecimal allotQuantity) 
+    {
+        this.allotQuantity = allotQuantity;
+    }
+
+    public BigDecimal getAllotQuantity() 
+    {
+        return allotQuantity;
+    }
+
+    public void setAllotQuantityX(BigDecimal allotQuantityX) 
+    {
+        this.allotQuantityX = allotQuantityX;
+    }
+
+    public BigDecimal getAllotQuantityX() 
+    {
+        return allotQuantityX;
+    }
+
+    public void setAllotQuantityJ(BigDecimal allotQuantityJ) 
+    {
+        this.allotQuantityJ = allotQuantityJ;
+    }
+
+    public BigDecimal getAllotQuantityJ() 
+    {
+        return allotQuantityJ;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setOutId(String outId) 
+    {
+        this.outId = outId;
+    }
+
+    public String getOutId() 
+    {
+        return outId;
+    }
+
+    public void setBukechaiQuantity(String bukechaiQuantity) 
+    {
+        this.bukechaiQuantity = bukechaiQuantity;
+    }
+
+    public String getBukechaiQuantity() 
+    {
+        return bukechaiQuantity;
+    }
+
+    public void setKechaiQuantity(String kechaiQuantity) 
+    {
+        this.kechaiQuantity = kechaiQuantity;
+    }
+
+    public String getKechaiQuantity() 
+    {
+        return kechaiQuantity;
+    }
+
+    public void setEntryid(String entryid) 
+    {
+        this.entryid = entryid;
+    }
+
+    public String getEntryid() 
+    {
+        return entryid;
+    }
+
+    public void setFlatQuantity(String flatQuantity) 
+    {
+        this.flatQuantity = flatQuantity;
+    }
+
+    public String getFlatQuantity() 
+    {
+        return flatQuantity;
+    }
+
+    public void setFid(String fid) 
+    {
+        this.fid = fid;
+    }
+
+    public String getFid() 
+    {
+        return fid;
+    }
+
+    public void setErpStockoutId(String erpStockoutId) 
+    {
+        this.erpStockoutId = erpStockoutId;
+    }
+
+    public String getErpStockoutId() 
+    {
+        return erpStockoutId;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    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 setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSendStatus(String sendStatus) 
+    {
+        this.sendStatus = sendStatus;
+    }
+
+    public String getSendStatus() 
+    {
+        return sendStatus;
+    }
+
+    public void setSendTime(String sendTime) 
+    {
+        this.sendTime = sendTime;
+    }
+
+    public String getSendTime() 
+    {
+        return sendTime;
+    }
+
+    public void setMsg(String msg) 
+    {
+        this.msg = msg;
+    }
+
+    public String getMsg() 
+    {
+        return msg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockoutDetailId", getStockoutDetailId())
+            .append("stockoutGuid", getStockoutGuid())
+            .append("stockoutId", getStockoutId())
+            .append("lotNo", getLotNo())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("quantityX", getQuantityX())
+            .append("quantityJ", getQuantityJ())
+            .append("assignNum", getAssignNum())
+            .append("assignNumX", getAssignNumX())
+            .append("assignNumJ", getAssignNumJ())
+            .append("allotQuantity", getAllotQuantity())
+            .append("allotQuantityX", getAllotQuantityX())
+            .append("allotQuantityJ", getAllotQuantityJ())
+            .append("price", getPrice())
+            .append("remark", getRemark())
+            .append("warehouseId", getWarehouseId())
+            .append("outId", getOutId())
+            .append("bukechaiQuantity", getBukechaiQuantity())
+            .append("kechaiQuantity", getKechaiQuantity())
+            .append("entryid", getEntryid())
+            .append("flatQuantity", getFlatQuantity())
+            .append("fid", getFid())
+            .append("erpStockoutId", getErpStockoutId())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("productName", getProductName())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("sendStatus", getSendStatus())
+            .append("sendTime", getSendTime())
+            .append("msg", getMsg())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java
new file mode 100644
index 0000000..bbc7b1c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java
@@ -0,0 +1,66 @@
+package com.ruoyi.out.outStockoutDetailBack.mapper;
+
+import java.util.List;
+import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 历史出库单据子信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface OutStockoutDetailBackMapper 
+{
+    /**
+     * 查询历史出库单据子信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 历史出库单据子信息
+     */
+    public OutStockoutDetailBack selectOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId);
+
+    /**
+     * 查询历史出库单据子信息列表
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 历史出库单据子信息集合
+     */
+    public List<OutStockoutDetailBack> selectOutStockoutDetailBackList(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 新增历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    public int insertOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 修改历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    public int updateOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 删除历史出库单据子信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 结果
+     */
+    public int deleteOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId);
+
+    /**
+     * 批量删除历史出库单据子信息
+     * 
+     * @param stockoutDetailIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOutStockoutDetailBackByStockoutDetailIds(String[] stockoutDetailIds);
+
+    void insertOutStockDetailBackFinish(@Param("list") List<OutStockoutDetailBack> outStockoutDetailBacks);
+
+    void deleteOutStockDetailList(@Param("list") List<OutStockoutDetailBack> outStockoutDetailBacks);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java
new file mode 100644
index 0000000..d53dfb4
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.out.outStockoutDetailBack.service;
+
+import java.util.List;
+import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
+
+/**
+ * 历史出库单据子信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface IOutStockoutDetailBackService 
+{
+    /**
+     * 查询历史出库单据子信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 历史出库单据子信息
+     */
+    public OutStockoutDetailBack selectOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId);
+
+    /**
+     * 查询历史出库单据子信息列表
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 历史出库单据子信息集合
+     */
+    public List<OutStockoutDetailBack> selectOutStockoutDetailBackList(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 新增历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    public int insertOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 修改历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    public int updateOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack);
+
+    /**
+     * 批量删除历史出库单据子信息
+     * 
+     * @param stockoutDetailIds 需要删除的历史出库单据子信息主键集合
+     * @return 结果
+     */
+    public int deleteOutStockoutDetailBackByStockoutDetailIds(String[] stockoutDetailIds);
+
+    /**
+     * 删除历史出库单据子信息信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 结果
+     */
+    public int deleteOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId);
+
+    void insertOutStockDetailBackFinish(List<OutStockoutDetailBack> outStockoutDetailBacks);
+
+    void deleteOutStockDetailList(List<OutStockoutDetailBack> outStockoutDetailBacks);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java
new file mode 100644
index 0000000..f3a730c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java
@@ -0,0 +1,103 @@
+package com.ruoyi.out.outStockoutDetailBack.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.out.outStockoutDetailBack.mapper.OutStockoutDetailBackMapper;
+import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
+import com.ruoyi.out.outStockoutDetailBack.service.IOutStockoutDetailBackService;
+
+/**
+ * 历史出库单据子信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Service
+public class OutStockoutDetailBackServiceImpl implements IOutStockoutDetailBackService 
+{
+    @Autowired
+    private OutStockoutDetailBackMapper outStockoutDetailBackMapper;
+
+    /**
+     * 查询历史出库单据子信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 历史出库单据子信息
+     */
+    @Override
+    public OutStockoutDetailBack selectOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId)
+    {
+        return outStockoutDetailBackMapper.selectOutStockoutDetailBackByStockoutDetailId(stockoutDetailId);
+    }
+
+    /**
+     * 查询历史出库单据子信息列表
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 历史出库单据子信息
+     */
+    @Override
+    public List<OutStockoutDetailBack> selectOutStockoutDetailBackList(OutStockoutDetailBack outStockoutDetailBack)
+    {
+        return outStockoutDetailBackMapper.selectOutStockoutDetailBackList(outStockoutDetailBack);
+    }
+
+    /**
+     * 新增历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    @Override
+    public int insertOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack)
+    {
+        return outStockoutDetailBackMapper.insertOutStockoutDetailBack(outStockoutDetailBack);
+    }
+
+    /**
+     * 修改历史出库单据子信息
+     * 
+     * @param outStockoutDetailBack 历史出库单据子信息
+     * @return 结果
+     */
+    @Override
+    public int updateOutStockoutDetailBack(OutStockoutDetailBack outStockoutDetailBack)
+    {
+        return outStockoutDetailBackMapper.updateOutStockoutDetailBack(outStockoutDetailBack);
+    }
+
+    /**
+     * 批量删除历史出库单据子信息
+     * 
+     * @param stockoutDetailIds 需要删除的历史出库单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOutStockoutDetailBackByStockoutDetailIds(String[] stockoutDetailIds)
+    {
+        return outStockoutDetailBackMapper.deleteOutStockoutDetailBackByStockoutDetailIds(stockoutDetailIds);
+    }
+
+    /**
+     * 删除历史出库单据子信息信息
+     * 
+     * @param stockoutDetailId 历史出库单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId)
+    {
+        return outStockoutDetailBackMapper.deleteOutStockoutDetailBackByStockoutDetailId(stockoutDetailId);
+    }
+
+    @Override
+    public void insertOutStockDetailBackFinish(List<OutStockoutDetailBack> outStockoutDetailBacks) {
+        outStockoutDetailBackMapper.insertOutStockDetailBackFinish(outStockoutDetailBacks);
+    }
+
+    @Override
+    public void deleteOutStockDetailList(List<OutStockoutDetailBack> outStockoutDetailBacks) {
+        outStockoutDetailBackMapper.deleteOutStockDetailList(outStockoutDetailBacks);
+    }
+}
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 2c2cb57..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,26 +2,42 @@ 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;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 @Controller
 @RequestMapping("/pda")
@@ -32,6 +48,20 @@ public class PdaController extends BaseController {
     private PdaService pdaService;
     @Autowired
     private IInStockinDetailService iInStockinDetailService;
+    @Autowired
+    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;
 
     /**
      * 查询是否有半满托盘
@@ -46,11 +76,11 @@ public class PdaController extends BaseController {
     /**
      * 通过单据码查询物料详情
      */
-    @RequestMapping("/selectDetailById")
+    @RequestMapping("/selectDetailByIds")
     @ResponseBody
-    public AjaxResult selectDetailById(String inStockinDetailId) {
+    public AjaxResult selectDetailByIds(String inStockinDetailId) {
         InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        if(inStockinDetail != null) {
+        if (inStockinDetail != null) {
             inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
         }
         return AjaxResult.success(inStockinDetail);
@@ -67,6 +97,22 @@ public class PdaController extends BaseController {
     }
 
 
+    /**
+     * 通过单据码查询物料详情  TODO 修改单据码为barCode  前端需同步修改
+     */
+    @RequestMapping("/selectDetailById")
+    @ResponseBody
+    public AjaxResult selectDetailById(String barCode) {
+        List<InStockinDetail> stockinDetails = iInStockinDetailService.selectStockInByDetailByBarCode(barCode);
+        stockinDetails.stream().forEach(inStockinDetail -> {
+            Integer quantity = StringUtils.hasText(inStockinDetail.getQuantity()) ? Integer.valueOf(inStockinDetail.getQuantity()) : 0;
+            Integer scanNum = StringUtils.hasText(inStockinDetail.getScanNum()) ? Integer.valueOf(inStockinDetail.getScanNum()) : 0;
+            inStockinDetail.setQuantity(String.valueOf(quantity - scanNum));
+        });
+        return AjaxResult.success(stockinDetails);
+    }
+
+
     /**
      * 通过托盘码查询作业或trayMsg
      */
@@ -85,13 +131,20 @@ public class PdaController extends BaseController {
         return pdaService.bindTray(trayCodeMakeSure);
     }
 
+    @RequestMapping("/bindTray2")
+    @ResponseBody
+    public AjaxResult bindTray2(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.bindTray2(trayCodeMakeSure);
+    }
+
+
     /**
      * 空托盘入库
      */
     @RequestMapping("/tpIn")
     @ResponseBody
     public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
-        return pdaService.tpIn(trayCodeMsg.getTrayCode());
+        return pdaService.tpIn(trayCodeMsg);
     }
 
     /**
@@ -105,12 +158,13 @@ public class PdaController extends BaseController {
 
     /**
      * 出库确认查询子作业信息
+     *
      * @param trayCodeMsg
      * @return
      */
     @RequestMapping("/selectJobDetailByTray")
     @ResponseBody
-    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
+    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
         return pdaService.selectJobDetailByTray(trayCodeMsg);
     }
 
@@ -129,9 +183,6 @@ public class PdaController extends BaseController {
     }
 
 
-
-
-
     /**
      * 入库扫码生成作业
      */
@@ -142,7 +193,6 @@ public class PdaController extends BaseController {
     }
 
 
-
     @RequestMapping("/selectDetailByPDTray")
     @ResponseBody
     public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
@@ -150,9 +200,6 @@ public class PdaController extends BaseController {
     }
 
 
-
-
-
     /**
      * 盘点出库确认
      *
@@ -161,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);
@@ -179,6 +226,245 @@ public class PdaController extends BaseController {
         return pdaService.updateWcsPort(wcsPort);
     }
 
+    @RequestMapping("/hcoutMakesure")
+    @ResponseBody
+    @Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER)
+    public AjaxResult hcoutMakesure(String trayCode) {
+
+        return pdaService.hcoutMakesure(trayCode);
+    }
+
+
+    /**
+     * 平库入库
+     */
+    @RequestMapping("/inStockPk")
+    @ResponseBody
+    public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.completeInPk(trayCodeMakeSure);
+    }
+
+    /**
+     * 库存查询(平库扫码查询托盘入库信息)
+     */
+    @RequestMapping("/searchStock")
+    @ResponseBody
+    public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+
+        return pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode());
+    }
+
+    /**
+     * 立库出库信息校验
+     *
+     * @param trayCodeMakeSure
+     * @return
+     */
+    @RequestMapping("/verifyMaterial")
+    @ResponseBody
+    public AjaxResult verifyMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        String trayCode = trayCodeMakeSure.getTrayCode();
+        List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+        for (MydoJobDetail m : mydoJobDetailList) {
+            Integer count = pdaService.selectByTrayCodeAndProduct(trayCode, m.getProductId());
+            if (count == 0) {
+                return AjaxResult.error(m.getProductId() + ",物料不是出库物料");
+            }
+        }
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 平库出库确认
+     *
+     * @param trayCodeMakeSure
+     * @return
+     */
+    @RequestMapping("/completeOutPk")
+    @ResponseBody
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeOutPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        try {
+            String trayCode = trayCodeMakeSure.getTrayCode();
+            List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+            for (MydoJobDetail m : mydoJobDetailList) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("v_tray_code", trayCode);
+                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);
+                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());
+                }
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 查询平库出库主单   建议参数（erpStockOutId U8单据号作为查询条件传到后台）
+     *
+     * @param outStockout
+     * @return
+     */
+    @RequestMapping("/OutFillPk")
+    @ResponseBody
+
+    public AjaxResult OutFillPk() {
+        OutStockout outStockout = new OutStockout();
+        outStockout.setWarehouseId("2");
+        outStockoutService.selectOutStockoutList(outStockout);
+        return AjaxResult.success(outStockoutService.selectOutStockoutList(outStockout));
+    }
+
+
+    /**
+     * 查出平库出库子单   参数： stockoutId 作为参数传递到后台
+     *
+     * @param outStockout
+     * @return
+     */
+    @RequestMapping("/OutFillPkDetail")
+    @ResponseBody
+    public AjaxResult OutFillPkDetail(@RequestBody OutStockout outStockout) {
+
+        List<OutStockout> outStockouts = outStockoutService.selectOutStockoutList(outStockout);
+
+        return AjaxResult.success(outStockoutDetailService.selectOutStockoutDetailByStockoutGuid(outStockouts.get(0).getStockoutGuid()));
+    }
+
+
+    /**
+     * 查询平库出库子单对应信息 在平库中是否存在
+     * 参数:trayCode      托盘码
+     * 参数：stockinDetailId 子单据号
+     *
+     * @param trayCodeMsg
+     * @return
+     */
+    @RequestMapping("/queryBasStockHc")
+    @ResponseBody
+    public AjaxResult queryBasStockHc(@RequestBody TrayCodeMsg trayCodeMsg) {
+        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.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 3e30ebe..786c2aa 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
@@ -1,5 +1,6 @@
 package com.ruoyi.pda.domain;
 
+import com.ruoyi.job.mydojob.domain.PkDetail;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,10 +23,18 @@ public class TrayCodeMakeSure {
 
     private String exitId;
     private String isFull;
+    // 选中传1 没选中传0
+    private String isBoundByAccord;
     //拣选详情列表
     private List<MydoJobDetail> mydoJobDetailList;
     //盘点详情列表
     private List<MydoJobDetail> materials;
     //异常详情列表
     private List<MydoJobDetail> materialDetails;
+    private List<PkDetail> pkDetailList;
+    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 ef453f3..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,6 +20,26 @@ private String stockinDetailId;
 
 private String inOut;
 private String status;
+private String stockoutDetailId;
+
+
+    public String getStockoutDetailId() {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    private String trayType;
+
+    public String getTrayType() {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType) {
+        this.trayType = trayType;
+    }
 
     public String getStatus() {
         return status;
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 64290a8..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
@@ -38,4 +38,18 @@ public interface PdaMapper {
     void pkOut(HashMap<String, Object> map);
 
     void outMakeSureException(HashMap<String, Object> map);
+
+    void hcoutMakesure(HashMap<String, Object> map);
+
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
+
+    void completeOutPk(HashMap<String, Object> map);
+
+    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 767242a..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
@@ -8,6 +8,7 @@ import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.stock.stock.domain.BasStock;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -28,7 +29,7 @@ public interface PdaService {
 
    AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure);
 
-   AjaxResult tpIn(String trayCode);
+   AjaxResult tpIn(TrayCodeMsg trayCodeMsg);
 
    AjaxResult tpOut(TrayCodeMsg trayCodeMsg);
 
@@ -56,4 +57,19 @@ public interface PdaService {
     AjaxResult updateWcsPort(WcsPort wcsport);
 
 
+    AjaxResult hcoutMakesure(String trayCode);
+
+    AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure);
+
+    AjaxResult selectBasStockHc(String trayCode);
+
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
+
+    void completeOutPk(HashMap<String, Object> map);
+
+    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 ba4607b..0af0753 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
@@ -9,17 +9,20 @@ import com.ruoyi.api.service.IToWmsService;
 import com.ruoyi.check.commit.domain.CheckCommitRecord;
 import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
 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;
 import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.domain.PkDetail;
+import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
 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 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -60,14 +64,21 @@ public class PdaServiceImp implements PdaService {
     private BasStockMapper basStockMapper;
     @Autowired
     private IInStockinService inStockinService;
-
+    @Autowired
+    private OutStockoutDetailServiceImpl outStockoutDetailService;
+    @Autowired
+    private MydoJobMapper mapper;
 
     @Override
     public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
         InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockinDetail.getSpare4());
         List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
+        Integer count = mapper.selectBySpare4OrCargo(inStockinDetail);
+        if (count > 0) {
+            return null;
+        }
         return hasHalfTray;
     }
 
@@ -75,16 +86,16 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult halfTrayOut(TrayCodeMsg trayCodeMsg) {
         InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(trayCodeMsg.getStockinDetailId());
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
         List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", hasHalfTray.get(0).getTrayCode());
-        map.put("v_exit_id",trayCodeMsg.getExitId());
+        map.put("v_exit_id", trayCodeMsg.getExitId());
         pdaMapper.halfTrayOut(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
 
@@ -112,40 +123,38 @@ 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());
             map.put("v_stockin_detail_id", mydoJobDetail.getStockinDetailId());
+            map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
             map.put("v_quantity", Integer.valueOf(mydoJobDetail.getInQuantity()));
             pdaMapper.bindTray(map);
             if (!"10".equals(map.get("v_result").toString())) {
                 errorbulider.append(mydoJobDetail.getStockinDetailId() + map.get("v_resultmsg").toString());
-                return AjaxResult.error(errorbulider.toString());
+                throw new RuntimeException(map.get("v_result").toString());
             }
-
         }
-
         HashMap<String, Object> map = new HashMap<>();
         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(errorbulider.toString());
+            throw new RuntimeException(map.get("v_result").toString());
         }
-
         return AjaxResult.success();
     }
 
     @Override
-    public AjaxResult tpIn(String trayCode) {
+    public AjaxResult tpIn(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_tray_code", trayCode);
+        map.put("v_tray_code", trayCodeMsg.getTrayCode());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
+        map.put("v_quantity", Integer.valueOf(trayCodeMsg.getInQuantity()));
         pdaMapper.tpIn(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
 
@@ -155,11 +164,11 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult tpOut(TrayCodeMsg trayCodeMsg) {
 
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_exit_id", trayCodeMsg.getExitId());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
         pdaMapper.tpOut(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
     }
@@ -197,10 +206,12 @@ 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("26");
+        mydoJob.setInOrOut("28");
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
+
         return AjaxResult.success(mydoJobDetails);
     }
 
@@ -237,9 +248,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("该物料没有盘点出库作业，请检查");
@@ -249,7 +260,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) {
                 //插入盘点提交表
@@ -287,4 +298,104 @@ public class PdaServiceImp implements PdaService {
         AjaxResult ajaxResult = toWcsService.updateWcsPort(wcsport);
         return ajaxResult;
     }
+
+    @Override
+    public AjaxResult hcoutMakesure(String trayCode) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCode);
+        pdaMapper.hcoutMakesure(map);
+        String result = map.get("v_result").toString();
+        if ("10".equals(result)) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error(map.get("v_resultmsg").toString());
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) {
+        for (PkDetail pkDetail : trayCodeMakeSure.getPkDetailList()) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+            map.put("v_in_stockin_detail_id", pkDetail.getStockinDetailId());
+            map.put("v_quantity", pkDetail.getQuantity());
+            map.put("v_cargo_space_id", trayCodeMakeSure.getCargoSpaceId());
+            pdaMapper.completeInPk(map);
+
+            if (!"10".equals(String.valueOf(map.get("v_result")))) {
+                String errorMessage = Objects.toString(map.get("v_result_msg"), "平库入库失败");
+                throw new ServiceException(errorMessage);
+            }
+        }
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult selectBasStockHc(String trayCode) {
+        BasStock basStock = new BasStock();
+        basStock.setTrayCode(trayCode);
+        List<BasStock> stocks = basStockMapper.selectBasStockListHc(basStock);
+        if (stocks.size() > 0) {
+            return AjaxResult.success(stocks);
+        } else {
+            return AjaxResult.error("无库存信息");
+        }
+    }
+
+    @Override
+    public Integer selectByTrayCodeAndProduct(String trayCode, String productId) {
+        return pdaMapper.selectByTrayCodeAndProduct(trayCode, productId);
+    }
+
+    @Override
+    public void completeOutPk(HashMap<String, Object> map) {
+        pdaMapper.completeOutPk(map);
+    }
+
+    @Override
+    public Integer selectBasStockHcCount(String trayCode, String 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/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 d630f00..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;
 
@@ -73,4 +74,20 @@ public interface BasStockMapper
     List<BasStock> getStockBySerial(String trayCode);
 
     List<BasStock> selectHasHalfTray(InStockinDetail inStockinDetail);
+
+    List<BasStock> selectBasStockHcCount(BasStock  basStock);
+
+    List<BasStock> selectBasStockListHc(BasStock basStock);
+
+    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-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a75fd22..c7b9fab 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,14 +6,14 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://172.16.4.141:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
+                url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
                 username: sa
                 password: Flrd0914.
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: jdbc:mariadb://172.16.4.141:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mariadb://172.16.4.12:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: Flrd0914.
             # 初始连接数
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 14ccea8..2608eb5 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -66,12 +66,12 @@ spring:
   devtools:
     restart:
       # 热部署开关
-      enabled: true
+      enabled: false
   data:
     # redis 配置
     redis:
       # 地址
-      host: 172.16.4.141
+      host: 127.0.0.1
       # 端口，默认为6379
       port: 6379
       # 数据库索引
@@ -133,7 +133,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  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 6a067bb..e3198e8 100644
--- a/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -19,21 +19,21 @@ 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">
         <include refid="selectAgvContainerTaskVo"/>
         <where>
-            <if test="container != null  and container != ''"> and container = #{container}</if>
-            <if test="startPoint != null  and startPoint != ''"> and start_point = #{startPoint}</if>
-            <if test="endPoint != null  and endPoint != ''"> and end_point = #{endPoint}</if>
-            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
+            <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 = #{status}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</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>
 
@@ -101,4 +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/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml
index 99c335a..2ed84a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -28,14 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
         <include refid="selectChatMessageVo"/>
         <where>
-            <if test="sessionId != null "> and session_id = #{sessionId}</if>
-            <if test="conversationId != null "> and conversation_id = #{conversationId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="role != null  and role != ''"> and role = #{role}</if>
-            <if test="deductCost != null "> and deduct_cost = #{deductCost}</if>
-            <if test="totalTokens != null "> and total_tokens = #{totalTokens}</if>
+            <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 = #{createDept}</if>
+            <if test="createDept != null "> and create_dept like concat('%', #{createDept}, '%')</if>
         </where>
         order by create_time asc
     </select>
@@ -115,3 +115,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from chat_message where conversation_id = #{conversationId}
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml
index 62ac9b6..2d43b17 100644
--- a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
         <include refid="selectConversationsVo"/>
         <where>
-            <if test="sessionId != null  and sessionId != ''"> and session_id = #{sessionId}</if>
-            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="metadata != null  and metadata != ''"> and metadata = #{metadata}</if>
-            <if test="firstQuery != null  and firstQuery != ''"> and first_query = #{firstQuery}</if>
-            <if test="messageCount != null "> and message_count = #{messageCount}</if>
-            <if test="tokenUsage != null "> and token_usage = #{tokenUsage}</if>
-            <if test="createdAt != null "> and created_at = #{createdAt}</if>
-            <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
-            <if test="lastInteractionAt != null "> and last_interaction_at = #{lastInteractionAt}</if>
+            <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>
@@ -105,3 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml
index 75155ec..a4cc5a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
         <include refid="selectKnowledgeFileVo"/>
         <where>  
-            <if test="knowledgeBaseId != null "> and knowledge_base_id = #{knowledgeBaseId}</if>
+            <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 = #{filePath}</if>
-            <if test="fileSize != null "> and file_size = #{fileSize}</if>
-            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="isVectorized != null "> and is_vectorized = #{isVectorized}</if>
-            <if test="vectorizedTime != null "> and vectorized_time = #{vectorizedTime}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
-            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</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>
     
@@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml
new file mode 100644
index 0000000..7c1519e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml
@@ -0,0 +1,108 @@
+<?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/bas/AgvPointMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
new file mode 100644
index 0000000..cedacf6
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
@@ -0,0 +1,82 @@
+<?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.agvPoint.mapper.AgvPointMapper">
+    
+    <resultMap type="AgvPoint" id="AgvPointResult">
+        <result property="id"    column="id"    />
+        <result property="station"    column="station"    />
+        <result property="type"    column="type"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectAgvPointVo">
+        select id, station, type, remark, spare1, spare2, spare3 from agv_point
+    </sql>
+
+    <select id="selectAgvPointList" parameterType="AgvPoint" resultMap="AgvPointResult">
+        <include refid="selectAgvPointVo"/>
+        <where>  
+            <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>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+        </where>
+    </select>
+    
+    <select id="selectAgvPointById" parameterType="String" resultMap="AgvPointResult">
+        <include refid="selectAgvPointVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAgvPoint" parameterType="AgvPoint">
+        insert into agv_point
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="station != null">station,</if>
+            <if test="type != null">type,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="station != null">#{station},</if>
+            <if test="type != null">#{type},</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>
+         </trim>
+    </insert>
+
+    <update id="updateAgvPoint" parameterType="AgvPoint">
+        update agv_point
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="station != null">station = #{station},</if>
+            <if test="type != null">type = #{type},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAgvPointById" parameterType="String">
+        delete from agv_point where id = #{id}
+    </delete>
+
+    <delete id="deleteAgvPointByIds" parameterType="String">
+        delete from agv_point where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml
index 707d37e..914c453 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasContainerDetailsList" parameterType="BasContainerDetails" resultMap="BasContainerDetailsResult">
         <include refid="selectBasContainerDetailsVo"/>
         <where>  
-            <if test="containerId != null  and containerId != ''"> and container_id = #{containerId}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <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 = #{quantity}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</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="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>
     
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml
index 9fd4d17..12a8819 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{portName}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="productTypeQuantity != null "> and product_type_quantity = #{productTypeQuantity}</if>
-            <if test="updateTime != null  and updateTime != ''"> and update_time = #{updateTime}</if>
-            <if test="operationMan != null  and operationMan != ''"> and operation_man = #{operationMan}</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>
     
@@ -102,4 +102,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPortNames" resultType="string">
         SELECT DISTINCT port_name FROM bas_product_port WHERE port_name != null or port_name != ''
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml
index d762e50..35e7956 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{useable}</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>
@@ -149,4 +149,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml
index ba52e38..98985bc 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -34,25 +34,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasJobIdList" parameterType="BasJobId" resultMap="BasJobIdResult">
         <include refid="selectBasJobIdVo"/>
         <where>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="jobDetail != null  and jobDetail != ''"> and job_detail = #{jobDetail}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="exorderId != null  and exorderId != ''"> and Exorder_id = #{exorderId}</if>
-            <if test="jobIdR != null  and jobIdR != ''"> and job_id_R = #{jobIdR}</if>
-            <if test="jobDetailR != null  and jobDetailR != ''"> and job_detail_R = #{jobDetailR}</if>
-            <if test="jobIdC != null  and jobIdC != ''"> and job_id_C = #{jobIdC}</if>
-            <if test="jobDetailC != null  and jobDetailC != ''"> and job_detail_C = #{jobDetailC}</if>
-            <if test="tempOrderId != null  and tempOrderId != ''"> and temp_order_id = #{tempOrderId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
-            <if test="planId != null  and planId != ''"> and plan_id = #{planId}</if>
-            <if test="jobIdY != null  and jobIdY != ''"> and job_id_y = #{jobIdY}</if>
-            <if test="jobIdS != null  and jobIdS != ''"> and job_id_s = #{jobIdS}</if>
+            <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>
 
@@ -162,3 +162,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 </mapper>
+
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/BasProductCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml
index 5477ce9..fa70aca 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
         <include refid="selectBasProductCodeVo"/>
         <where>  
-            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <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>
@@ -39,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{type}</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="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>
     
@@ -129,4 +129,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml
index 2fb90aa..690dd4a 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{portType}</if>
-            <if test="portDesc != null  and portDesc != ''"> and port_desc = #{portDesc}</if>
-            <if test="createMan != null  and createMan != ''"> and create_man = #{createMan}</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>
     
@@ -74,4 +74,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml
index ecc6728..53bfd74 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
         <include refid="selectBasProductPortRelVo"/>
         <where>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="portId != null  and portId != ''"> and port_id = #{portId}</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="portId != null  and portId != ''"> and port_id like concat('%', #{portId}, '%')</if>
         </where>
     </select>
 
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{productId}</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>
 
@@ -112,3 +112,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
index 0ca261a..4bb69c0 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
         <include refid="selectBasRoadwayVo"/>
         <where>  
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <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 = #{deviceId}</if>
-            <if test="inLocked != null  and inLocked != ''"> and in_locked = #{inLocked}</if>
-            <if test="outLocked != null  and outLocked != ''"> and out_locked = #{outLocked}</if>
-            <if test="inLocked2 != null  and inLocked2 != ''"> and in_locked2 = #{inLocked2}</if>
-            <if test="outLocked2 != null  and outLocked2 != ''"> and out_locked2 = #{outLocked2}</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>
     
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml
index b3bbc6b..434e1d9 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{useable}</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>
@@ -139,4 +139,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml
index 1d81f5b..4be0cb1 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
         <include refid="selectBasTagVo"/>
         <where>
-            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
-            <if test="pickAdd != null  and pickAdd != ''"> and pick_add = #{pickAdd}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="curNum != null  and curNum != ''"> and cur_num = #{curNum}</if>
-            <if test="sendCompleted != null  and sendCompleted != ''"> and send_completed = #{sendCompleted}</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="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>
 
@@ -93,3 +93,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml
index 791a9ff..33caa50 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</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>
     
@@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
index 631bd54..9adf098 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasTraycodeList" parameterType="BasTraycode" resultMap="BasTraycodeResult">
         <include refid="selectBasTraycodeVo"/>
         <where>
-            <if test="formatId != null "> and bt.format_id = #{formatId}</if>
+            <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 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and bt.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and bt.spare3 = #{spare3}</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>
 
@@ -98,3 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml
index 12d8f18..26b7155 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -19,10 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasWarehousePortList" parameterType="BasWarehousePort" resultMap="BasWarehousePortResult">
         <include refid="selectBasWarehousePortVo"/>
         <where>  
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="portCode != null  and portCode != ''"> and port_code = #{portCode}</if>
+            <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 = #{portType}</if>
+            <if test="portType != null  and portType != ''"> and port_type like concat('%', #{portType}, '%')</if>
         </where>
     </select>
     
@@ -70,4 +70,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</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 0b306a1..ce02176 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -63,24 +63,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{warehouseId}</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and bcs.cargo_area_id = #{cargoAreaId}</if>
-            <if test="theType != null  and theType != ''"> and bcs.the_type = #{theType}</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 = #{thePlatoon}</if>
-            <if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
-            <if test="status != null  and status != ''"> and bcs.status = #{status}</if>
-            <if test="locked != null  and locked != ''"> and bcs.locked = #{locked}</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 = #{cargoHight}</if>
-            <if test="issDouble != null  and issDouble != ''"> and bcs.iss_double = #{issDouble}</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and bcs.group_coding_no = #{groupCodingNo}</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and bcs.group_coding = #{groupCoding}</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and bcs.cargo_space_logo = #{cargoSpaceLogo}</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and bcs.this_cargo_area = #{thisCargoArea}</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>
@@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE status = '1'
           and locked = 'N'
         <if test="warehouseId != null">
-            and warehouse_id = #{warehouseId}
+            and warehouse_id like concat('%', #{warehouseId}, '%')
         </if>
         <if test="roadwayId != null">
-            and roadway_id = #{roadwayId}
+            and roadway_id like concat('%', #{roadwayId}, '%')
         </if>
         ORDER BY the_platoon, the_floor,the_column
     </select>
@@ -202,13 +202,9 @@ 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 ('1', '2')
+        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,
@@ -219,18 +215,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           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 = #{warehouseId}</if>
-        <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</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="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-        <if test="thePlatoon != null "> and bcs.the_platoon = #{thePlatoon}</if>
-        <if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
-        <if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
-        <if test="status != null  and status != ''"> and bcs.status = #{status}</if>
-        <if test="locked != null  and locked != ''"> and bcs.locked = #{locked}</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 = #{spare7}</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/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
index 44029d8..c3bf2f8 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseName != null  and warehouseName != ''">and warehouse_name like concat('%',
                 #{warehouseName}, '%')
             </if>
-            <if test="address != null  and address != ''">and address = #{address}</if>
-            <if test="cDesc != null  and cDesc != ''">and c_desc = #{cDesc}</if>
-            <if test="warehouseKind != null  and warehouseKind != ''">and warehouse_kind = #{warehouseKind}</if>
-            <if test="warehouseType != null  and warehouseType != ''">and warehouse_type = #{warehouseType}</if>
-            <if test="isCurrent != null  and isCurrent != ''">and is_current = #{isCurrent}</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=")">
@@ -111,3 +111,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml
index 35ec7e1..86061f3 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -21,13 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
         <include refid="selectCheckCommitRecordVo"/>
         <where>  
-            <if test="pdGuid != null "> and pd_guid = #{pdGuid}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</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="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>
     
@@ -79,4 +79,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{pdGuid}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml
index 6aa0b1c..92da99d 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -72,46 +72,46 @@
         <include refid="selectCheckDifferenceRecordVo"/>
         <where>
             <if test="checkStockDetailId != null  and checkStockDetailId != ''">
-                and r.check_stock_detail_id = #{checkStockDetailId}
+                and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%')
             </if>
             <if test="stockId != null  and stockId != ''">
-                and r.stock_id = #{stockId}
+                and r.stock_id like concat('%', #{stockId}, '%')
             </if>
             <if test="trayCode != null  and trayCode != ''">
-                and r.tray_code = #{trayCode}
+                and r.tray_code like concat('%', #{trayCode}, '%')
             </if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''">
-                and r.cargo_space_id = #{cargoSpaceId}
+                and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
             </if>
             <if test="productId != null  and productId != ''">
-                and r.product_id = #{productId}
+                and r.product_id like concat('%', #{productId}, '%')
             </if>
             <if test="lotNo != null  and lotNo != ''">
-                and r.lot_no = #{lotNo}
+                and r.lot_no like concat('%', #{lotNo}, '%')
             </if>
             <if test="supplier != null  and supplier != ''">
-                and r.supplier = #{supplier}
+                and r.supplier like concat('%', #{supplier}, '%')
             </if>
             <if test="customer != null  and customer != ''">
-                and r.customer = #{customer}
+                and r.customer like concat('%', #{customer}, '%')
             </if>
             <if test="oldQuantity != null  and oldQuantity != ''">
-                and r.old_quantity = #{oldQuantity}
+                and r.old_quantity like concat('%', #{oldQuantity}, '%')
             </if>
             <if test="newQuantity != null  and newQuantity != ''">
-                and r.new_quantity = #{newQuantity}
+                and r.new_quantity like concat('%', #{newQuantity}, '%')
             </if>
             <if test="recordType != null ">
-                and r.record_type = #{recordType}
+                and r.record_type like concat('%', #{recordType}, '%')
             </if>
             <if test="productGuid != null  and productGuid != ''">
-                and r.product_guid = #{productGuid}
+                and r.product_guid like concat('%', #{productGuid}, '%')
             </if>
             <if test="status != null  and status != ''">
-                and r.status = #{status}
+                and r.status like concat('%', #{status}, '%')
             </if>
             <if test="warehouseId != null  and warehouseId != ''">
-                and r.warehouse_id = #{warehouseId}
+                and r.warehouse_id like concat('%', #{warehouseId}, '%')
             </if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
@@ -200,3 +200,4 @@
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
index 29b0b26..89d9a8c 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -72,46 +72,46 @@
         <include refid="selectCheckDifferenceRecordVo"/>
         <where>
             <if test="checkStockDetailId != null  and checkStockDetailId != ''">
-                and r.check_stock_detail_id = #{checkStockDetailId}
+                and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%')
             </if>
             <if test="stockId != null  and stockId != ''">
-                and r.stock_id = #{stockId}
+                and r.stock_id like concat('%', #{stockId}, '%')
             </if>
             <if test="trayCode != null  and trayCode != ''">
-                and r.tray_code = #{trayCode}
+                and r.tray_code like concat('%', #{trayCode}, '%')
             </if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''">
-                and r.cargo_space_id = #{cargoSpaceId}
+                and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
             </if>
             <if test="productId != null  and productId != ''">
-                and r.product_id = #{productId}
+                and r.product_id like concat('%', #{productId}, '%')
             </if>
             <if test="lotNo != null  and lotNo != ''">
-                and r.lot_no = #{lotNo}
+                and r.lot_no like concat('%', #{lotNo}, '%')
             </if>
             <if test="supplier != null  and supplier != ''">
-                and r.supplier = #{supplier}
+                and r.supplier like concat('%', #{supplier}, '%')
             </if>
             <if test="customer != null  and customer != ''">
-                and r.customer = #{customer}
+                and r.customer like concat('%', #{customer}, '%')
             </if>
             <if test="oldQuantity != null  and oldQuantity != ''">
-                and r.old_quantity = #{oldQuantity}
+                and r.old_quantity like concat('%', #{oldQuantity}, '%')
             </if>
             <if test="newQuantity != null  and newQuantity != ''">
-                and r.new_quantity = #{newQuantity}
+                and r.new_quantity like concat('%', #{newQuantity}, '%')
             </if>
             <if test="recordType != null ">
-                and r.record_type = #{recordType}
+                and r.record_type like concat('%', #{recordType}, '%')
             </if>
             <if test="productGuid != null  and productGuid != ''">
-                and r.product_guid = #{productGuid}
+                and r.product_guid like concat('%', #{productGuid}, '%')
             </if>
             <if test="status != null  and status != ''">
-                and r.status = #{status}
+                and r.status like concat('%', #{status}, '%')
             </if>
             <if test="warehouseId != null  and warehouseId != ''">
-                and r.warehouse_id = #{warehouseId}
+                and r.warehouse_id like concat('%', #{warehouseId}, '%')
             </if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
@@ -200,3 +200,4 @@
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
index 46ecb11..52358bd 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -98,34 +98,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
         <include refid="selectCheckStockinDetailFinishVo"/>
         <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</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="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
+            <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>
 
@@ -137,34 +137,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultMap="CheckStockinDetailResult">
         <include refid="selectCheckStockinDetailVo"/>
         <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and csd.product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and csd.quantity = #{quantity}</if>
-            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
-            <if test="price != null  and price != ''"> and csd.price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null  and printDate != ''"> and csd.print_date = #{printDate}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and csd.customer_id = #{customerId}</if>
-            <if test="unit != null  and unit != ''"> and csd.unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and csd.spec = #{spec}</if>
-            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
-            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 = #{spare6}</if>
+            <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>
 
@@ -283,3 +283,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
index 3568f9f..7058fc2 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -63,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
         <include refid="selectCheckStockinDetailVo"/>
         <where>
-            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and csd.product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and csd.quantity = #{quantity}</if>
-            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
-            <if test="price != null  and price != ''"> and csd.price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null  and printDate != ''"> and csd.print_date = #{printDate}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and csd.customer_id = #{customerId}</if>
-            <if test="unit != null  and unit != ''"> and csd.unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and csd.spec = #{spec}</if>
-            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
-            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 = #{spare6}</if>
+            <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>
 
@@ -235,3 +235,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from check_stockin_detail where stock_check_id = #{stockCheckId}
     </select>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
index c098c28..18c6a9c 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -59,24 +59,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
         <include refid="selectCheckStockinFinishVo"/>
         <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
-            <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+            <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>
 
@@ -87,24 +87,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckStockinList" resultMap="CheckStockinResult">
         <include refid="selectCheckStockinVo"/>
         <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
-            <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and csf.warehouse_id = #{warehouseId}</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</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="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>
@@ -194,3 +194,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
index 5a369f9..21302a5 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -58,24 +58,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
         <include refid="selectCheckStockinVo"/>
         <where>
-            <if test="stockCheckId != null  and stockCheckId != ''"> and cs.stock_check_id = #{stockCheckId}</if>
-            <if test="checkType != null  and checkType != ''"> and cs.check_type = #{checkType}</if>
-            <if test="createDate != null  and createDate != ''"> and cs.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and cs.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and cs.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and cs.warehouse_id = #{warehouseId}</if>
-            <if test="finishDate != null  and finishDate != ''"> and cs.finish_date = #{finishDate}</if>
-            <if test="erpBill != null  and erpBill != ''"> and cs.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and cs.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and cs.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and cs.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and cs.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and cs.supplier_no = #{supplierNo}</if>
-            <if test="spare1 != null  and spare1 != ''"> and cs.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and cs.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and cs.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and cs.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and cs.spare5 = #{spare5}</if>
+            <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>
@@ -183,3 +183,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml
index 36519fa..fa0edd4 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -27,38 +27,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 from in_stockin_back
+               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 = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
-            <if test="sendStatus != null  and sendStatus != ''"> and send_status = #{sendStatus}</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time = #{sendTime}</if>
-            <if test="msg != null  and msg != ''"> and msg = #{msg}</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="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>
     
@@ -146,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="senTime != null">send_time = #{senTime},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
             <if test="msg != null">msg = #{msg},</if>
         </trim>
         where stockin_guid = #{stockinGuid}
@@ -165,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTopInStockin" resultMap="InStockinBackResult">
         select top(1) *
-        from in_stockin_back where status= 0
+        from in_stockin_back where send_status= 0 and stock_source =1
 
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml
index 3d14518..797c3c1 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -42,53 +42,95 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 from in_stockin_detail_back
+        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 = #{stockinGuid}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</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="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 = #{spare9}</if>
+            <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 = #{sendStatus}</if>
-            <if test="sendTime != null  and sendTime != ''"> and send_time = #{sendTime}</if>
-            <if test="msg != null  and msg != ''"> and msg = #{msg}</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>
     
@@ -189,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update in_stockin_detail_back
         <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">lot_no = #{lotNo},</if>
             <if test="productGuid != null">product_guid = #{productGuid},</if>
             <if test="productId != null and productId != ''">product_id = #{productId},</if>
@@ -222,10 +264,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="senTime != null">send_time = #{senTime},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
             <if test="msg != null">msg = #{msg},</if>
         </trim>
-        where stockin_detail_id = #{stockinDetailId}
+        where stockin_id = #{stockinId}
     </update>
 
     <delete id="deleteInStockinDetailBackByStockinDetailId" parameterType="String">
@@ -238,4 +280,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockinDetailId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+
+    <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/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
index 8a9d58d..67aa1e0 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -103,34 +103,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
         <include refid="selectInStockinDetailFinishVo"/>
         <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
-            <if test="price != null and price != ''"> and isd.price = #{price}</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
-            <if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
-            <if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
+            <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>
 
@@ -142,34 +142,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultMap="InStockinDetailResult">
         <include refid="selectInStockinDetailFinishVo"/>
         <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
-            <if test="price != null and price != ''"> and isd.price = #{price}</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
-            <if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
-            <if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
+            <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>
 
@@ -288,3 +288,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
index 4e3ad1a..ce913a5 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -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"    />-->
@@ -69,40 +70,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
         <include refid="selectInStockinDetailVo"/>
         <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
-            <if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
-            <if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
-            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
-            <if test="price != null and price != ''"> and isd.price = #{price}</if>
-            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
-            <if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
-            <if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
-            <if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
-            <if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
-            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
+            <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}
+        where stockin_detail_id = #{stockinDetailId} or bar_code=#{stockinDetailId}
     </select>
 
     <insert id="insertInStockinDetail" parameterType="InStockinDetail">
@@ -143,7 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
             <if test="productName != null">product_name,</if>
-         </trim>
+            <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>
@@ -180,7 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
             <if test="productName != null">#{productName},</if>
-         </trim>
+
+            <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
@@ -333,4 +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 5a19b7d..81cad95 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -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
@@ -86,24 +87,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
         <include refid="selectInStockinFinishVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and is2.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
-            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 = #{spare5}</if>
+            <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="stockinDetailId != null  and stockinDetailId != ''"> and is3.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
         </where>
     </select>
 
@@ -121,24 +123,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
         <include refid="selectInStockinFinishVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and is2.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
-            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
-            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 = #{spare5}</if>
+            <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
@@ -241,3 +243,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
index 345e5e6..d1d5edd 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -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,33 +54,39 @@ 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="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
+
+
+    <select id="selectInStockinListBill" parameterType="InStockin" resultMap="InStockinResult">
         <include refid="selectInStockinVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and is2.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
+            <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 = #{stockSource}</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 = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</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 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 = #{spare5}</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
@@ -87,6 +94,98 @@ 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
+                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>
+            <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="productId !=null and productId!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+
+                where isd.product_id like concat('%',#{productId},'%')
+                )
+            </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
@@ -138,7 +237,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4,</if>
             <if test="spare3 != null">spare3,</if>
             <if test="spare5 != null">spare5,</if>
-         </trim>
+            <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>
@@ -159,7 +260,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">#{spare4},</if>
             <if test="spare3 != null">#{spare3},</if>
             <if test="spare5 != null">#{spare5},</if>
-         </trim>
+            <if test="companyShortName != null">#{companyShortName},</if>
+            <if test="accountSetNo != null">#{accountSetNo},</if>
+        </trim>
     </insert>
     <insert id="insertInStockinHistory">
         insert into in_stockin_finish
@@ -187,6 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -237,3 +342,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </where>
      </select>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml
index 8fcd1e0..88eaed5 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
         <include refid="selectTransferBillCallbackVo"/>
         <where>  
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</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="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>
     
@@ -92,4 +92,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
index dd402f1..f32aeea 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -84,32 +84,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 = #{jobDetailId}</if>
-            <if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
-            <if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
-            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
-            <if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
-            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
-            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
-            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
-            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
-            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
-            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
-            <if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
-            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
-            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
-            <if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
-            <if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
-            <if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
-            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
-            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
+            <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>
 
@@ -299,3 +299,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
index 1222e25..4eac9a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -87,32 +87,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 = #{jobDetailId}</if>
-            <if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
-            <if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
-            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
-            <if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
-            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
-            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
-            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
-            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
-            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
-            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
-            <if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
-            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
-            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
-            <if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
-            <if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
-            <if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
-            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
-            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
+            <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>
@@ -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,11 +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
+        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 f35a52a..63e01f3 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -60,30 +60,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
         <include refid="selectMydoJobFinishVo"/>
         <where>
-            <if test="jobId != null  and jobId != ''"> and mj.job_id = #{jobId}</if>
-            <if test="status != null  and status != ''"> and mj.status = #{status}</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no = #{taskNo}</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
-            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
-            <if test="priority != null "> and mj.priority = #{priority}</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
+            <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 = #{entranceId}</if>
-            <if test="exitId != null  and exitId != ''"> and mj.exit_id = #{exitId}</if>
-            <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</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>
@@ -118,38 +118,40 @@ 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 = #{jobId}</if>
-            <if test="status != null  and status != ''"> and mj.status = #{status}</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no = #{taskNo}</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
+            <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 = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</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 = #{workshopId}</if>
-            <if test="priority != null "> and mj.priority = #{priority}</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{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 = #{entranceId}</if>
-            <if test="exitId != null  and exitId != ''"> and mj.exit_id = #{exitId}</if>
-            <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</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 &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>
+            <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>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and  mjd.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+
             order by mj.create_time desc
         </where>
 
@@ -260,3 +262,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index fb6af52..d78cd6f 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -75,35 +75,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join mydo_job_detail mjd on mj.job_id = mjd.job_id
 
         <where>
-            <if test="jobId != null  and jobId != ''"> and mj.job_id = #{jobId}</if>
-            <if test="status != null  and status != ''"> and mj.status = #{status}</if>
-            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
-            <if test="taskNo != null  and taskNo != ''"> and mj.task_no = #{taskNo}</if>
-            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
+            <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 = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</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 = #{workshopId}</if>
-            <if test="priority != null "> and mj.priority = #{priority}</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</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 = #{classId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</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>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and  mjd.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
         </where>
         order by mj.create_time desc
     </select>
@@ -205,6 +206,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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}
@@ -237,10 +244,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
         select top(1)* from mydo_job mj
-        where in_or_out&lt;20 and mj.entrance_id = #{entranceId}
-          and mj.status = #{status}
-        <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
-        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
+        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>
 
@@ -260,11 +267,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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_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>
+
+
+<select id="selectBySpare4OrCargo" parameterType="InStockinDetail" resultType="java.lang.Integer">
+    select count(1) from mydo_job where job_id in (select job_id from mydo_job_detail where spare4=#{spare4} or exit_id =#{cargoNo}) and in_or_out='26'
+</select>
+
+
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml
index 9e432c3..f34c2db 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -22,13 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutExceptionRecordList" parameterType="OutExceptionRecord" resultMap="OutExceptionRecordResult">
         <include refid="selectOutExceptionRecordVo"/>
         <where>  
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</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="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>
     
@@ -83,4 +83,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{outGuid}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml
index 37685d6..98b9731 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -25,16 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutPickSubmitList" parameterType="OutPickSubmit" resultMap="OutPickSubmitResult">
         <include refid="selectOutPickSubmitVo"/>
         <where>  
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</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="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>
     
@@ -98,4 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml
new file mode 100644
index 0000000..0e0f8cd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml
@@ -0,0 +1,225 @@
+<?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/out/OutStockoutDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml
new file mode 100644
index 0000000..0b13b37
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml
@@ -0,0 +1,320 @@
+<?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/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
index 0bf97cb..56d4ac2 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -90,36 +90,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutStockoutDetailFinishList" parameterType="OutStockoutDetailFinish" resultMap="OutStockoutDetailFinishResult">
         <include refid="selectOutStockoutDetailFinishVo"/>
         <where>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null "> and quantity = #{quantity}</if>
-            <if test="quantityX != null "> and quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null "> and quantity_j = #{quantityJ}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null "> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null "> and assign_num_j = #{assignNumJ}</if>
-            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
-            <if test="allotQuantityX != null "> and allot_quantity_x = #{allotQuantityX}</if>
-            <if test="allotQuantityJ != null "> and allot_quantity_j = #{allotQuantityJ}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="outId != null  and outId != ''"> and out_id = #{outId}</if>
-            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity = #{bukechaiQuantity}</if>
-            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity = #{kechaiQuantity}</if>
-            <if test="entryid != null  and entryid != ''"> and entryid = #{entryid}</if>
-            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity = #{flatQuantity}</if>
-            <if test="fid != null  and fid != ''"> and fid = #{fid}</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <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 = #{supplierId}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</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>
 
@@ -253,10 +253,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.supplier_id, d.cargo_no, d.create_time, d.print_date,
-               d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
-               p.product_name
+               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/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
index 31db6a8..9162384 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -57,42 +57,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutStockoutDetailList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
         <include refid="selectOutStockoutDetailVo"/>
         <where>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if>
+            <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 = #{stockoutId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</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 = #{quantity}</if>
-            <if test="quantityX != null "> and quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null "> and quantity_j = #{quantityJ}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null "> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null "> and assign_num_j = #{assignNumJ}</if>
-            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
-            <if test="allotQuantityX != null "> and allot_quantity_x = #{allotQuantityX}</if>
-            <if test="allotQuantityJ != null "> and allot_quantity_j = #{allotQuantityJ}</if>
-            <if test="price != null  and price != ''"> and d.price = #{price}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and d.warehouse_id = #{warehouseId}</if>
-            <if test="outId != null  and outId != ''"> and out_id = #{outId}</if>
-            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity = #{bukechaiQuantity}</if>
-            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity = #{kechaiQuantity}</if>
-            <if test="entryid != null  and entryid != ''"> and entryid = #{entryid}</if>
-            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity = #{flatQuantity}</if>
-            <if test="fid != null  and fid != ''"> and fid = #{fid}</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</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 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
-            <if test="spare7 != null and spare7 != ''"> and isd.spare7 = #{spare7}</if>
-            <if test="spare8 != null and spare8 != ''"> and isd.spare8 = #{spare8}</if>
-            <if test="spare9 != null and spare9 != ''"> and isd.spare9 = #{spare9}</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>
 
@@ -141,47 +141,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
-</trim>
+            <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">
@@ -248,3 +256,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where d.stockout_guid = #{stockoutGuid}
     </select>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
index b66d614..4168ae0 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -33,23 +33,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutStockoutFinishList" parameterType="OutStockoutFinish" resultMap="OutStockoutFinishResult">
         <include refid="selectOutStockoutFinishVo"/>
         <where>
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="outType != null  and outType != ''"> and out_type = #{outType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="classNowId != null  and classNowId != ''"> and class_now_id = #{classNowId}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
-            <if test="carNumber != null  and carNumber != ''"> and car_number = #{carNumber}</if>
-            <if test="FID != null  and FID != ''"> and FID = #{FID}</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if>
-            <if test="startDate != null  and startDate != ''"> and start_date = #{startDate}</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</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="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>
 
@@ -142,26 +142,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 = #{stockoutGuid}</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
-            <if test="outType != null  and outType != ''"> and o.out_type = #{outType}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and o.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and o.customer_no = #{customerNo}</if>
-            <if test="createManId != null  and createManId != ''"> and o.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and o.status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source = #{stockoutSource}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id = #{warehouseId}</if>
-            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id = #{classNowId}</if>
-            <if test="exitId != null  and exitId != ''"> and o.exit_id = #{exitId}</if>
-            <if test="carNumber != null  and carNumber != ''"> and o.car_number = #{carNumber}</if>
-            <if test="FID != null  and FID != ''"> and o.FID = #{FID}</if>
-            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id = #{erpStockoutId}</if>
+            <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 = #{productId}</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>
         </where>
         order by o.create_date desc
     </select>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index 84ac0fb..61c9efc 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -29,44 +29,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="accountSetNo"    column="account_set_no"    />
     </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 from out_stockout
+        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  from out_stockout o
+        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 = #{stockoutGuid}</if>
-            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
-            <if test="outType != null  and outType != ''"> and o.out_type = #{outType}</if>
+            <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 = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and o.customer_no = #{customerNo}</if>
-            <if test="createManId != null  and createManId != ''"> and o.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and o.status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source = #{stockoutSource}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id = #{warehouseId}</if>
-            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id = #{classNowId}</if>
-            <if test="exitId != null  and exitId != ''"> and o.exit_id = #{exitId}</if>
-            <if test="carNumber != null  and carNumber != ''"> and o.car_number = #{carNumber}</if>
-            <if test="FID != null  and FID != ''"> and o.FID = #{FID}</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 = #{erpStockoutId}</if>
-            <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</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 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>
-            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 = #{spare5}</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
@@ -100,7 +106,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4,</if>
             <if test="spare3 != null">spare3,</if>
             <if test="spare5 != null">spare5,</if>
-         </trim>
+            <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>
@@ -122,7 +133,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">#{spare4},</if>
             <if test="spare3 != null">#{spare3},</if>
             <if test="spare5 != null">#{spare5},</if>
-         </trim>
+            <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">
@@ -149,8 +165,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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}
+        where stockout_id = #{stockoutId}
     </update>
 
     <delete id="deleteOutStockoutByStockoutGuid" parameterType="String">
@@ -181,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             call proc_out_auto_allocation(
                 #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
                  )
             }
     </select>
@@ -192,10 +210,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
                 #{v_stock_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
                  )
             }
     </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,
@@ -229,3 +280,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where o.stockout_id = #{stockoutId}
     </select>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index efa1542..a5fc899 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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"    />
@@ -53,58 +53,88 @@ 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 = #{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="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 = #{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>
+            <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 = #{roadwayId}</if>
-            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="locked != null  and locked != ''"> and locked = #{locked}</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>
+
+            <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,9 +286,9 @@ 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>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
index 19d6112..d31df4a 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -8,6 +8,7 @@
         {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}
@@ -17,6 +18,8 @@
     <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}
               )}
@@ -25,7 +28,7 @@
     <select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_tp_out(
 
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}
@@ -142,4 +145,60 @@
                 #{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_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/pda/TrayMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml
index d56e423..c133e74 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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 = #{trayCode}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and t.stockin_detail_id = #{stockinDetailId}</if>
-            <if test="quantity != null  and quantity != ''"> and t.quantity = #{quantity}</if>
+            <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>
@@ -78,4 +78,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
index 8b9d313..d9378e5 100644
--- a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -33,22 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
         <where>
-            <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <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 = #{quantity}</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="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="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>
 
@@ -60,24 +60,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockPdVo"/>
         <where>
-            <if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''">and product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''">and lot_no = #{lotNo}</if>
+            <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 = #{quantity}</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="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="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>
 
@@ -154,3 +154,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml
index c14cb0a..abbf8c2 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -87,31 +87,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
         <include refid="selectReceiveStockinDetailFinishVo"/>
         <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
-            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
-            <if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
-            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
-            <if test="price != null and price != ''"> and rsd.price = #{price}</if>
-            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
-            <if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
-            <if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
-            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
+            <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>
 
@@ -123,31 +123,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultMap="ReceiveStockinDetailResult">
         <include refid="selectReceiveStockinDetailFinishVo"/>
         <where>
-            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</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="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>
 
@@ -257,3 +257,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
index 7dd1219..bfb6770 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -58,31 +58,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
         <include refid="selectReceiveStockinDetailVo"/>
         <where>
-            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
-            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
-            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
-            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
-            <if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
-            <if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
-            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
-            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
-            <if test="price != null and price != ''"> and rsd.price = #{price}</if>
-            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
-            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
-            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
-            <if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
-            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
-            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
-            <if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
-            <if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
-            <if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
-            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
-            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
-            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
-            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
+            <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>
@@ -202,3 +202,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
index 5660555..1f847da 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -86,24 +86,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
         <include refid="selectReceiveStockinFinishVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and rs.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
+            <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>
 
@@ -114,24 +114,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
         <include refid="selectReceiveStockinFinishVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and rs.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
+            <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
@@ -234,3 +234,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
index bf8e414..0bcbddb 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -66,24 +66,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
         <include refid="selectReceiveStockinVo"/>
         <where>
-            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and rs.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and rs.create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and rs.status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and rs.class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
+            <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
@@ -195,3 +195,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
index 794571f..bae57b6 100644
--- a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -29,20 +29,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
         <include refid="selectRequestLogVo"/>
         <where>  
-            <if test="requestTime != null  and requestTime != ''"> and request_time = #{requestTime}</if>
-            <if test="sourceSystem != null  and sourceSystem != ''"> and source_system = #{sourceSystem}</if>
-            <if test="targetSystem != null  and targetSystem != ''"> and target_system = #{targetSystem}</if>
-            <if test="endpoint != null  and endpoint != ''"> and endpoint = #{endpoint}</if>
-            <if test="requestUrl != null  and requestUrl != ''"> and request_url = #{requestUrl}</if>
-            <if test="requestMethod != null  and requestMethod != ''"> and request_method = #{requestMethod}</if>
-            <if test="requestHeaders != null  and requestHeaders != ''"> and request_headers = #{requestHeaders}</if>
-            <if test="requestBody != null  and requestBody != ''"> and request_body = #{requestBody}</if>
-            <if test="responseTime != null  and responseTime != ''"> and response_time = #{responseTime}</if>
-            <if test="responseBody != null  and responseBody != ''"> and response_body = #{responseBody}</if>
-            <if test="responseStatus != null  and responseStatus != ''"> and response_status = #{responseStatus}</if>
-            <if test="errorDetails != null  and errorDetails != ''"> and error_details = #{errorDetails}</if>
-            <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
-            <if test="isSuccessful != null  and isSuccessful != ''"> and Is_successful = #{isSuccessful}</if>
+            <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>
     
@@ -112,10 +112,21 @@ 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=")">
             #{requestId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index 60b2b8d..5ca5fde 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -64,50 +64,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{status}</if>
-            <if test="onLineType != null  and onLineType != ''"> and on_line_type = #{onLineType}</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 = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and department_id = #{departmentId}</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 = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id = #{targetRoadwayId}</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</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 = #{workshopId}</if>
-            <if test="priority != null "> and priority = #{priority}</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
-            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
-            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</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="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
-            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</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>
@@ -290,4 +290,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{jobId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
index 69d3e3a..2522f3e 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -64,50 +64,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{status}</if>
-            <if test="onLineType != null  and onLineType != ''"> and on_line_type = #{onLineType}</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 = #{supplierId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and department_id = #{departmentId}</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 = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id = #{targetRoadwayId}</if>
-            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</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 = #{workshopId}</if>
-            <if test="priority != null "> and priority = #{priority}</if>
-            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
-            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
-            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</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="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
-            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</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 = #{spare6}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</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>
@@ -290,4 +290,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{jobId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
index 6881df7..ecb5e5d 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -54,46 +54,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
         <where>  
-            <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
+            <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 = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</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 = #{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="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 = #{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="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 = #{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>
+            <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 = #{cargoSpaceStatus}</if>
-            <if test="locked != null  and locked != ''"> and locked = #{locked}</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>
     
@@ -246,4 +246,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{onlyIdentity}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
index 3c958a5..2cc2774 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</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>
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{inType}</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>
@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{isCurrent}</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>
@@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{cargoStatus}</if>
-            <if test="locked != null  and locked != ''"> and locked = #{locked}</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>
@@ -481,4 +481,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
index abea5e6..a5d82bd 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</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>
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{inType}</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>
@@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{cargoStatus}</if>
-            <if test="locked != null  and locked != ''"> and locked = #{locked}</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>
@@ -481,4 +481,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
index ee6b8ca..87fdbf3 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -53,43 +53,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
         <include refid="selectViewStockinHistoryVo"/>
         <where>  
-            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</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="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
-            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="cjgx != null  and cjgx != ''"> and cjgx = #{cjgx}</if>
-            <if test="scwl != null  and scwl != ''"> and scwl = #{scwl}</if>
-            <if test="dcwl != null  and dcwl != ''"> and dcwl = #{dcwl}</if>
-            <if test="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
+            <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>
@@ -240,4 +240,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockinGuid}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
index ba2e846..a200e57 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -45,36 +45,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         <where>  
-            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</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="outType != null  and outType != ''"> and out_type = #{outType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="classNowId != null  and classNowId != ''"> and class_now_id = #{classNowId}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</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="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</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 = #{quantity}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</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 = #{cjgx}</if>
-            <if test="scwl != null  and scwl != ''"> and scwl = #{scwl}</if>
-            <if test="dcwl != null  and dcwl != ''"> and dcwl = #{dcwl}</if>
-            <if test="spare9 != null  and spare9 != ''"> and spare9 = #{spare9}</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>
     
@@ -200,4 +200,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockoutGuid}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml
index 33487a0..ac95dfb 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -37,22 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
         <include refid="selectBasStockFreezeRecordVo"/>
         <where>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsfr.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and bsfr.tray_code = #{trayCode}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <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 = #{printDate}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="oldStatus != null  and oldStatus != ''"> and old_status = #{oldStatus}</if>
-            <if test="currStatus != null  and currStatus != ''"> and curr_status = #{currStatus}</if>
-            <if test="method != null  and method != ''"> and method = #{method}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bsfr.warehouse_id = #{warehouseId}</if>
-            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if>
-            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target = #{operatingTarget}</if>
-            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if>
-            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity = #{barCodeQuantity}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</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>
@@ -144,3 +144,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml
index d3ee88d..348a15d 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -37,22 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult">
         <include refid="selectBasStockMaintainRecordVo"/>
         <where>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsmr.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and bsmr.tray_code = #{trayCode}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <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 = #{printDate}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="oldQuantity != null  and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="method != null  and method != ''"> and method = #{method}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bsmr.warehouse_id = #{warehouseId}</if>
-            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if>
-            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target = #{operatingTarget}</if>
-            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if>
-            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity = #{barCodeQuantity}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</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>
@@ -144,3 +144,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 </mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index b24b53c..ffa78de 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -1,123 +1,283 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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>
 
+
     <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
         <include refid="selectBasStockVo"/>
         <where>
-            <if test="stockId != null  and stockId != ''"> and bs.stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and bs.product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no = #{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 = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and bs.product_guid = #{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 = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and bs.job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and bs.in_type = #{inType}</if>
-            <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id = #{inClassId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and bs.spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and bs.spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and bs.spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and bs.spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and bs.spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and bs.spare6 = #{spare6}</if>
-            <if test="voltage != null  and voltage != ''"> and bs.voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and bs.power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and bs.phase = #{phase}</if>
-            <if test="netWeight != null  and netWeight != ''"> and bs.net_weight = #{netWeight}</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''"> and bs.distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and bs.model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and bs.order_id = #{orderId}</if>
-            <if test="productId != null  and productId != ''"> and bs.product_id = #{productId}</if>
-            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status = #{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=",">
@@ -146,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>
@@ -173,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=",">
@@ -216,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">
@@ -233,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>
@@ -246,14 +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=#{productId} and bs.spare2=#{spare2}   and bs.model=0 and bcs.status=2
+        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 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=#{spare2}  and  bs.model=0 and bcs.status=2
+        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 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>
+
+        </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/package.json b/ruoyi-ui/package.json
index c98ae7c..dee870a 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -44,6 +44,7 @@
     "sortablejs": "1.10.2",
     "splitpanes": "2.4.1",
     "vue": "2.6.12",
+    "vue-barcode": "^1.3.0",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-easy-print": "^0.0.8",
diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue
index 1e5973c..87f6125 100644
--- a/ruoyi-ui/src/views/bas/traycode/index.vue
+++ b/ruoyi-ui/src/views/bas/traycode/index.vue
@@ -25,6 +25,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否可用" prop="spare2">
+        <el-select v-model="queryParams.spare2" placeholder="请选择">
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -91,12 +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="left" prop="id" width="120" />
+<!--      <el-table-column label="序号" align="center" prop="id" />-->
 <!--      <el-table-column label="格式ID" align="left" prop="formatName"  />-->
-      <el-table-column label="条码" align="left" prop="trayCode"  />
-      <el-table-column label="Spare Field 1" align="center" prop="spare1" />
-      <el-table-column label="Spare Field 2" align="center" prop="spare2" />
-      <el-table-column label="Spare Field 3" align="center" prop="spare3" />
+      <el-table-column label="条码" align="center" prop="trayCode"  />
+<!--      <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="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
@@ -136,7 +150,7 @@
     <!-- 添加或修改条码信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-<!--        <el-form-item label="格式ID" prop="formatId">
+        <el-form-item label="格式ID" prop="formatId">
           <el-select v-model="form.formatId" placeholder="请选择格式ID">
             <el-option
               v-for="item in traycodeFormatList"
@@ -145,20 +159,25 @@
               :value="item.id"
             />
           </el-select>
-        </el-form-item>-->
-        <el-form-item label="托盘编码" prop="trayCode">
+        </el-form-item>
 
-          <el-input v-model="form.trayCode" placeholder="请输入托盘编码" />
+         <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="Spare Field 1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="Enter spare field 1" />
+        <el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
+
+          <el-input v-model="form.trayCode" placeholder="请输入托盘编码" disabled/>
         </el-form-item>
-        <el-form-item label="Spare Field 2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="Enter spare field 2" />
+        <el-form-item label="是否可用" prop="spare2" v-if="form.id != null">
+          <el-select v-model="form.spare2" placeholder="请选择" >
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="Spare Field 3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="Enter spare field 3" />
-        </el-form-item> 
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确定</el-button>
@@ -170,10 +189,13 @@
     <!-- 打印模板 -->
     <vue-easy-print v-show="true" ref="easyPrint2">
       <div v-for="item  in printData" :key="item.id" style="page-break-after:always" class="vue-easy-print">
-        <vue-qr :text='item.trayCode' :size="150" :margin="10" :align-item="center" :correctLevel="2"></vue-qr>
-         <div>
-          <span class="num">{{ item.trayCode }}</span>
-        </div>
+        <vue-barcode
+          :value=item.trayCode
+          format="CODE39"
+          width="2"
+          height="100"
+          display-value
+        />
       </div>
     </vue-easy-print>
   </div>
@@ -183,14 +205,15 @@
 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 {
   name: "Traycode",
+  dicts:['sys_yes_no'],
   components: {
     vueEasyPrint,
-    VueQr
+    VueQr,
+    VueBarcode
   },
   data() {
     return {
@@ -353,10 +376,23 @@ export default {
     },
     /** 打印条码 */
     printBarcode: function (row) {
+      const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
+      const yesVal = yesValItem ? yesValItem.value : 'Y'
+      if (row.spare2 !== yesVal) {
+        this.$modal.msgError("该托盘不可打印：仅“是”可用")
+        return;
+      }
       this.printData = [row]
       this.$nextTick(() => {
         setTimeout(() => {
           this.$refs.easyPrint2.print()
+          const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
+          const noVal = noValItem ? noValItem.value : 'N'
+          const data = Object.assign({}, row, { spare2: noVal })
+          updateTraycode(data).then(() => {
+            this.$modal.msgSuccess("打印完成，已标记为不可用")
+            this.getList()
+          }).catch(() => {})
         }, 100)
       })
     },
@@ -367,10 +403,27 @@ export default {
         this.$modal.msgError("请选择要打印的数据项");
         return;
       }
+      const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
+      const yesVal = yesValItem ? yesValItem.value : 'Y'
+      const invalid = selection.filter(item => item.spare2 !== yesVal)
+      if (invalid.length > 0) {
+        this.$modal.msgError("存在不可打印项（非“是”），请重新选择")
+        return;
+      }
       this.printData = selection;
       this.$nextTick(() => {
         setTimeout(() => {
           this.$refs.easyPrint2.print()
+          const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
+          const noVal = noValItem ? noValItem.value : 'N'
+          const updates = selection.map(item => {
+            const data = Object.assign({}, item, { spare2: noVal })
+            return updateTraycode(data)
+          })
+          Promise.all(updates).then(() => {
+            this.$modal.msgSuccess("批量打印完成，已标记为不可用")
+            this.getList()
+          }).catch(() => {})
         }, 100)
       });
     },
@@ -397,15 +450,10 @@ export default {
   font-family: Arial, sans-serif;
 }
 
-.vue-qr {
-  display: block;
-  margin: 20px auto;
-  max-width: 100%;
-}
 
 @media print {
   @page {
-    size: A4;
+    size: 80mm 50mm;
     margin: 0;
   }
 
@@ -414,7 +462,7 @@ export default {
   }
 
   .vue-easy-print {
-    padding: 20px;
+    padding: 5px;
   }
 
   .num {
@@ -422,8 +470,5 @@ export default {
     margin-top: 10px;
   }
 
-  .vue-qr {
-    margin: 10px auto;
-  }
 }
 </style>