diff --git a/dosc/.WeDrive b/dosc/.WeDrive
new file mode 100644
index 0000000..32d88ae
--- /dev/null
+++ b/dosc/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码
\ No newline at end of file
diff --git a/dosc/Navbar.vue b/dosc/Navbar.vue
new file mode 100644
index 0000000..e965f72
--- /dev/null
+++ b/dosc/Navbar.vue
@@ -0,0 +1,258 @@
+<template>
+  <div class="navbar">
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
+    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+
+    <div v-if="licenseWarning" class="license-warning">
+      <i class="el-icon-warning-outline" />
+      系统授权将于 {{ licenseExpireText }} 后过期，请及时联系管理员续期
+    </div>
+
+    <div class="right-menu">
+      <template v-if="device!=='mobile'">
+        <search id="header-search" class="right-menu-item" />
+
+
+        <el-tooltip content="联系我们" effect="dark" placement="bottom">
+          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+
+        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+          <size-select id="size-select" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+      </template>
+
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="avatar" class="user-avatar">
+          <i class="el-icon-caret-bottom" />
+        </div>
+        <el-dropdown-menu slot="dropdown">
+          <router-link to="/user/profile">
+            <el-dropdown-item>个人中心</el-dropdown-item>
+          </router-link>
+          <el-dropdown-item @click.native="setting = true">
+            <span>布局设置</span>
+          </el-dropdown-item>
+          <el-dropdown-item divided @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import TopNav from '@/components/TopNav'
+import Hamburger from '@/components/Hamburger'
+import Screenfull from '@/components/Screenfull'
+import SizeSelect from '@/components/SizeSelect'
+import Search from '@/components/HeaderSearch'
+import RuoYiGit from '@/components/RuoYi/Git'
+import RuoYiDoc from '@/components/RuoYi/Doc'
+import { getLicenseInfo } from '@/api/license'
+
+export default {
+  components: {
+    Breadcrumb,
+    TopNav,
+    Hamburger,
+    Screenfull,
+    SizeSelect,
+    Search,
+    RuoYiGit,
+    RuoYiDoc
+  },
+  data() {
+    return {
+      licenseWarning: false,
+      licenseExpireText: '',
+      licenseTimer: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'device'
+    ]),
+    setting: {
+      get() {
+        return this.$store.state.settings.showSettings
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'showSettings',
+          value: val
+        })
+      }
+    },
+    topNav: {
+      get() {
+        return this.$store.state.settings.topNav
+      }
+    }
+  },
+  mounted() {
+    this.checkLicenseExpire()
+    this.licenseTimer = setInterval(() => this.checkLicenseExpire(), 60 * 1000)
+  },
+  beforeDestroy() {
+    if (this.licenseTimer) {
+      clearInterval(this.licenseTimer)
+    }
+  },
+  methods: {
+    checkLicenseExpire() {
+      getLicenseInfo().then(res => {
+        if (res.code === 200 && res.data && res.data.expireTime) {
+          const expireTime = new Date(res.data.expireTime).getTime()
+          const now = Date.now()
+          const diffMs = expireTime - now
+          const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24))
+          if (diffMs > 0 && diffDays <= 30) {
+            this.licenseWarning = true
+            if (diffMs < 1000 * 60 * 60 * 24) {
+              const hours = Math.floor(diffMs / (1000 * 60 * 60))
+              const minutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60))
+              if (hours > 0) {
+                this.licenseExpireText = hours + ' 小时 ' + minutes + ' 分钟'
+              } else {
+                this.licenseExpireText = minutes + ' 分钟'
+              }
+            } else if (diffDays < 7) {
+              this.licenseExpireText = diffDays + ' 天'
+            } else {
+              this.licenseExpireText = Math.ceil(diffDays / 7) + ' 周'
+            }
+          }
+        }
+      }).catch(() => {})
+    },
+    toggleSideBar() {
+      this.$store.dispatch('app/toggleSideBar')
+    },
+    logout() {
+      this.$confirm('确定注销并退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          location.href = '/index'
+        })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.navbar {
+  height: 50px;
+  overflow: hidden;
+  position: relative;
+  background: #fff;
+  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+
+  .license-warning {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    top: 0;
+    height: 50px;
+    line-height: 50px;
+    font-size: 13px;
+    color: #e6a23c;
+    font-weight: 500;
+    pointer-events: none;
+    i { margin-right: 4px; }
+  }
+  .hamburger-container {
+    line-height: 46px;
+    height: 100%;
+    float: left;
+    cursor: pointer;
+    transition: background .3s;
+    -webkit-tap-highlight-color:transparent;
+
+    &:hover {
+      background: rgba(0, 0, 0, .025)
+    }
+  }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .topmenu-container {
+    position: absolute;
+    left: 50px;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
+    line-height: 50px;
+
+    &:focus {
+      outline: none;
+    }
+
+    .right-menu-item {
+      display: inline-block;
+      padding: 0 8px;
+      height: 100%;
+      font-size: 18px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+
+      &.hover-effect {
+        cursor: pointer;
+        transition: background .3s;
+
+        &:hover {
+          background: rgba(0, 0, 0, .025)
+        }
+      }
+    }
+
+    .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        margin-top: 5px;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 40px;
+          height: 40px;
+          border-radius: 10px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 25px;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/dosc/license.js b/dosc/license.js
new file mode 100644
index 0000000..e8ead05
--- /dev/null
+++ b/dosc/license.js
@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+export function activeLicense(licenseCode) {
+  return request({
+    url: '/system/license/active',
+    method: 'post',
+    params: { licenseCode }
+  })
+}
+
+export function getLicenseInfo() {
+  return request({
+    url: '/system/license/info',
+    method: 'get'
+  })
+}
diff --git a/dosc/license/.WeDrive b/dosc/license/.WeDrive
new file mode 100644
index 0000000..06d2142
--- /dev/null
+++ b/dosc/license/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\license
\ No newline at end of file
diff --git a/dosc/license/SysLicenseController.java b/dosc/license/SysLicenseController.java
new file mode 100644
index 0000000..6979a5b
--- /dev/null
+++ b/dosc/license/SysLicenseController.java
@@ -0,0 +1,127 @@
+package com.ruoyi.web.controller.system.license;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+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.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.license.domain.SysLicense;
+import com.ruoyi.license.service.ISysLicenseService;
+import com.ruoyi.license.util.LicenseUtils;
+
+/**
+ * 授权码Controller
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/license")
+public class SysLicenseController extends BaseController
+{
+    @Autowired
+    private ISysLicenseService sysLicenseService;
+
+    /**
+     * 查询授权码列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLicense sysLicense)
+    {
+        startPage();
+        List<SysLicense> list = sysLicenseService.selectSysLicenseList(sysLicense);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增授权码
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:add')")
+    @Log(title = "授权码", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(SysLicense sysLicense)
+    {
+        return toAjax(sysLicenseService.insertSysLicense(sysLicense));
+    }
+
+    /**
+     * 修改授权码
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:edit')")
+    @Log(title = "授权码", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(SysLicense sysLicense)
+    {
+        return toAjax(sysLicenseService.updateSysLicense(sysLicense));
+    }
+
+    /**
+     * 删除授权码
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:remove')")
+    @Log(title = "授权码", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(sysLicenseService.deleteSysLicenseByIds(ids));
+    }
+
+    /**
+     * 激活授权码（无需登录）
+     */
+    @Log(title = "激活授权码", businessType = BusinessType.UPDATE)
+    @PostMapping("/active")
+    public AjaxResult active(String licenseCode)
+    {
+        if (!LicenseUtils.validateFormat(licenseCode))
+        {
+            return error("授权码格式不正确");
+        }
+        int result = sysLicenseService.activeLicense(licenseCode);
+        if (result > 0)
+        {
+            return success("授权码激活成功");
+        }
+        return error("授权码激活失败，请检查授权码是否正确或已过期");
+    }
+
+    /**
+     * 获取当前授权信息
+     * license 未开启或无有效授权时返回 code=200 data=null，前端静默处理
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:list')")
+    @GetMapping("/info")
+    public AjaxResult info()
+    {
+        SysLicense license = sysLicenseService.getActiveLicense();
+        return AjaxResult.success(license);
+    }
+
+    /**
+     * 生成授权码
+     */
+    @PreAuthorize("@ss.hasPermi('system:license:add')")
+    @GetMapping("/generate")
+    public AjaxResult generate(String type, String projectNo)
+    {
+        if (StringUtils.isEmpty(type) || StringUtils.isEmpty(projectNo))
+        {
+            return error("授权类型和项目编号不能为空");
+        }
+        String licenseCode = LicenseUtils.generateLicense(type, projectNo);
+        if (licenseCode == null)
+        {
+            return error("授权码生成失败");
+        }
+        return AjaxResult.success("授权码生成成功", licenseCode);
+    }
+}
diff --git a/dosc/ruoyi-license/.WeDrive b/dosc/ruoyi-license/.WeDrive
new file mode 100644
index 0000000..9c126ef
--- /dev/null
+++ b/dosc/ruoyi-license/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license
\ No newline at end of file
diff --git a/dosc/ruoyi-license/CHANGES.md b/dosc/ruoyi-license/CHANGES.md
new file mode 100644
index 0000000..d6c8609
--- /dev/null
+++ b/dosc/ruoyi-license/CHANGES.md
@@ -0,0 +1,270 @@
+# 授权码模块集成改动说明
+
+> 本文档记录引入 `ruoyi-license` 授权码模块时，对原有项目文件的所有改动（不含 `ruoyi-license` 模块本身及 `SysLicenseController`）。
+
+---
+
+## 1. 根模块 `pom.xml`
+
+**文件路径：** `wms/pom.xml`
+
+**改动内容：**
+
+1. `<modules>` 中注册 `ruoyi-license` 子模块：
+
+```xml
+<modules>
+    <module>ruoyi-admin</module>
+    <module>ruoyi-framework</module>
+    <module>ruoyi-system</module>
+    <module>ruoyi-quartz</module>
+    <module>ruoyi-generator</module>
+    <module>ruoyi-common</module>
+    <module>ruoyi-license</module>  <!-- 新增 -->
+</modules>
+```
+
+2. `<dependencyManagement>` 中声明 `ruoyi-license` 依赖版本：
+
+```xml
+<!-- 授权码模块 -->
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+    <version>${ruoyi.version}</version>
+</dependency>
+```
+
+---
+
+## 2. `ruoyi-admin/pom.xml`
+
+**文件路径：** `wms/ruoyi-admin/pom.xml`
+
+**改动内容：**
+
+引入 `ruoyi-license` 依赖，使授权拦截器和配置能被 Spring Boot 扫描加载：
+
+```xml
+<!-- 授权码模块 -->
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+</dependency>
+```
+
+---
+
+## 3. `SecurityConfig.java`
+
+**文件路径：** `wms/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java`
+
+**改动内容：**
+
+在 Spring Security 匿名白名单中加入 `/system/license/active`，允许未登录用户调用激活授权码接口：
+
+```java
+// 改动前
+requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+
+// 改动后
+requests.antMatchers("/login", "/register", "/captchaImage", "/system/license/active").permitAll()
+```
+
+---
+
+## 4. 前端 `api/license.js`（新建）
+
+**文件路径：** `wms/ui/src/api/license.js`
+
+**改动内容：**
+
+新建文件，封装授权码相关接口：
+
+```js
+import request from '@/utils/request'
+
+// 激活授权码（无需登录）
+export function activeLicense(licenseCode) {
+  return request({
+    url: '/system/license/active',
+    method: 'post',
+    params: { licenseCode }
+  })
+}
+
+// 查询当前授权信息（需登录）
+export function getLicenseInfo() {
+  return request({
+    url: '/system/license/info',
+    method: 'get'
+  })
+}
+```
+
+---
+
+## 5. 登录页 `login.vue`
+
+**文件路径：** `wms/ui/src/views/login.vue`
+
+**改动内容：**
+
+### 5.1 模板部分
+
+在登录按钮下方新增"激活授权码"按钮，以及激活弹窗：
+
+```html
+<!-- 激活授权码按钮 -->
+<el-form-item style="width:100%;">
+  <el-button
+    size="medium"
+    type="warning"
+    style="width:100%;"
+    @click.native.prevent="openLicenseDialog"
+  >激活授权码</el-button>
+</el-form-item>
+
+<!-- 激活授权码弹窗 -->
+<el-dialog title="激活授权码" :visible.sync="licenseDialogVisible" width="420px" append-to-body>
+  <el-input v-model="licenseCode" type="textarea" :rows="4" placeholder="请输入授权码" />
+  <span slot="footer">
+    <el-button @click="licenseDialogVisible = false">取 消</el-button>
+    <el-button type="primary" :loading="licenseLoading" @click="handleActiveLicense">激 活</el-button>
+  </span>
+</el-dialog>
+```
+
+### 5.2 Script 部分
+
+新增 import、data 字段和方法：
+
+```js
+// 新增 import
+import { activeLicense } from "@/api/license"
+
+// 新增 data 字段
+licenseDialogVisible: false,
+licenseCode: '',
+licenseLoading: false
+
+// 新增方法
+openLicenseDialog() {
+  this.licenseCode = ''
+  this.licenseDialogVisible = true
+},
+handleActiveLicense() {
+  if (!this.licenseCode.trim()) {
+    this.$message.warning('请输入授权码')
+    return
+  }
+  this.licenseLoading = true
+  activeLicense(this.licenseCode.trim()).then(res => {
+    if (res.code === 200) {
+      this.$message.success(res.msg || '授权码激活成功')
+      this.licenseDialogVisible = false
+    } else {
+      this.$message.error(res.msg || '授权码激活失败')
+    }
+  }).catch(() => {
+    this.$message.error('授权码激活失败')
+  }).finally(() => {
+    this.licenseLoading = false
+  })
+}
+```
+
+---
+
+## 6. 顶部导航栏 `Navbar.vue`
+
+**文件路径：** `wms/ui/src/layout/components/Navbar.vue`
+
+**改动内容：**
+
+### 6.1 模板部分
+
+在 navbar 中间插入授权到期警告条（剩余不足 30 天时显示）：
+
+```html
+<div v-if="licenseWarning" class="license-warning">
+  <i class="el-icon-warning-outline" />
+  系统授权将于 {{ licenseExpireText }} 后过期，请及时联系管理员续期
+</div>
+```
+
+### 6.2 Script 部分
+
+```js
+// 新增 import
+import { getLicenseInfo } from '@/api/license'
+
+// 新增 data 字段
+licenseWarning: false,
+licenseExpireText: '',
+licenseTimer: null
+
+// 新增生命周期钩子
+mounted() {
+  this.checkLicenseExpire()
+  this.licenseTimer = setInterval(() => this.checkLicenseExpire(), 60 * 1000)
+},
+beforeDestroy() {
+  if (this.licenseTimer) clearInterval(this.licenseTimer)
+},
+
+// 新增方法
+checkLicenseExpire() {
+  getLicenseInfo().then(res => {
+    if (res.code === 200 && res.data && res.data.expireTime) {
+      const expireTime = new Date(res.data.expireTime).getTime()
+      const now = Date.now()
+      const diffMs = expireTime - now
+      const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24))
+      if (diffMs > 0 && diffDays <= 30) {
+        this.licenseWarning = true
+        if (diffMs < 1000 * 60 * 60 * 24) {
+          const hours = Math.floor(diffMs / (1000 * 60 * 60))
+          const minutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60))
+          this.licenseExpireText = hours > 0 ? `${hours} 小时 ${minutes} 分钟` : `${minutes} 分钟`
+        } else if (diffDays < 7) {
+          this.licenseExpireText = diffDays + ' 天'
+        } else {
+          this.licenseExpireText = Math.ceil(diffDays / 7) + ' 周'
+        }
+      }
+    }
+  }).catch(() => {})
+}
+```
+
+### 6.3 样式部分
+
+```scss
+.license-warning {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 0;
+  height: 50px;
+  line-height: 50px;
+  font-size: 13px;
+  color: #e6a23c;
+  font-weight: 500;
+  pointer-events: none;
+  i { margin-right: 4px; }
+}
+```
+
+---
+
+## 改动文件汇总
+
+| 文件 | 类型 | 说明 |
+|---|---|---|
+| `wms/pom.xml` | 修改 | 注册模块 + 声明依赖版本 |
+| `wms/ruoyi-admin/pom.xml` | 修改 | 引入 ruoyi-license 依赖 |
+| `ruoyi-framework/.../SecurityConfig.java` | 修改 | 白名单加入激活授权码接口 |
+| `ui/src/api/license.js` | 新建 | 封装激活和查询授权信息接口 |
+| `ui/src/views/login.vue` | 修改 | 新增激活授权码按钮和弹窗 |
+| `ui/src/layout/components/Navbar.vue` | 修改 | 新增授权到期倒计时警告条 |
diff --git a/dosc/ruoyi-license/DEPLOYMENT_CHECKLIST.md b/dosc/ruoyi-license/DEPLOYMENT_CHECKLIST.md
new file mode 100644
index 0000000..cac7b0e
--- /dev/null
+++ b/dosc/ruoyi-license/DEPLOYMENT_CHECKLIST.md
@@ -0,0 +1,250 @@
+# 授权码模块部署检查清单
+
+## 📋 部署前检查
+
+### 1. 文件完整性检查
+- [ ] ruoyi-license 模块目录存在
+- [ ] pom.xml 已添加 license 模块
+- [ ] ruoyi-admin/pom.xml 已添加 license 依赖
+- [ ] SysLicenseController.java 已创建
+- [ ] license.html 和 active.html 已创建
+- [ ] login.html 和 login.js 已修改
+- [ ] sys_license.sql 脚本已准备
+
+### 2. 数据库准备
+- [ ] 创建 sys_license 表
+- [ ] 插入授权管理菜单数据
+- [ ] 验证表结构正确
+- [ ] 检查菜单权限配置
+
+### 3. 代码配置
+- [ ] 修改 LicenseUtils.java 中的密钥（生产环境必须）
+- [ ] 确认拦截器路径配置正确
+- [ ] 确认定时任务cron表达式
+- [ ] 启动类添加 @EnableScheduling 注解
+
+## 🔧 部署步骤
+
+### 步骤1: 执行数据库脚本
+```bash
+mysql -u root -p your_database < sql/sys_license.sql
+```
+- [ ] 执行成功
+- [ ] 表创建成功
+- [ ] 菜单数据插入成功
+
+### 步骤2: 修改启动类
+```java
+@SpringBootApplication
+@EnableScheduling  // 添加此注解
+public class RuoYiApplication {
+    // ...
+}
+```
+- [ ] 注解已添加
+
+### 步骤3: 编译项目
+```bash
+mvn clean install
+```
+- [ ] 编译成功
+- [ ] 无错误信息
+- [ ] JAR包生成
+
+### 步骤4: 启动应用
+```bash
+java -jar ruoyi-admin.jar
+```
+- [ ] 启动成功
+- [ ] 无异常日志
+- [ ] 端口正常监听
+
+### 步骤5: 生成授权码
+**方式A: 使用独立工具**
+```bash
+java com.ruoyi.license.util.LicenseGenerator
+```
+- [ ] 工具运行成功
+- [ ] 授权码生成成功
+- [ ] 授权码已保存
+
+**方式B: 使用系统界面**
+- [ ] 登录系统
+- [ ] 访问授权管理
+- [ ] 点击生成授权码
+- [ ] 输入天数并生成
+
+### 步骤6: 激活授权码
+- [ ] 访问登录页
+- [ ] 点击"激活授权码"
+- [ ] 输入授权码
+- [ ] 激活成功
+
+## ✅ 功能测试
+
+### 测试1: 授权码生成
+- [ ] 系统界面生成授权码成功
+- [ ] 独立工具生成授权码成功
+- [ ] 授权码格式正确
+
+### 测试2: 授权码激活
+- [ ] 登录页激活成功
+- [ ] 系统内激活成功
+- [ ] 数据库记录正确
+
+### 测试3: 授权验证
+- [ ] 有效授权可正常登录
+- [ ] 无授权无法登录
+- [ ] 过期授权无法登录
+
+### 测试4: 授权拦截
+- [ ] 未授权访问被拦截
+- [ ] 有效授权可正常访问
+- [ ] 静态资源不被拦截
+
+### 测试5: 定时检查
+- [ ] 定时任务正常执行
+- [ ] 授权过期自动更新状态
+- [ ] 在线用户被踢出
+
+### 测试6: 授权管理
+- [ ] 授权列表查询正常
+- [ ] 授权信息显示正确
+- [ ] 授权删除功能正常
+
+## 🔍 问题排查
+
+### 问题1: 编译失败
+**检查项:**
+- [ ] Maven依赖是否正确
+- [ ] JDK版本是否匹配
+- [ ] pom.xml配置是否正确
+
+**解决方案:**
+```bash
+mvn clean
+mvn dependency:resolve
+mvn install
+```
+
+### 问题2: 启动失败
+**检查项:**
+- [ ] 数据库连接是否正常
+- [ ] 端口是否被占用
+- [ ] 配置文件是否正确
+
+**解决方案:**
+- 检查 application.yml 配置
+- 查看启动日志错误信息
+- 确认数据库表已创建
+
+### 问题3: 无法激活授权码
+**检查项:**
+- [ ] 授权码格式是否正确
+- [ ] 授权码是否已过期
+- [ ] 密钥是否一致
+
+**解决方案:**
+- 重新生成授权码
+- 检查 LicenseUtils 密钥配置
+- 查看后台错误日志
+
+### 问题4: 授权验证不生效
+**检查项:**
+- [ ] 拦截器是否注册
+- [ ] 数据库授权记录是否正确
+- [ ] 定时任务是否执行
+
+**解决方案:**
+- 检查 LicenseConfig 配置
+- 验证数据库 status 字段
+- 确认 @EnableScheduling 已添加
+
+### 问题5: 在线用户未被踢出
+**检查项:**
+- [ ] SessionDAO 是否注入
+- [ ] 定时任务是否执行
+- [ ] Shiro配置是否正确
+
+**解决方案:**
+- 检查 LicenseCheckTask 日志
+- 验证 SessionDAO bean
+- 重启应用服务器
+
+## 📊 监控指标
+
+### 运行时监控
+- [ ] 授权状态正常
+- [ ] 定时任务执行正常
+- [ ] 无异常日志
+- [ ] 内存使用正常
+- [ ] CPU使用正常
+
+### 业务监控
+- [ ] 授权激活次数
+- [ ] 授权过期提醒
+- [ ] 用户登录成功率
+- [ ] 授权拦截次数
+
+## 🔐 安全检查
+
+### 配置安全
+- [ ] 生产环境已修改默认密钥
+- [ ] 数据库密码已加密
+- [ ] 授权码传输使用HTTPS
+- [ ] 敏感日志已脱敏
+
+### 权限安全
+- [ ] 授权管理菜单仅管理员可见
+- [ ] 授权激活操作有日志记录
+- [ ] 授权码生成有权限控制
+- [ ] 数据库访问有权限限制
+
+### 数据安全
+- [ ] 授权码加密存储
+- [ ] 定期备份授权数据
+- [ ] 授权日志完整保存
+- [ ] 敏感信息不输出到日志
+
+## 📝 上线清单
+
+### 上线前
+- [ ] 所有测试通过
+- [ ] 代码已提交版本库
+- [ ] 数据库脚本已准备
+- [ ] 部署文档已编写
+- [ ] 回滚方案已准备
+
+### 上线中
+- [ ] 备份现有数据
+- [ ] 执行数据库脚本
+- [ ] 部署新版本代码
+- [ ] 生成初始授权码
+- [ ] 激活授权码
+
+### 上线后
+- [ ] 验证功能正常
+- [ ] 检查日志无异常
+- [ ] 监控系统运行状态
+- [ ] 通知相关人员
+- [ ] 更新运维文档
+
+## 📞 应急联系
+
+### 技术支持
+- 开发负责人: ___________
+- 运维负责人: ___________
+- 数据库管理员: ___________
+
+### 应急预案
+1. 授权失效 -> 立即激活新授权码
+2. 系统无法登录 -> 检查授权状态
+3. 数据丢失 -> 从备份恢复
+4. 性能问题 -> 调整定时任务频率
+
+---
+
+**检查人**: ___________
+**检查日期**: ___________
+**部署环境**: [ ] 开发 [ ] 测试 [ ] 生产
+**部署状态**: [ ] 成功 [ ] 失败 [ ] 部分成功
diff --git a/dosc/ruoyi-license/INTEGRATION.md b/dosc/ruoyi-license/INTEGRATION.md
new file mode 100644
index 0000000..1b8199b
--- /dev/null
+++ b/dosc/ruoyi-license/INTEGRATION.md
@@ -0,0 +1,231 @@
+# RuoYi 授权码模块集成指南
+
+## 一、模块说明
+
+本授权码模块已完成开发，包含以下文件：
+
+```
+ruoyi-license/                          # 授权模块（独立模块）
+├── src/main/java/com/ruoyi/license/
+│   ├── config/
+│   │   └── LicenseConfig.java         # 拦截器配置
+│   ├── domain/
+│   │   └── SysLicense.java            # 授权实体
+│   ├── interceptor/
+│   │   └── LicenseInterceptor.java    # 授权拦截器
+│   ├── mapper/
+│   │   └── SysLicenseMapper.java      # 数据访问接口
+│   ├── service/
+│   │   ├── ISysLicenseService.java    # 服务接口
+│   │   └── impl/
+│   │       └── SysLicenseServiceImpl.java  # 服务实现
+│   ├── task/
+│   │   └── LicenseCheckTask.java      # 定时检查任务
+│   └── util/
+│       ├── LicenseUtils.java          # 授权工具类
+│       └── LicenseGenerator.java      # 授权码生成器
+├── src/main/resources/mapper/license/
+│   └── SysLicenseMapper.xml           # MyBatis映射
+├── pom.xml                            # 模块依赖
+└── README.md                          # 使用说明
+
+sql/
+└── sys_license.sql                    # 数据库脚本
+
+ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/license/
+└── SysLicenseController.java          # 授权控制器
+
+ruoyi-admin/src/main/resources/templates/system/license/
+├── license.html                       # 授权列表页
+└── active.html                        # 激活页面
+
+修改的文件：
+- pom.xml                              # 添加license模块
+- ruoyi-admin/pom.xml                  # 添加license依赖
+- login.html                           # 添加激活入口
+- login.js                             # 添加激活功能
+```
+
+## 二、部署步骤
+
+### 1. 执行数据库脚本
+
+```bash
+# 在MySQL中执行
+mysql -u root -p your_database < sql/sys_license.sql
+```
+
+或手动执行 `sql/sys_license.sql` 中的SQL语句。
+
+### 2. 启用定时任务
+
+在启动类上添加 `@EnableScheduling` 注解：
+
+```java
+@SpringBootApplication
+@EnableScheduling  // 添加此注解
+public class RuoYiApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(RuoYiApplication.class, args);
+    }
+}
+```
+
+### 3. 编译项目
+
+```bash
+cd d:\fortucky\project\RuoYi-master
+mvn clean install
+```
+
+### 4. 生成授权码
+
+**方式一：使用独立工具生成**
+```bash
+cd ruoyi-license/src/main/java
+javac com/ruoyi/license/util/LicenseUtils.java
+javac com/ruoyi/license/util/LicenseGenerator.java
+java com.ruoyi.license.util.LicenseGenerator
+```
+
+**方式二：启动系统后在界面生成**
+- 登录系统
+- 进入"系统管理 -> 授权管理"
+- 点击"生成授权码"按钮
+
+### 5. 激活授权码
+
+**首次激活（登录页）：**
+1. 访问登录页
+2. 点击"激活授权码"链接
+3. 输入生成的授权码
+4. 提交激活
+
+**系统内激活：**
+1. 登录系统（需要先有有效授权）
+2. 进入"系统管理 -> 授权管理"
+3. 点击"激活授权码"
+4. 输入新的授权码
+
+## 三、功能验证
+
+### 1. 验证授权拦截
+
+- 未激活授权码时，访问任何页面应跳转到登录页并提示"授权已过期"
+- 激活授权码后，可正常访问系统
+
+### 2. 验证定时检查
+
+- 修改数据库中授权码的 `expire_time` 为过去时间
+- 等待5分钟（或重启系统）
+- 在线用户应被强制退出
+- 尝试登录应提示授权过期
+
+### 3. 验证授权管理
+
+- 访问"系统管理 -> 授权管理"
+- 查看授权列表
+- 生成新授权码
+- 激活授权码
+- 删除过期授权
+
+## 四、复用到其他项目
+
+### 方式一：Maven依赖（推荐）
+
+1. 将 `ruoyi-license` 模块复制到目标项目
+2. 在父pom.xml添加模块声明
+3. 在需要的模块添加依赖
+4. 执行数据库脚本
+5. 复制Controller和前端页面
+
+### 方式二：JAR包依赖
+
+1. 打包license模块：
+```bash
+cd ruoyi-license
+mvn clean package
+```
+
+2. 安装到本地仓库：
+```bash
+mvn install:install-file -Dfile=target/ruoyi-license-4.8.2.jar \
+  -DgroupId=com.ruoyi -DartifactId=ruoyi-license \
+  -Dversion=4.8.2 -Dpackaging=jar
+```
+
+3. 在目标项目添加依赖：
+```xml
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+    <version>4.8.2</version>
+</dependency>
+```
+
+## 五、配置说明
+
+### 1. 修改密钥（重要）
+
+生产环境必须修改默认密钥：
+
+```java
+// LicenseUtils.java
+private static final String SECRET_KEY = "YourCustomKey123"; // 改为16位自定义密钥
+```
+
+### 2. 调整检查频率
+
+```java
+// LicenseCheckTask.java
+@Scheduled(cron = "0 */5 * * * ?")  // 每5分钟，可根据需要调整
+```
+
+### 3. 自定义拦截路径
+
+```java
+// LicenseConfig.java
+.excludePathPatterns(
+    "/login",
+    "/your-path/**"  // 添加需要排除的路径
+)
+```
+
+## 六、注意事项
+
+1. **首次部署**：必须先生成并激活授权码，否则无法登录
+2. **时间同步**：确保服务器时间准确，避免授权判断错误
+3. **密钥安全**：生产环境务必修改默认密钥
+4. **数据备份**：定期备份 `sys_license` 表数据
+5. **权限控制**：授权管理菜单仅授予超级管理员
+
+## 七、故障排查
+
+### 问题1：无法激活授权码
+- 检查授权码格式是否正确
+- 检查授权码是否已过期
+- 查看后台日志错误信息
+
+### 问题2：授权有效但仍被拦截
+- 检查数据库中授权状态是否为"1"
+- 检查 `expire_time` 是否大于当前时间
+- 重启应用服务器
+
+### 问题3：定时任务不执行
+- 确认启动类添加了 `@EnableScheduling`
+- 检查日志是否有定时任务执行记录
+
+### 问题4：在线用户未被踢出
+- 检查 `SessionDAO` 是否正确注入
+- 查看定时任务是否正常执行
+- 检查Shiro配置是否正确
+
+## 八、技术支持
+
+如遇到问题，请提供以下信息：
+1. 错误日志
+2. 数据库授权记录
+3. 系统环境信息
+4. 操作步骤
+
+联系方式：参考RuoYi官方文档
diff --git a/dosc/ruoyi-license/LICENSE_FILTER_CONFIG.md b/dosc/ruoyi-license/LICENSE_FILTER_CONFIG.md
new file mode 100644
index 0000000..7a3ba06
--- /dev/null
+++ b/dosc/ruoyi-license/LICENSE_FILTER_CONFIG.md
@@ -0,0 +1,168 @@
+# 授权码全局拦截配置说明
+
+## 功能说明
+
+通过自定义 Shiro Filter，实现授权码失效时，**所有接口**（包括 `anon` 匿名访问的接口）都无法访问。
+
+## 实现原理
+
+1. 创建 `LicenseValidateFilter` 继承 `AccessControlFilter`
+2. 在 Shiro 过滤链的**最前面**添加此过滤器
+3. 所有请求都会先经过授权码验证，验证失败则拒绝访问
+
+## 已完成的修改
+
+### 1. 新增文件
+- `ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/license/LicenseValidateFilter.java`
+
+### 2. 修改文件
+- `ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java`
+  - 导入 `LicenseValidateFilter`
+  - 注册过滤器：`filters.put("licenseValidate", licenseValidateFilter())`
+  - 添加到过滤链：`filterChainDefinitionMap.put("/**", "licenseValidate,user,kickout,onlineSession,syncOnlineSession")`
+
+## 白名单配置
+
+以下路径即使授权失效也可以访问（必要的登录和静态资源）：
+
+```java
+private static final String[] WHITE_LIST = {
+    "/login",                    // 登录页
+    "/captcha/captchaImage",     // 验证码
+    "/css/",                     // 样式文件
+    "/js/",                      // 脚本文件
+    "/img/",                     // 图片资源
+    "/fonts/",                   // 字体文件
+    "/ajax/",                    // Ajax资源
+    "/ruoyi/",                   // 若依资源
+    "/favicon.ico",              // 网站图标
+    "/system/license/active"     // 授权激活页面（必须放行）
+};
+```
+
+## 自定义白名单
+
+如果需要添加其他路径到白名单，修改 `LicenseValidateFilter.java`：
+
+```java
+private static final String[] WHITE_LIST = {
+    // ... 原有配置
+    "/your-custom-path/**",      // 添加你的自定义路径
+};
+```
+
+## 拦截效果
+
+### 授权有效时
+- 所有接口正常访问（包括 `/board/**`、`/agv/api/**` 等 anon 接口）
+
+### 授权失效时
+- **普通请求**：重定向到 `/login?license=expired`
+- **Ajax请求**：返回 JSON `{"code":401,"msg":"授权已过期，请联系管理员激活授权码"}`
+- **白名单路径**：仍可访问（用于激活授权码）
+
+## 测试步骤
+
+### 1. 启用授权功能
+在 `application.yml` 中配置：
+```yaml
+license:
+  enabled: true
+```
+
+### 2. 配置项目编号
+在数据库 `sys_config` 表中添加：
+```sql
+INSERT INTO sys_config (config_name, config_key, config_value, config_type, create_by, create_time, remark) 
+VALUES ('项目编号', 'fortucky.project.no', 'FT507', 'Y', 'admin', NOW(), '用于授权码验证');
+```
+
+### 3. 测试授权失效场景
+
+**方式一：不激活授权码**
+- 启动系统
+- 访问 `/board/**` 接口
+- 预期：被拦截，重定向到登录页
+
+**方式二：授权码过期**
+- 生成5分钟测试授权码并激活
+- 等待5分钟后访问 `/board/**` 接口
+- 预期：被拦截
+
+### 4. 测试授权有效场景
+- 生成并激活有效授权码
+- 访问 `/board/**` 接口
+- 预期：正常访问
+
+## 注意事项
+
+1. **白名单必须包含授权激活页面**
+   - `/system/license/active` 必须在白名单中
+   - 否则授权失效后无法激活新授权码
+
+2. **静态资源必须放行**
+   - CSS、JS、图片等资源必须在白名单
+   - 否则登录页面无法正常显示
+
+3. **过滤器顺序很重要**
+   - `licenseValidate` 必须在最前面
+   - 确保所有请求都先经过授权验证
+
+4. **开发环境可关闭授权**
+   ```yaml
+   license:
+     enabled: false  # 开发时可关闭
+   ```
+
+## 与原有拦截器的区别
+
+### 原有 LicenseInterceptor（Spring MVC 拦截器）
+- 在 Spring MVC 层拦截
+- 只拦截进入 Controller 的请求
+- 无法拦截 Shiro 已放行的 `anon` 接口
+
+### 新增 LicenseValidateFilter（Shiro 过滤器）
+- 在 Shiro 层拦截
+- 拦截所有请求（包括 `anon` 接口）
+- 优先级高于 Shiro 的其他过滤器
+
+## 建议
+
+1. **保留两个拦截器**
+   - `LicenseValidateFilter`：全局拦截（包括 anon 接口）
+   - `LicenseInterceptor`：作为二次验证（可选）
+
+2. **生产环境必须启用**
+   ```yaml
+   license:
+     enabled: true
+   ```
+
+3. **定期检查白名单**
+   - 确保白名单路径最小化
+   - 避免过度放行
+
+## 故障排查
+
+### 问题1：所有请求都被拦截
+- 检查 `license.enabled` 是否为 `true`
+- 检查是否有有效授权码
+- 查看后台日志 `[授权验证]` 相关信息
+
+### 问题2：anon 接口仍可访问
+- 检查过滤器是否注册：`filters.put("licenseValidate", ...)`
+- 检查过滤链配置：`"licenseValidate,user,..."`
+- 确认 `licenseValidate` 在最前面
+
+### 问题3：无法激活授权码
+- 检查 `/system/license/active` 是否在白名单
+- 检查白名单匹配逻辑是否正确
+
+## 完成标志
+
+✅ 授权失效时，`/board/**` 接口无法访问  
+✅ 授权失效时，`/agv/api/**` 接口无法访问  
+✅ 授权失效时，仍可访问登录页和激活页  
+✅ 授权有效时，所有接口正常访问  
+✅ Ajax 请求返回 JSON 错误信息  
+✅ 普通请求重定向到登录页
diff --git a/dosc/ruoyi-license/README.md b/dosc/ruoyi-license/README.md
new file mode 100644
index 0000000..5cfa495
--- /dev/null
+++ b/dosc/ruoyi-license/README.md
@@ -0,0 +1,193 @@
+# RuoYi 授权码模块
+
+## 模块简介
+
+ruoyi-license 是一个独立的授权码管理模块，用于控制系统的使用期限。当授权码过期后，系统将无法登录，已登录用户会被强制退出。
+
+## 功能特性
+
+- ✅ 授权码加密存储
+- ✅ 登录时验证授权有效性
+- ✅ 定时检查授权状态（每5分钟）
+- ✅ 授权过期自动踢出在线用户
+- ✅ 系统管理界面查看/激活授权
+- ✅ 登录页面激活授权码
+- ✅ 授权码生成工具
+- ✅ 独立模块，方便其他项目复用
+
+## 快速开始
+
+### 1. 执行数据库脚本
+
+```sql
+-- 执行 sql/sys_license.sql 创建授权表和菜单
+```
+
+### 2. 添加模块依赖
+
+在需要使用授权功能的项目中，添加依赖：
+
+```xml
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+    <version>4.8.2</version>
+</dependency>
+```
+
+### 3. 配置包扫描
+
+确保Spring能扫描到授权模块的包：
+
+```java
+@SpringBootApplication
+@ComponentScan(basePackages = {"com.ruoyi"})
+public class RuoYiApplication {
+    // ...
+}
+```
+
+### 4. 生成授权码
+
+访问系统管理 -> 授权管理，点击"生成授权码"按钮，输入授权天数（如365天），系统会生成加密的授权码。
+
+### 5. 激活授权码
+
+**方式一：登录页激活**
+- 在登录页面点击"激活授权码"链接
+- 输入授权码并提交
+
+**方式二：系统内激活**
+- 登录系统后，进入"系统管理 -> 授权管理"
+- 点击"激活授权码"按钮
+- 输入授权码并提交
+
+## 核心类说明
+
+### 1. 实体类
+- `SysLicense`: 授权码实体，包含授权码、开始时间、结束时间、状态等信息
+
+### 2. 工具类
+- `LicenseUtils`: 授权码工具类
+  - `generateLicense()`: 生成授权码
+  - `encrypt()`: 加密数据
+  - `decrypt()`: 解密数据
+  - `validateFormat()`: 验证授权码格式
+
+### 3. 服务类
+- `ISysLicenseService`: 授权服务接口
+  - `activeLicense()`: 激活授权码
+  - `checkLicenseValid()`: 检查授权是否有效
+  - `getActiveLicense()`: 获取当前有效授权
+
+### 4. 拦截器
+- `LicenseInterceptor`: 授权拦截器，在每次请求时验证授权有效性
+
+### 5. 定时任务
+- `LicenseCheckTask`: 每5分钟检查授权状态，过期自动踢出在线用户
+
+## 授权码格式
+
+授权码采用AES加密，格式为：
+```
+加密(开始时间戳|结束时间戳)
+```
+
+示例：
+```
+原始数据: 1704067200000|1735689600000
+加密后: Xj8K9mN2pQ5rT7vW1yZ3aB4cD6eF8gH0iJ2kL4mN6oP8qR0sT2uV4wX6yZ8
+```
+
+## 集成到其他项目
+
+### 步骤1：复制模块
+将 `ruoyi-license` 文件夹复制到目标项目根目录
+
+### 步骤2：修改pom.xml
+在父pom.xml中添加：
+```xml
+<modules>
+    <module>ruoyi-license</module>
+</modules>
+
+<dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-license</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+```
+
+### 步骤3：添加依赖
+在启动模块的pom.xml中添加：
+```xml
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+</dependency>
+```
+
+### 步骤4：执行SQL脚本
+执行 `sql/sys_license.sql` 创建数据库表
+
+### 步骤5：配置Controller
+将 `SysLicenseController.java` 复制到项目的controller包中
+
+### 步骤6：配置前端页面
+将 `templates/system/license/` 目录复制到项目的templates目录
+
+### 步骤7：修改登录页面
+参考 `login.html` 和 `login.js` 的修改，添加授权码激活入口
+
+## 自定义配置
+
+### 修改密钥
+编辑 `LicenseUtils.java`：
+```java
+private static final String SECRET_KEY = "YourSecretKey123"; // 16位密钥
+```
+
+### 修改检查频率
+编辑 `LicenseCheckTask.java`：
+```java
+@Scheduled(cron = "0 */10 * * * ?") // 改为每10分钟检查
+```
+
+### 自定义拦截规则
+编辑 `LicenseConfig.java`，添加或排除拦截路径：
+```java
+.excludePathPatterns(
+    "/login",
+    "/your-custom-path/**"
+)
+```
+
+## 注意事项
+
+1. **密钥安全**：生产环境务必修改默认密钥
+2. **时间同步**：确保服务器时间准确
+3. **数据备份**：定期备份授权表数据
+4. **权限控制**：授权管理菜单仅授予管理员
+5. **测试环境**：建议先在测试环境验证功能
+
+## 常见问题
+
+**Q: 授权码激活失败？**
+A: 检查授权码格式是否正确，是否已过期
+
+**Q: 如何延长授权期限？**
+A: 生成新的授权码并激活即可
+
+**Q: 授权过期后如何恢复？**
+A: 在登录页点击"激活授权码"，输入新的授权码
+
+**Q: 可以同时激活多个授权码吗？**
+A: 系统只使用最新激活且未过期的授权码
+
+## 技术支持
+
+如有问题，请联系技术支持或查看RuoYi官方文档。
diff --git a/dosc/ruoyi-license/SUMMARY.md b/dosc/ruoyi-license/SUMMARY.md
new file mode 100644
index 0000000..dc7e368
--- /dev/null
+++ b/dosc/ruoyi-license/SUMMARY.md
@@ -0,0 +1,239 @@
+# RuoYi 授权码模块 - 项目总结
+
+## 📦 已完成的工作
+
+### 1. 核心模块开发 ✅
+
+**ruoyi-license 独立模块**
+- ✅ Maven模块配置 (pom.xml)
+- ✅ 授权实体类 (SysLicense.java)
+- ✅ 数据访问层 (SysLicenseMapper.java + XML)
+- ✅ 业务逻辑层 (ISysLicenseService.java + Impl)
+- ✅ 授权工具类 (LicenseUtils.java)
+- ✅ 授权拦截器 (LicenseInterceptor.java)
+- ✅ 拦截器配置 (LicenseConfig.java)
+- ✅ 定时检查任务 (LicenseCheckTask.java)
+- ✅ 授权码生成器 (LicenseGenerator.java)
+- ✅ 测试工具 (LicenseTest.java)
+
+### 2. 控制器和前端 ✅
+
+**后端控制器**
+- ✅ SysLicenseController.java (授权管理控制器)
+  - 授权列表查询
+  - 授权码激活
+  - 授权码生成
+  - 授权信息查看
+  - 授权删除
+
+**前端页面**
+- ✅ license.html (授权列表页)
+- ✅ active.html (激活页面)
+- ✅ login.html (添加激活入口)
+- ✅ login.js (添加激活功能)
+
+### 3. 数据库脚本 ✅
+
+- ✅ sys_license.sql
+  - 授权表结构
+  - 菜单权限配置
+
+### 4. 项目集成 ✅
+
+- ✅ 主pom.xml (添加license模块)
+- ✅ ruoyi-admin/pom.xml (添加license依赖)
+
+### 5. 文档编写 ✅
+
+- ✅ README.md (使用说明)
+- ✅ INTEGRATION.md (集成指南)
+
+## 🎯 功能特性
+
+### 核心功能
+1. **授权码加密存储** - AES加密，安全可靠
+2. **登录验证** - 登录时自动验证授权有效性
+3. **拦截器保护** - 所有请求都经过授权验证
+4. **定时检查** - 每5分钟自动检查授权状态
+5. **自动踢出** - 授权过期自动踢出所有在线用户
+6. **管理界面** - 完整的授权管理功能
+7. **登录页激活** - 无需登录即可激活授权码
+8. **授权码生成** - 内置生成工具，支持自定义天数
+
+### 技术亮点
+- 🔒 AES加密算法保护授权码
+- 🔄 Spring拦截器实现全局授权验证
+- ⏰ Spring定时任务自动检查授权
+- 🎨 完整的前后端交互界面
+- 📦 独立模块设计，方便复用
+- 🛠️ 提供测试工具和生成工具
+
+## 📂 文件清单
+
+```
+ruoyi-license/
+├── src/main/java/com/ruoyi/license/
+│   ├── config/
+│   │   └── LicenseConfig.java                 (拦截器配置)
+│   ├── domain/
+│   │   └── SysLicense.java                    (授权实体)
+│   ├── interceptor/
+│   │   └── LicenseInterceptor.java            (授权拦截器)
+│   ├── mapper/
+│   │   └── SysLicenseMapper.java              (Mapper接口)
+│   ├── service/
+│   │   ├── ISysLicenseService.java            (服务接口)
+│   │   └── impl/
+│   │       └── SysLicenseServiceImpl.java     (服务实现)
+│   ├── task/
+│   │   └── LicenseCheckTask.java              (定时任务)
+│   └── util/
+│       ├── LicenseUtils.java                  (工具类)
+│       ├── LicenseGenerator.java              (生成器)
+│       └── LicenseTest.java                   (测试工具)
+├── src/main/resources/mapper/license/
+│   └── SysLicenseMapper.xml                   (MyBatis映射)
+├── pom.xml                                    (模块配置)
+├── README.md                                  (使用说明)
+└── INTEGRATION.md                             (集成指南)
+
+sql/
+└── sys_license.sql                            (数据库脚本)
+
+ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/license/
+└── SysLicenseController.java                  (控制器)
+
+ruoyi-admin/src/main/resources/templates/system/license/
+├── license.html                               (列表页)
+└── active.html                                (激活页)
+
+修改的文件:
+├── pom.xml                                    (添加模块)
+├── ruoyi-admin/pom.xml                        (添加依赖)
+├── ruoyi-admin/src/main/resources/templates/login.html
+└── ruoyi-admin/src/main/resources/static/ruoyi/login.js
+```
+
+## 🚀 快速开始
+
+### 1. 执行数据库脚本
+```sql
+source sql/sys_license.sql;
+```
+
+### 2. 启用定时任务
+在 RuoYiApplication.java 添加 @EnableScheduling
+
+### 3. 编译项目
+```bash
+mvn clean install
+```
+
+### 4. 生成授权码
+运行 LicenseGenerator.java 或在系统界面生成
+
+### 5. 激活授权码
+登录页点击"激活授权码"输入授权码
+
+## 🔧 使用场景
+
+### 场景1：软件交付
+- 开发完成后生成授权码
+- 交付给客户时提供授权码
+- 客户激活后可使用指定期限
+
+### 场景2：试用版本
+- 生成30天试用授权码
+- 客户试用满意后购买正式授权
+- 激活正式授权码延长使用期限
+
+### 场景3：订阅服务
+- 按年生成授权码
+- 到期前提醒客户续费
+- 续费后激活新授权码
+
+### 场景4：多项目复用
+- 将license模块复制到其他项目
+- 修改密钥和配置
+- 快速实现授权功能
+
+## ⚙️ 自定义配置
+
+### 修改密钥（必须）
+```java
+// LicenseUtils.java
+private static final String SECRET_KEY = "YourKey16Chars!!";
+```
+
+### 调整检查频率
+```java
+// LicenseCheckTask.java
+@Scheduled(cron = "0 */10 * * * ?")  // 改为10分钟
+```
+
+### 自定义拦截路径
+```java
+// LicenseConfig.java
+.excludePathPatterns("/api/**", "/public/**")
+```
+
+## 📊 数据库表结构
+
+```sql
+sys_license (授权表)
+├── license_id      (授权ID - 主键)
+├── license_code    (授权码 - 加密存储)
+├── start_time      (开始时间)
+├── expire_time     (结束时间)
+├── status          (状态: 0未激活 1已激活 2已过期)
+├── active_time     (激活时间)
+├── active_by       (激活人)
+├── create_by       (创建者)
+├── create_time     (创建时间)
+├── update_by       (更新者)
+├── update_time     (更新时间)
+└── remark          (备注)
+```
+
+## 🔐 安全建议
+
+1. **生产环境必须修改默认密钥**
+2. **授权码通过安全渠道传递**
+3. **定期备份授权表数据**
+4. **限制授权管理菜单权限**
+5. **监控授权激活日志**
+
+## 📝 后续优化建议
+
+1. **硬件绑定** - 绑定服务器MAC地址或CPU序列号
+2. **在线验证** - 连接授权服务器在线验证
+3. **授权分级** - 不同授权码对应不同功能权限
+4. **自动续费** - 集成支付接口自动续费
+5. **授权统计** - 统计授权使用情况和到期提醒
+
+## ✅ 测试清单
+
+- [ ] 数据库表创建成功
+- [ ] 菜单权限配置正确
+- [ ] 授权码生成功能正常
+- [ ] 授权码加密解密正确
+- [ ] 登录页激活功能正常
+- [ ] 系统内激活功能正常
+- [ ] 授权拦截器生效
+- [ ] 定时任务执行正常
+- [ ] 授权过期自动踢出
+- [ ] 授权列表查询正常
+
+## 📞 技术支持
+
+如有问题，请查看：
+1. README.md - 使用说明
+2. INTEGRATION.md - 集成指南
+3. RuoYi官方文档
+
+---
+
+**开发完成时间**: 2024
+**模块版本**: 1.0.0
+**适用框架**: RuoYi v4.8.2
+**技术栈**: SpringBoot + MyBatis + Shiro + Thymeleaf
diff --git a/dosc/ruoyi-license/pom.xml b/dosc/ruoyi-license/pom.xml
new file mode 100644
index 0000000..d287653
--- /dev/null
+++ b/dosc/ruoyi-license/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.8.9</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-license</artifactId>
+
+    <description>
+        授权码管理模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <!-- 系统模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Web-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/.WeDrive
new file mode 100644
index 0000000..c216a2c
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\config
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/LicenseConfig.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/LicenseConfig.java
new file mode 100644
index 0000000..2c4a18a
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/config/LicenseConfig.java
@@ -0,0 +1,61 @@
+package com.ruoyi.license.config;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import com.ruoyi.framework.config.properties.PermitAllUrlProperties;
+import com.ruoyi.license.interceptor.LicenseInterceptor;
+
+/**
+ * 授权模块配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class LicenseConfig implements WebMvcConfigurer
+{
+    @Autowired
+    private LicenseInterceptor licenseInterceptor;
+
+    @Autowired
+    private PermitAllUrlProperties permitAllUrl;
+
+    @Value("${license.enabled:false}")
+    private boolean licenseEnabled;
+
+    private static final List<String> BASE_EXCLUDE = Arrays.asList(
+        "/login",
+        "/logout",
+        "/register",
+        "/captchaImage",
+        "/system/license/active",
+        "/swagger-ui.html",
+        "/swagger-resources/**",
+        "/webjars/**",
+        "/*/api-docs",
+        "/druid/**",
+        "/*.html",
+        "/**/*.html",
+        "/**/*.css",
+        "/**/*.js",
+        "/profile/**"
+    );
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry)
+    {
+        if (licenseEnabled)
+        {
+            List<String> excludeList = new ArrayList<>(BASE_EXCLUDE);
+            excludeList.addAll(permitAllUrl.getUrls());
+            registry.addInterceptor(licenseInterceptor)
+                    .addPathPatterns("/**")
+                    .excludePathPatterns(excludeList);
+        }
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/.WeDrive
new file mode 100644
index 0000000..be19c04
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\domain
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/SysLicense.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/SysLicense.java
new file mode 100644
index 0000000..90dfc8d
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/domain/SysLicense.java
@@ -0,0 +1,105 @@
+package com.ruoyi.license.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 系统授权码对象 sys_license
+ * 
+ * @author ruoyi
+ */
+public class SysLicense extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 授权ID */
+    private Long licenseId;
+
+    /** 授权码 */
+    private String licenseCode;
+
+    /** 授权开始时间 */
+    private Date startTime;
+
+    /** 授权结束时间 */
+    private Date expireTime;
+
+    /** 授权状态（0未激活 1已激活 2已过期） */
+    private String status;
+
+    /** 激活时间 */
+    private Date activeTime;
+
+    /** 激活人 */
+    private String activeBy;
+
+    public Long getLicenseId()
+    {
+        return licenseId;
+    }
+
+    public void setLicenseId(Long licenseId)
+    {
+        this.licenseId = licenseId;
+    }
+
+    public String getLicenseCode()
+    {
+        return licenseCode;
+    }
+
+    public void setLicenseCode(String licenseCode)
+    {
+        this.licenseCode = licenseCode;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getExpireTime()
+    {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime)
+    {
+        this.expireTime = expireTime;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public Date getActiveTime()
+    {
+        return activeTime;
+    }
+
+    public void setActiveTime(Date activeTime)
+    {
+        this.activeTime = activeTime;
+    }
+
+    public String getActiveBy()
+    {
+        return activeBy;
+    }
+
+    public void setActiveBy(String activeBy)
+    {
+        this.activeBy = activeBy;
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/.WeDrive
new file mode 100644
index 0000000..67e9730
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\interceptor
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/LicenseInterceptor.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/LicenseInterceptor.java
new file mode 100644
index 0000000..a2cbc64
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/interceptor/LicenseInterceptor.java
@@ -0,0 +1,46 @@
+package com.ruoyi.license.interceptor;
+
+import java.io.PrintWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import com.ruoyi.license.service.ISysLicenseService;
+
+/**
+ * 授权拦截器
+ *
+ * @author ruoyi
+ */
+@Component
+public class LicenseInterceptor implements HandlerInterceptor
+{
+    @Autowired
+    private ISysLicenseService licenseService;
+
+    @Value("${license.enabled:false}")
+    private boolean licenseEnabled;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
+    {
+        if (!licenseEnabled)
+        {
+            return true;
+        }
+
+        if (!licenseService.checkLicenseValid())
+        {
+            response.setStatus(HttpServletResponse.SC_OK);
+            response.setContentType("application/json;charset=UTF-8");
+            PrintWriter writer = response.getWriter();
+            writer.write("{\"code\":500,\"msg\":\"\u7cfb\u7edf\u6388\u6743\u5df2\u8fc7\u671f\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u6fc0\u6d3b\u6388\u6743\u7801\"}");
+            writer.flush();
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/.WeDrive
new file mode 100644
index 0000000..303125d
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\mapper
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/SysLicenseMapper.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/SysLicenseMapper.java
new file mode 100644
index 0000000..bd29eb6
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/mapper/SysLicenseMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.license.mapper;
+
+import com.ruoyi.license.domain.SysLicense;
+import java.util.List;
+
+/**
+ * 授权码Mapper接口
+ * 
+ * @author ruoyi
+ */
+public interface SysLicenseMapper
+{
+    /**
+     * 查询授权码
+     * 
+     * @param licenseId 授权码ID
+     * @return 授权码
+     */
+    public SysLicense selectSysLicenseById(Long licenseId);
+
+    /**
+     * 查询授权码列表
+     * 
+     * @param sysLicense 授权码
+     * @return 授权码集合
+     */
+    public List<SysLicense> selectSysLicenseList(SysLicense sysLicense);
+
+    /**
+     * 查询当前有效的授权码
+     * 
+     * @return 授权码
+     */
+    public SysLicense selectActiveLicense();
+
+    /**
+     * 新增授权码
+     * 
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    public int insertSysLicense(SysLicense sysLicense);
+
+    /**
+     * 修改授权码
+     * 
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    public int updateSysLicense(SysLicense sysLicense);
+
+    /**
+     * 删除授权码
+     * 
+     * @param licenseId 授权码ID
+     * @return 结果
+     */
+    public int deleteSysLicenseById(Long licenseId);
+
+    /**
+     * 批量删除授权码
+     * 
+     * @param licenseIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysLicenseByIds(String[] licenseIds);
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/.WeDrive
new file mode 100644
index 0000000..8e4560f
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\service
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/ISysLicenseService.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/ISysLicenseService.java
new file mode 100644
index 0000000..1a9a225
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/ISysLicenseService.java
@@ -0,0 +1,87 @@
+package com.ruoyi.license.service;
+
+import com.ruoyi.license.domain.SysLicense;
+import java.util.List;
+
+/**
+ * 授权码Service接口
+ * 
+ * @author ruoyi
+ */
+public interface ISysLicenseService
+{
+    /**
+     * 查询授权码
+     * 
+     * @param licenseId 授权码ID
+     * @return 授权码
+     */
+    public SysLicense selectSysLicenseById(Long licenseId);
+
+    /**
+     * 查询授权码列表
+     * 
+     * @param sysLicense 授权码
+     * @return 授权码集合
+     */
+    public List<SysLicense> selectSysLicenseList(SysLicense sysLicense);
+
+    /**
+     * 新增授权码
+     * 
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    public int insertSysLicense(SysLicense sysLicense);
+
+    /**
+     * 修改授权码
+     * 
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    public int updateSysLicense(SysLicense sysLicense);
+
+    /**
+     * 批量删除授权码
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysLicenseByIds(String ids);
+
+    /**
+     * 删除授权码信息
+     * 
+     * @param licenseId 授权码ID
+     * @return 结果
+     */
+    public int deleteSysLicenseById(Long licenseId);
+
+    /**
+     * 激活授权码
+     * 
+     * @param licenseCode 授权码
+     * @return 结果
+     */
+    public int activeLicense(String licenseCode);
+
+    /**
+     * 检查授权是否有效
+     * 
+     * @return true有效 false无效
+     */
+    public boolean checkLicenseValid();
+
+    /**
+     * 获取当前有效授权信息
+     * 
+     * @return 授权信息
+     */
+    public SysLicense getActiveLicense();
+
+    /**
+     * 更新过期授权码状态
+     */
+    public void updateExpiredLicenses();
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/.WeDrive
new file mode 100644
index 0000000..d81aedd
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\service\impl
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/SysLicenseServiceImpl.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/SysLicenseServiceImpl.java
new file mode 100644
index 0000000..79f070c
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/service/impl/SysLicenseServiceImpl.java
@@ -0,0 +1,266 @@
+package com.ruoyi.license.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.license.domain.SysLicense;
+import com.ruoyi.license.mapper.SysLicenseMapper;
+import com.ruoyi.license.service.ISysLicenseService;
+import com.ruoyi.license.util.LicenseUtils;
+
+/**
+ * 授权码Service业务层处理
+ *
+ * @author ruoyi
+ */
+@Service
+public class SysLicenseServiceImpl implements ISysLicenseService
+{
+    @Autowired
+    private SysLicenseMapper sysLicenseMapper;
+
+    @Autowired
+    private com.ruoyi.system.mapper.SysConfigMapper sysConfigMapper;
+
+    @org.springframework.beans.factory.annotation.Value("${license.enabled:false}")
+    private boolean licenseEnabled;
+
+    /**
+     * 查询授权码
+     *
+     * @param licenseId 授权码ID
+     * @return 授权码
+     */
+    @Override
+    public SysLicense selectSysLicenseById(Long licenseId)
+    {
+        return sysLicenseMapper.selectSysLicenseById(licenseId);
+    }
+
+    /**
+     * 查询授权码列表
+     *
+     * @param sysLicense 授权码
+     * @return 授权码
+     */
+    @Override
+    public List<SysLicense> selectSysLicenseList(SysLicense sysLicense)
+    {
+        return sysLicenseMapper.selectSysLicenseList(sysLicense);
+    }
+
+    /**
+     * 新增授权码
+     *
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    @Override
+    public int insertSysLicense(SysLicense sysLicense)
+    {
+        sysLicense.setCreateTime(new Date());
+        return sysLicenseMapper.insertSysLicense(sysLicense);
+    }
+
+    /**
+     * 修改授权码
+     *
+     * @param sysLicense 授权码
+     * @return 结果
+     */
+    @Override
+    public int updateSysLicense(SysLicense sysLicense)
+    {
+        sysLicense.setUpdateTime(new Date());
+        return sysLicenseMapper.updateSysLicense(sysLicense);
+    }
+
+    /**
+     * 删除授权码对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysLicenseByIds(String ids)
+    {
+        return sysLicenseMapper.deleteSysLicenseByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除授权码信息
+     *
+     * @param licenseId 授权码ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysLicenseById(Long licenseId)
+    {
+        return sysLicenseMapper.deleteSysLicenseById(licenseId);
+    }
+
+    /**
+     * 激活授权码
+     *
+     * @param licenseCode 授权码
+     * @return 结果
+     */
+    @Override
+    public int activeLicense(String licenseCode)
+    {
+        if (StringUtils.isEmpty(licenseCode))
+        {
+            return 0;
+        }
+
+        // 验证授权码格式
+        if (!LicenseUtils.validateFormat(licenseCode))
+        {
+            return 0;
+        }
+
+        try
+        {
+            // 从配置表获取项目编号
+            String projectNo = sysConfigMapper.selectConfigByKey("fortucky.project.no");
+            if (StringUtils.isEmpty(projectNo))
+            {
+                return 0;
+            }
+
+            // 解析授权码
+            long expireTime = LicenseUtils.parseLicense(licenseCode, projectNo);
+            if (expireTime == 0)
+            {
+                return 0;
+            }
+
+            Date now = new Date();
+            Date startTime = now;
+            Date expireDate = new Date(expireTime);
+
+            // 验证是否已过期
+            if (expireDate.before(now))
+            {
+                return 0;
+            }
+
+            // 创建授权记录
+            SysLicense license = new SysLicense();
+            license.setLicenseCode(licenseCode);
+            license.setStartTime(startTime);
+            license.setExpireTime(expireDate);
+            license.setStatus("1");
+            license.setActiveTime(now);
+            license.setCreateTime(now);
+
+            return sysLicenseMapper.insertSysLicense(license);
+        }
+        catch (Exception e)
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * 检查授权是否有效
+     *
+     * @return true有效 false无效
+     */
+    @Override
+    public boolean checkLicenseValid()
+    {
+        // 如果授权码功能未启用，直接返回true
+        if (!licenseEnabled)
+        {
+            return true;
+        }
+        
+        SysLicense license = sysLicenseMapper.selectActiveLicense();
+        if (license == null)
+        {
+            System.out.println("[授权检查] 没有找到激活的授权码");
+            return false;
+        }
+
+        // 从配置表获取项目编号
+        String projectNo = sysConfigMapper.selectConfigByKey("fortucky.project.no");
+        if (StringUtils.isEmpty(projectNo))
+        {
+            System.out.println("[授权检查] 项目编号未配置");
+            return false;
+        }
+
+        System.out.println("[授权检查] 授权码: " + license.getLicenseCode());
+        System.out.println("[授权检查] 项目编号: " + projectNo);
+
+        // 从授权码解析过期时间
+        long expireTime = LicenseUtils.parseLicense(license.getLicenseCode(), projectNo);
+        if (expireTime == 0)
+        {
+            System.out.println("[授权检查] 授权码解析失败");
+            return false;
+        }
+
+        Date now = new Date();
+        System.out.println("[授权检查] 当前时间: " + now.getTime());
+        System.out.println("[授权检查] 过期时间: " + expireTime);
+        
+        if (expireTime < now.getTime())
+        {
+            System.out.println("[授权检查] 授权已过期");
+            // 更新为过期状态
+            license.setStatus("2");
+            sysLicenseMapper.updateSysLicense(license);
+            return false;
+        }
+
+        
+        return true;
+    }
+
+    /**
+     * 获取当前有效授权信息
+     *
+     * @return 授权信息
+     */
+    @Override
+    public SysLicense getActiveLicense()
+    {
+        return sysLicenseMapper.selectActiveLicense();
+    }
+
+    /**
+     * 更新过期授权码状态
+     */
+    @Override
+    public void updateExpiredLicenses()
+    {
+        SysLicense query = new SysLicense();
+        query.setStatus("1");
+        List<SysLicense> licenses = sysLicenseMapper.selectSysLicenseList(query);
+        
+        // 从配置表获取项目编号
+        String projectNo = sysConfigMapper.selectConfigByKey("fortucky.project.no");
+        if (StringUtils.isEmpty(projectNo))
+        {
+            return;
+        }
+        
+        Date now = new Date();
+        for (SysLicense license : licenses)
+        {
+            // 从授权码解析过期时间
+            long expireTime = LicenseUtils.parseLicense(license.getLicenseCode(), projectNo);
+            if (expireTime > 0 && expireTime < now.getTime())
+            {
+                license.setStatus("2");
+                license.setUpdateTime(now);
+                sysLicenseMapper.updateSysLicense(license);
+            }
+        }
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/.WeDrive
new file mode 100644
index 0000000..27b60e6
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\task
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/LicenseCheckTask.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/LicenseCheckTask.java
new file mode 100644
index 0000000..9963c61
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/task/LicenseCheckTask.java
@@ -0,0 +1,47 @@
+package com.ruoyi.license.task;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.license.service.ISysLicenseService;
+
+/**
+ * 授权检查定时任务
+ *
+ * @author ruoyi
+ */
+@Component
+public class LicenseCheckTask
+{
+    @Autowired
+    private ISysLicenseService licenseService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Value("${license.enabled:false}")
+    private boolean licenseEnabled;
+
+    /**
+     * 每5分钟检查一次授权状态
+     */
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void checkLicense()
+    {
+        if (!licenseEnabled)
+        {
+            return;
+        }
+
+        if (!licenseService.checkLicenseValid())
+        {
+            // 授权无效，删除 Redis 中所有登录 token，强制踢出所有在线用户
+            redisCache.deleteObject(redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"));
+        }
+
+        licenseService.updateExpiredLicenses();
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/.WeDrive b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/.WeDrive
new file mode 100644
index 0000000..2fb358f
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\java\com\ruoyi\license\util
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseGenerator.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseGenerator.java
new file mode 100644
index 0000000..16ce407
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseGenerator.java
@@ -0,0 +1,127 @@
+package com.ruoyi.license.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Scanner;
+
+/**
+ * 授权码生成工具（独立运行）
+ * 
+ * @author ruoyi
+ */
+public class LicenseGenerator
+{
+    public static void main(String[] args)
+    {
+        Scanner scanner = new Scanner(System.in);
+        
+        System.out.println("========================================");
+        System.out.println("       RuoYi 授权码生成工具");
+        System.out.println("========================================");
+        System.out.println();
+        
+        try
+        {
+            // 选择授权类型
+            System.out.println("请选择授权类型：");
+            System.out.println("1. 5分钟测试");
+            System.out.println("2. 1个月授权");
+            System.out.println("3. 3个月授权");
+            System.out.println("4. 1年授权");
+            System.out.println("5. 5年授权");
+            System.out.println("6. 长期授权");
+            System.out.print("请输入选项（1-6）: ");
+            String typeChoice = scanner.nextLine().trim();
+            
+            String type;
+            String typeDesc;
+            long expireTime;
+            
+            switch (typeChoice)
+            {
+                case "1":
+                    type = LicenseUtils.TYPE_TEST;
+                    typeDesc = "5分钟测试";
+                    expireTime = System.currentTimeMillis() + 5 * 60 * 1000L;
+                    break;
+                case "2":
+                    type = LicenseUtils.TYPE_MONTH;
+                    typeDesc = "1个月授权";
+                    expireTime = System.currentTimeMillis() + 30L * 24 * 60 * 60 * 1000;
+                    break;
+                case "3":
+                    type = LicenseUtils.TYPE_THREE;
+                    typeDesc = "3个月授权";
+                    expireTime = System.currentTimeMillis() + 90L * 24 * 60 * 60 * 1000;
+                    break;
+                case "4":
+                    type = LicenseUtils.TYPE_YEAR;
+                    typeDesc = "1年授权";
+                    expireTime = System.currentTimeMillis() + 365L * 24 * 60 * 60 * 1000;
+                    break;
+                case "5":
+                    type = LicenseUtils.TYPE_FIVE;
+                    typeDesc = "5年授权";
+                    expireTime = System.currentTimeMillis() + 5 * 365L * 24 * 60 * 60 * 1000;
+                    break;
+                case "6":
+                    type = LicenseUtils.TYPE_FOREVER;
+                    typeDesc = "长期授权";
+                    expireTime = System.currentTimeMillis() + 100 * 365L * 24 * 60 * 60 * 1000;
+                    break;
+                default:
+                    System.out.println("错误：无效的选项");
+                    return;
+            }
+            
+            // 输入项目编号
+            System.out.print("请输入项目编号: ");
+            String projectNo = scanner.nextLine().trim();
+            
+            if (projectNo.isEmpty())
+            {
+                System.out.println("错误：项目编号不能为空");
+                return;
+            }
+            
+            // 生成授权码
+            String licenseCode = LicenseUtils.generateLicense(type, projectNo);
+            
+            if (licenseCode == null)
+            {
+                System.out.println("错误：授权码生成失败");
+                return;
+            }
+            
+            // 格式化日期
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date now = new Date();
+            Date expire = new Date(expireTime);
+            
+            System.out.println();
+            System.out.println("========================================");
+            System.out.println("授权码生成成功！");
+            System.out.println("========================================");
+            System.out.println("授权类型: " + typeDesc);
+            System.out.println("项目编号: " + projectNo);
+            System.out.println("当前时间: " + sdf.format(now));
+            System.out.println("过期时间: " + sdf.format(expire));
+            System.out.println("----------------------------------------");
+            System.out.println("授权码:");
+            System.out.println(licenseCode);
+            System.out.println("========================================");
+            System.out.println();
+            System.out.println("请妥善保管授权码，在系统中激活后即可使用。");
+            System.out.println("注意：系统配置中的项目编号必须与此处一致才能激活。");
+        }
+        catch (Exception e)
+        {
+            System.out.println("错误：" + e.getMessage());
+            e.printStackTrace();
+        }
+        finally
+        {
+            scanner.close();
+        }
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseTest.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseTest.java
new file mode 100644
index 0000000..0b69a1c
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseTest.java
@@ -0,0 +1,89 @@
+package com.ruoyi.license.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 授权码测试工具
+ * 
+ * @author ruoyi
+ */
+public class LicenseTest
+{
+    public static void main(String[] args)
+    {
+        System.out.println("========================================");
+        System.out.println("       授权码功能测试");
+        System.out.println("========================================");
+        System.out.println();
+        
+        String projectNo = "TEST001";
+        
+        // 测试1：生成各类型授权码
+        System.out.println("【测试1】生成各类型授权码");
+        String testCode = LicenseUtils.generateLicense(LicenseUtils.TYPE_TEST, projectNo);
+        String yearCode = LicenseUtils.generateLicense(LicenseUtils.TYPE_YEAR, projectNo);
+        String fiveCode = LicenseUtils.generateLicense(LicenseUtils.TYPE_FIVE, projectNo);
+        String foreverCode = LicenseUtils.generateLicense(LicenseUtils.TYPE_FOREVER, projectNo);
+        
+        System.out.println("5分钟测试: " + testCode);
+        System.out.println("1年授权: " + yearCode);
+        System.out.println("5年授权: " + fiveCode);
+        System.out.println("长期授权: " + foreverCode);
+        System.out.println("结果: ✓ 通过");
+        System.out.println();
+        
+        // 测试2：验证授权码格式
+        System.out.println("【测试2】验证授权码格式");
+        boolean isValid = LicenseUtils.validateFormat(yearCode);
+        System.out.println("格式验证: " + (isValid ? "✓ 通过" : "✗ 失败"));
+        System.out.println();
+        
+        // 测试3：解析授权码
+        System.out.println("【测试3】解析授权码");
+        long expireTime = LicenseUtils.parseLicense(yearCode, projectNo);
+        if (expireTime > 0)
+        {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date expire = new Date(expireTime);
+            System.out.println("过期时间: " + sdf.format(expire));
+            System.out.println("结果: ✓ 通过");
+        }
+        else
+        {
+            System.out.println("结果: ✗ 失败");
+        }
+        System.out.println();
+        
+        // 测试4：项目编号验证
+        System.out.println("【测试4】项目编号验证");
+        long validResult = LicenseUtils.parseLicense(yearCode, projectNo);
+        long invalidResult = LicenseUtils.parseLicense(yearCode, "WRONG001");
+        System.out.println("正确项目编号: " + (validResult > 0 ? "✓ 通过" : "✗ 失败"));
+        System.out.println("错误项目编号: " + (invalidResult == 0 ? "✓ 通过（正确拒绝）" : "✗ 失败"));
+        System.out.println();
+        
+        // 测试5：授权码格式展示
+        System.out.println("【测试5】授权码格式展示");
+        System.out.println("授权码: " + yearCode);
+        String[] parts = yearCode.split("_");
+        if (parts.length == 5)
+        {
+            System.out.println("前缀: " + parts[0]);
+            System.out.println("类型: " + parts[1] + " (" + LicenseUtils.getTypeDesc(parts[1]) + ")");
+            System.out.println("项目编号: " + parts[2]);
+            System.out.println("加密时间: " + parts[3]);
+            System.out.println("校验码: " + parts[4]);
+            System.out.println("结果: ✓ 通过");
+        }
+        else
+        {
+            System.out.println("结果: ✗ 失败");
+        }
+        System.out.println();
+        
+        System.out.println("========================================");
+        System.out.println("测试完成！");
+        System.out.println("========================================");
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseUtils.java b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseUtils.java
new file mode 100644
index 0000000..ef456ae
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/java/com/ruoyi/license/util/LicenseUtils.java
@@ -0,0 +1,275 @@
+package com.ruoyi.license.util;
+
+import java.util.Base64;
+import java.util.Date;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * 授权码工具类
+ * 格式: FORTUCKY_授权类型_项目编号_加密时间_校验码
+ * 
+ * @author ruoyi
+ */
+public class LicenseUtils
+{
+    // 密钥（16位）
+    private static final String SECRET_KEY = "RuoYiLicense2024";
+    
+    // 授权类型
+    public static final String TYPE_TEST = "TEST";      // 5分钟测试
+    public static final String TYPE_MONTH = "MONTH";    // 1个月
+    public static final String TYPE_THREE = "THREE";    // 3个月
+    public static final String TYPE_YEAR = "YEAR";      // 1年
+    public static final String TYPE_FIVE = "FIVE";      // 5年
+    public static final String TYPE_FOREVER = "FOREVER"; // 长期
+
+    /**
+     * 生成授权码
+     * 
+     * @param type 授权类型
+     * @param projectNo 项目编号
+     * @return 授权码
+     */
+    public static String generateLicense(String type, String projectNo)
+    {
+        try
+        {
+            long expireTime = calculateExpireTime(type);
+            if (expireTime == 0)
+            {
+                return null;
+            }
+            
+            // 加密过期时间
+            String encryptedTime = encrypt(String.valueOf(expireTime));
+            if (encryptedTime == null)
+            {
+                return null;
+            }
+            
+            // 生成校验码（取加密时间的前8位MD5）
+            String checkCode = generateCheckCode(type, projectNo, encryptedTime);
+            
+            // 拼接授权码: FORTUCKY_类型_项目编号_加密时间_校验码
+            return "FORTUCKY_" + type + "_" + projectNo + "_" + encryptedTime + "_" + checkCode;
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * 验证授权码格式
+     * 
+     * @param licenseCode 授权码
+     * @return true有效 false无效
+     */
+    public static boolean validateFormat(String licenseCode)
+    {
+        if (licenseCode == null || licenseCode.trim().isEmpty())
+        {
+            return false;
+        }
+
+        String[] parts = licenseCode.split("_");
+        if (parts.length != 5)
+        {
+            return false;
+        }
+
+        if (!"FORTUCKY".equals(parts[0]))
+        {
+            return false;
+        }
+
+        // 验证授权类型
+        String type = parts[1];
+        if (!TYPE_TEST.equals(type) && !TYPE_MONTH.equals(type) && !TYPE_THREE.equals(type) &&
+            !TYPE_YEAR.equals(type) && !TYPE_FIVE.equals(type) && !TYPE_FOREVER.equals(type))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 解析授权码
+     * 
+     * @param licenseCode 授权码
+     * @param projectNo 系统项目编号
+     * @return 过期时间戳，0表示解析失败
+     */
+    public static long parseLicense(String licenseCode, String projectNo)
+    {
+        try
+        {
+            if (!validateFormat(licenseCode))
+            {
+                return 0;
+            }
+
+            String[] parts = licenseCode.split("_");
+            String type = parts[1];
+            String codeProjectNo = parts[2];
+            String encryptedTime = parts[3];
+            String checkCode = parts[4];
+
+            // 验证项目编号
+            if (!codeProjectNo.equals(projectNo))
+            {
+                return 0;
+            }
+
+            // 验证校验码
+            String expectedCheckCode = generateCheckCode(type, codeProjectNo, encryptedTime);
+            if (!checkCode.equals(expectedCheckCode))
+            {
+                return 0;
+            }
+
+            // 解密时间
+            String decrypted = decrypt(encryptedTime);
+            if (decrypted == null)
+            {
+                return 0;
+            }
+
+            return Long.parseLong(decrypted);
+        }
+        catch (Exception e)
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * 获取授权类型描述
+     * 
+     * @param type 授权类型
+     * @return 描述
+     */
+    public static String getTypeDesc(String type)
+    {
+        switch (type)
+        {
+            case TYPE_TEST: return "5分钟测试";
+            case TYPE_MONTH: return "1个月授权";
+            case TYPE_THREE: return "3个月授权";
+            case TYPE_YEAR: return "1年授权";
+            case TYPE_FIVE: return "5年授权";
+            case TYPE_FOREVER: return "长期授权";
+            default: return "未知";
+        }
+    }
+
+    /**
+     * 计算过期时间
+     * 
+     * @param type 授权类型
+     * @return 过期时间戳
+     */
+    private static long calculateExpireTime(String type)
+    {
+        long now = System.currentTimeMillis();
+        
+        switch (type)
+        {
+            case TYPE_TEST:
+                return now + 5 * 60 * 1000L; // 5分钟
+            case TYPE_MONTH:
+                return now + 30L * 24 * 60 * 60 * 1000; // 1个月
+            case TYPE_THREE:
+                return now + 90L * 24 * 60 * 60 * 1000; // 3个月
+            case TYPE_YEAR:
+                return now + 365L * 24 * 60 * 60 * 1000; // 1年
+            case TYPE_FIVE:
+                return now + 5 * 365L * 24 * 60 * 60 * 1000; // 5年
+            case TYPE_FOREVER:
+                return now + 100 * 365L * 24 * 60 * 60 * 1000; // 100年（视为长期）
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * 生成校验码
+     * 
+     * @param type 授权类型
+     * @param projectNo 项目编号
+     * @param encryptedTime 加密时间
+     * @return 校验码
+     */
+    private static String generateCheckCode(String type, String projectNo, String encryptedTime)
+    {
+        try
+        {
+            String data = type + projectNo + encryptedTime;
+            java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
+            byte[] hash = md.digest(data.getBytes("UTF-8"));
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < Math.min(4, hash.length); i++)
+            {
+                sb.append(String.format("%02x", hash[i]));
+            }
+            return sb.toString().toUpperCase();
+        }
+        catch (Exception e)
+        {
+            return "00000000";
+        }
+    }
+
+    /**
+     * 加密
+     * 
+     * @param data 原始数据
+     * @return 加密后的数据
+     */
+    private static String encrypt(String data)
+    {
+        try
+        {
+            SecretKeySpec key = new SecretKeySpec(SECRET_KEY.getBytes("UTF-8"), "AES");
+            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+            byte[] encrypted = cipher.doFinal(data.getBytes("UTF-8"));
+            return Base64.getEncoder().encodeToString(encrypted).replace("+", "-").replace("/", ".").replace("=", "");
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * 解密
+     * 
+     * @param encryptedData 加密数据
+     * @return 解密后的数据
+     */
+    private static String decrypt(String encryptedData)
+    {
+        try
+        {
+            String base64Data = encryptedData.replace("-", "+").replace(".", "/");
+            int padding = (4 - base64Data.length() % 4) % 4;
+            for (int i = 0; i < padding; i++)
+            {
+                base64Data += "=";
+            }
+            
+            SecretKeySpec key = new SecretKeySpec(SECRET_KEY.getBytes("UTF-8"), "AES");
+            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+            cipher.init(Cipher.DECRYPT_MODE, key);
+            byte[] decrypted = cipher.doFinal(Base64.getDecoder().decode(base64Data));
+            return new String(decrypted, "UTF-8");
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+}
diff --git a/dosc/ruoyi-license/src/main/resources/mapper/license/.WeDrive b/dosc/ruoyi-license/src/main/resources/mapper/license/.WeDrive
new file mode 100644
index 0000000..f82e862
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/resources/mapper/license/.WeDrive
@@ -0,0 +1 @@
+C:\Users\李涛\Documents\WXWork\1688851319997782\WeDrive\福莱瑞达\软件产品中心\软件产品中心共享资料\集成授权码功能\vue版本集成\授权码\ruoyi-license\src\main\resources\mapper\license
\ No newline at end of file
diff --git a/dosc/ruoyi-license/src/main/resources/mapper/license/SysLicenseMapper.xml b/dosc/ruoyi-license/src/main/resources/mapper/license/SysLicenseMapper.xml
new file mode 100644
index 0000000..e6603f0
--- /dev/null
+++ b/dosc/ruoyi-license/src/main/resources/mapper/license/SysLicenseMapper.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.license.mapper.SysLicenseMapper">
+    
+    <resultMap type="com.ruoyi.license.domain.SysLicense" id="SysLicenseResult">
+        <result property="licenseId"    column="license_id"    />
+        <result property="licenseCode"    column="license_code"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="expireTime"    column="expire_time"    />
+        <result property="status"    column="status"    />
+        <result property="activeTime"    column="active_time"    />
+        <result property="activeBy"    column="active_by"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysLicenseVo">
+        select license_id, license_code, start_time, expire_time, status, active_time, active_by, create_by, create_time, update_by, update_time, remark from sys_license
+    </sql>
+
+    <select id="selectSysLicenseList" parameterType="com.ruoyi.license.domain.SysLicense" resultMap="SysLicenseResult">
+        <include refid="selectSysLicenseVo"/>
+        <where>  
+            <if test="licenseCode != null  and licenseCode != ''"> and license_code = #{licenseCode}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="expireTime != null "> and expire_time = #{expireTime}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectSysLicenseById" parameterType="Long" resultMap="SysLicenseResult">
+        <include refid="selectSysLicenseVo"/>
+        where license_id = #{licenseId}
+    </select>
+
+    <select id="selectActiveLicense" resultMap="SysLicenseResult">
+        <include refid="selectSysLicenseVo"/>
+        where status = '1'
+        order by create_time desc
+        OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY
+    </select>
+        
+    <insert id="insertSysLicense" parameterType="com.ruoyi.license.domain.SysLicense" useGeneratedKeys="true" keyProperty="licenseId">
+        insert into sys_license
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="licenseCode != null and licenseCode != ''">license_code,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="expireTime != null">expire_time,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="activeTime != null">active_time,</if>
+            <if test="activeBy != null">active_by,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="licenseCode != null and licenseCode != ''">#{licenseCode},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="expireTime != null">#{expireTime},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="activeTime != null">#{activeTime},</if>
+            <if test="activeBy != null">#{activeBy},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysLicense" parameterType="com.ruoyi.license.domain.SysLicense">
+        update sys_license
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="licenseCode != null and licenseCode != ''">license_code = #{licenseCode},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="expireTime != null">expire_time = #{expireTime},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="activeTime != null">active_time = #{activeTime},</if>
+            <if test="activeBy != null">active_by = #{activeBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where license_id = #{licenseId}
+    </update>
+
+    <delete id="deleteSysLicenseById" parameterType="Long">
+        delete from sys_license where license_id = #{licenseId}
+    </delete>
+
+    <delete id="deleteSysLicenseByIds" parameterType="String">
+        delete from sys_license where license_id in 
+        <foreach item="licenseId" collection="array" open="(" separator="," close=")">
+            #{licenseId}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/dosc/vue授权码.md b/dosc/vue授权码.md
new file mode 100644
index 0000000..d6c8609
--- /dev/null
+++ b/dosc/vue授权码.md
@@ -0,0 +1,270 @@
+# 授权码模块集成改动说明
+
+> 本文档记录引入 `ruoyi-license` 授权码模块时，对原有项目文件的所有改动（不含 `ruoyi-license` 模块本身及 `SysLicenseController`）。
+
+---
+
+## 1. 根模块 `pom.xml`
+
+**文件路径：** `wms/pom.xml`
+
+**改动内容：**
+
+1. `<modules>` 中注册 `ruoyi-license` 子模块：
+
+```xml
+<modules>
+    <module>ruoyi-admin</module>
+    <module>ruoyi-framework</module>
+    <module>ruoyi-system</module>
+    <module>ruoyi-quartz</module>
+    <module>ruoyi-generator</module>
+    <module>ruoyi-common</module>
+    <module>ruoyi-license</module>  <!-- 新增 -->
+</modules>
+```
+
+2. `<dependencyManagement>` 中声明 `ruoyi-license` 依赖版本：
+
+```xml
+<!-- 授权码模块 -->
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+    <version>${ruoyi.version}</version>
+</dependency>
+```
+
+---
+
+## 2. `ruoyi-admin/pom.xml`
+
+**文件路径：** `wms/ruoyi-admin/pom.xml`
+
+**改动内容：**
+
+引入 `ruoyi-license` 依赖，使授权拦截器和配置能被 Spring Boot 扫描加载：
+
+```xml
+<!-- 授权码模块 -->
+<dependency>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-license</artifactId>
+</dependency>
+```
+
+---
+
+## 3. `SecurityConfig.java`
+
+**文件路径：** `wms/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java`
+
+**改动内容：**
+
+在 Spring Security 匿名白名单中加入 `/system/license/active`，允许未登录用户调用激活授权码接口：
+
+```java
+// 改动前
+requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+
+// 改动后
+requests.antMatchers("/login", "/register", "/captchaImage", "/system/license/active").permitAll()
+```
+
+---
+
+## 4. 前端 `api/license.js`（新建）
+
+**文件路径：** `wms/ui/src/api/license.js`
+
+**改动内容：**
+
+新建文件，封装授权码相关接口：
+
+```js
+import request from '@/utils/request'
+
+// 激活授权码（无需登录）
+export function activeLicense(licenseCode) {
+  return request({
+    url: '/system/license/active',
+    method: 'post',
+    params: { licenseCode }
+  })
+}
+
+// 查询当前授权信息（需登录）
+export function getLicenseInfo() {
+  return request({
+    url: '/system/license/info',
+    method: 'get'
+  })
+}
+```
+
+---
+
+## 5. 登录页 `login.vue`
+
+**文件路径：** `wms/ui/src/views/login.vue`
+
+**改动内容：**
+
+### 5.1 模板部分
+
+在登录按钮下方新增"激活授权码"按钮，以及激活弹窗：
+
+```html
+<!-- 激活授权码按钮 -->
+<el-form-item style="width:100%;">
+  <el-button
+    size="medium"
+    type="warning"
+    style="width:100%;"
+    @click.native.prevent="openLicenseDialog"
+  >激活授权码</el-button>
+</el-form-item>
+
+<!-- 激活授权码弹窗 -->
+<el-dialog title="激活授权码" :visible.sync="licenseDialogVisible" width="420px" append-to-body>
+  <el-input v-model="licenseCode" type="textarea" :rows="4" placeholder="请输入授权码" />
+  <span slot="footer">
+    <el-button @click="licenseDialogVisible = false">取 消</el-button>
+    <el-button type="primary" :loading="licenseLoading" @click="handleActiveLicense">激 活</el-button>
+  </span>
+</el-dialog>
+```
+
+### 5.2 Script 部分
+
+新增 import、data 字段和方法：
+
+```js
+// 新增 import
+import { activeLicense } from "@/api/license"
+
+// 新增 data 字段
+licenseDialogVisible: false,
+licenseCode: '',
+licenseLoading: false
+
+// 新增方法
+openLicenseDialog() {
+  this.licenseCode = ''
+  this.licenseDialogVisible = true
+},
+handleActiveLicense() {
+  if (!this.licenseCode.trim()) {
+    this.$message.warning('请输入授权码')
+    return
+  }
+  this.licenseLoading = true
+  activeLicense(this.licenseCode.trim()).then(res => {
+    if (res.code === 200) {
+      this.$message.success(res.msg || '授权码激活成功')
+      this.licenseDialogVisible = false
+    } else {
+      this.$message.error(res.msg || '授权码激活失败')
+    }
+  }).catch(() => {
+    this.$message.error('授权码激活失败')
+  }).finally(() => {
+    this.licenseLoading = false
+  })
+}
+```
+
+---
+
+## 6. 顶部导航栏 `Navbar.vue`
+
+**文件路径：** `wms/ui/src/layout/components/Navbar.vue`
+
+**改动内容：**
+
+### 6.1 模板部分
+
+在 navbar 中间插入授权到期警告条（剩余不足 30 天时显示）：
+
+```html
+<div v-if="licenseWarning" class="license-warning">
+  <i class="el-icon-warning-outline" />
+  系统授权将于 {{ licenseExpireText }} 后过期，请及时联系管理员续期
+</div>
+```
+
+### 6.2 Script 部分
+
+```js
+// 新增 import
+import { getLicenseInfo } from '@/api/license'
+
+// 新增 data 字段
+licenseWarning: false,
+licenseExpireText: '',
+licenseTimer: null
+
+// 新增生命周期钩子
+mounted() {
+  this.checkLicenseExpire()
+  this.licenseTimer = setInterval(() => this.checkLicenseExpire(), 60 * 1000)
+},
+beforeDestroy() {
+  if (this.licenseTimer) clearInterval(this.licenseTimer)
+},
+
+// 新增方法
+checkLicenseExpire() {
+  getLicenseInfo().then(res => {
+    if (res.code === 200 && res.data && res.data.expireTime) {
+      const expireTime = new Date(res.data.expireTime).getTime()
+      const now = Date.now()
+      const diffMs = expireTime - now
+      const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24))
+      if (diffMs > 0 && diffDays <= 30) {
+        this.licenseWarning = true
+        if (diffMs < 1000 * 60 * 60 * 24) {
+          const hours = Math.floor(diffMs / (1000 * 60 * 60))
+          const minutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60))
+          this.licenseExpireText = hours > 0 ? `${hours} 小时 ${minutes} 分钟` : `${minutes} 分钟`
+        } else if (diffDays < 7) {
+          this.licenseExpireText = diffDays + ' 天'
+        } else {
+          this.licenseExpireText = Math.ceil(diffDays / 7) + ' 周'
+        }
+      }
+    }
+  }).catch(() => {})
+}
+```
+
+### 6.3 样式部分
+
+```scss
+.license-warning {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 0;
+  height: 50px;
+  line-height: 50px;
+  font-size: 13px;
+  color: #e6a23c;
+  font-weight: 500;
+  pointer-events: none;
+  i { margin-right: 4px; }
+}
+```
+
+---
+
+## 改动文件汇总
+
+| 文件 | 类型 | 说明 |
+|---|---|---|
+| `wms/pom.xml` | 修改 | 注册模块 + 声明依赖版本 |
+| `wms/ruoyi-admin/pom.xml` | 修改 | 引入 ruoyi-license 依赖 |
+| `ruoyi-framework/.../SecurityConfig.java` | 修改 | 白名单加入激活授权码接口 |
+| `ui/src/api/license.js` | 新建 | 封装激活和查询授权信息接口 |
+| `ui/src/views/login.vue` | 修改 | 新增激活授权码按钮和弹窗 |
+| `ui/src/layout/components/Navbar.vue` | 修改 | 新增授权到期倒计时警告条 |
diff --git a/dosc/授权码vue版本配置手册.docx b/dosc/授权码vue版本配置手册.docx
new file mode 100644
index 0000000..e6458c6
Binary files /dev/null and b/dosc/授权码vue版本配置手册.docx differ
diff --git a/pom.xml b/pom.xml
index 796e05e..8850b9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 授权码模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-license</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.ai</groupId>
                 <artifactId>spring-ai-bom</artifactId>
@@ -243,6 +250,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>ruoyi-license</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -251,7 +259,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <parameters>true</parameters>
                     <source>${java.version}</source>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index c3d5860..ce7f1fc 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -54,6 +54,12 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <!-- 授权码模块 -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-license</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-starter-model-openai</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index c52287c..2c1c54c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,9 +1,11 @@
 package com.ruoyi;
 
+import java.security.Security;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
@@ -17,6 +19,7 @@ public class RuoYiApplication
 {
     public static void main(String[] args)
     {
+        enableSqlServerLegacyTls();
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("""
@@ -24,4 +27,25 @@ public class RuoYiApplication
                             This is a text block with Unicode characters.
                 """);
     }
+
+    private static void enableSqlServerLegacyTls()
+    {
+        if (!Boolean.parseBoolean(System.getProperty("ruoyi.sqlserver.legacyTls.enabled", "true")))
+        {
+            return;
+        }
+
+        String propertyName = "jdk.tls.disabledAlgorithms";
+        String disabledAlgorithms = Security.getProperty(propertyName);
+        if (disabledAlgorithms == null || disabledAlgorithms.isBlank())
+        {
+            return;
+        }
+
+        String compatibleAlgorithms = Arrays.stream(disabledAlgorithms.split(","))
+                .map(String::trim)
+                .filter(algorithm -> !"TLSv1".equalsIgnoreCase(algorithm))
+                .collect(Collectors.joining(", "));
+        Security.setProperty(propertyName, compatibleAlgorithms);
+    }
 }
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..a92c5cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.api.controller;
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.api.domain.ErpProduct;
 import com.ruoyi.api.domain.ReMaterialParam;
@@ -11,6 +12,10 @@ import com.ruoyi.bas.BasProduct.service.IBasProductService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.device.agv.domain.AgvContainerTask;
+import com.ruoyi.device.agv.service.IAgvContainerTaskService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
 import com.ruoyi.log.domain.RequestLog;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
@@ -19,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.*;
 
 /**
  * 作业统计 Controller
@@ -36,6 +41,10 @@ public class ToWmsApiController {
     private IOutStockoutService outStockoutService;
     @Autowired
     private IBasProductService basProductService;
+    @Autowired
+    private MydoJobMapper mapper;
+    @Autowired
+    private IAgvContainerTaskService agvContainerTaskService;
 
     /**
      * 入库请求生成作业
@@ -43,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/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/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/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..01d44e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -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,269 @@ 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）
+        // ===================== 入库单 1-4 逻辑完全不变 =====================
         if (type >= 1 && type <= 4) {
             InStockin param = new InStockin();
-            param.setStockinId(deliveryNoticeVo.getBillNo());
-            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
+            param.setErpBill(deliveryNoticeVo.getBillNo());
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
+            List<InStockin> existList = inStockinService.selectInStockinListBill(param);
+//            List<InStockin> existList = inStockinService.selectInStockinListApi(param);
             InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null;
 
             // 删除操作（操作类型3）
@@ -125,7 +399,6 @@ public class ToErpServiceImpl implements IToErpService {
                     inStockinDetailService.deleteInStockinDetailByStockinGuid(exist.getStockinGuid());
                     inStockinService.deleteInStockinByStockinGuid(exist.getStockinGuid());
                 }
-
                 return AjaxResult.success();
             }
 
@@ -134,7 +407,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 +417,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 +445,52 @@ 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）
+
+        // ===================== 出库单 5-7 改造：按立库/平库分两组各1主单多明细 =====================
         else if (type >= 5 && type <= 7) {
             OutStockout param = new OutStockout();
-            param.setStockoutId(deliveryNoticeVo.getBillNo());
+            param.setErpStockoutId(deliveryNoticeVo.getBillNo());
+            param.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
             List<OutStockout> outList = outStockoutService.selectOutStockoutList(param);
             OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null;
+            String billNo = deliveryNoticeVo.getBillNo();
 
-            // 删除操作（操作类型3）
+            // 删除操作 不变
             if ("3".equals(opType)) {
                 if (exist == null) {
                     return AjaxResult.error("单据不存在");
@@ -210,7 +499,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 +509,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 +706,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 +963,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 +1215,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 +1239,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 +1255,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/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/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
index d10a63f..d6be1f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
@@ -82,5 +82,14 @@ 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);
 }
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/job/mydojobdetail/domain/PkDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/PkDetail.java
new file mode 100644
index 0000000..e0faf1b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/PkDetail.java
@@ -0,0 +1,27 @@
+package com.ruoyi.job.mydojobdetail.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/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/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/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..a31483d 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,6 +1,7 @@
 package com.ruoyi.pda.domain;
 
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.domain.PkDetail;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -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..6442007 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,19 @@ 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.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.domain.PkDetail;
 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 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -60,13 +63,14 @@ public class PdaServiceImp implements PdaService {
     private BasStockMapper basStockMapper;
     @Autowired
     private IInStockinService inStockinService;
-
+    @Autowired
+    private OutStockoutDetailServiceImpl outStockoutDetailService;
 
     @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);
         return hasHalfTray;
     }
@@ -75,16 +79,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,21 +116,18 @@ 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());
             }
-
         }
-
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
         map.put("v_is_full", trayCodeMakeSure.getIsFull());
@@ -134,18 +135,19 @@ public class PdaServiceImp implements PdaService {
         if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(errorbulider.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 +157,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,9 +199,10 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+//        mydoJob.setExitId(trayCodeMakeSure.getExitId());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         return AjaxResult.success(mydoJobDetails);
     }
@@ -237,9 +240,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 +252,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 +290,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..bf0bc50 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://127.0.0.1:1433;databaseName=FT546-WMS;encrypt=false;
                 username: sa
-                password: Flrd0914.
+                password: 123456
             # 从库数据源
             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..cc479b0 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,12 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 43800
+
+# 授权码配置
+license:
+  # 首次部署需先执行 sql/sys_license.sql 并激活授权码，再改为 true 启用拦截
+  enabled: false
 
 
 
@@ -175,4 +180,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/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/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..fd19718 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,34 +70,34 @@ 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>
 
@@ -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..fb655ab 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,91 @@ 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="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 +230,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 +253,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 +283,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 +335,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..3c2a8f1 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,38 @@ 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>
+
+
+
+
+
 </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/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-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index edd56ef..d53cf4e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -100,7 +100,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.requestMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.requestMatchers("/login", "/register", "/captchaImage").permitAll()
+                requests.requestMatchers("/login", "/register", "/captchaImage", "/system/license/active").permitAll()
                     // 静态资源，可匿名访问
                     .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**.html", "/**.css", "/**.js", "/profile/**").permitAll()
                     .requestMatchers("/swagger-ui.html", "/v3/api-docs/**", "/swagger-ui/**", "/druid/**").permitAll()
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index a8531ba..bae6a96 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "艾度 WMS system"
 
 # 开发环境配置
 ENV = 'development'
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 8074604..061cea2 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "艾度 WMS system"
 
 # 生产环境配置
 ENV = 'production'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index dbe8edd..ae39ce6 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "艾度 WMS system"
 
 BABEL_ENV = production
 
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/api/requestInterface/log.js b/ruoyi-ui/src/api/requestInterface/log.js
index 123dca1..39ba634 100644
--- a/ruoyi-ui/src/api/requestInterface/log.js
+++ b/ruoyi-ui/src/api/requestInterface/log.js
@@ -9,6 +9,30 @@ export function listLog(query) {
   })
 }
 
+
+export function getMethod() {
+  return request({
+    url: '/requestInterface/log/getMethod',
+    method: 'get'
+
+  })
+}
+
+export function getSource() {
+  return request({
+    url: '/requestInterface/log/getSource',
+    method: 'get'
+
+  })
+}
+
+export function getTarget() {
+  return request({
+    url: '/requestInterface/log/getTarget',
+    method: 'get'
+
+  })
+}
 // 查询接口记录详细
 export function getLog(requestId) {
   return request({
diff --git a/ruoyi-ui/src/api/stock/management.js b/ruoyi-ui/src/api/stock/management.js
index a1873b6..3add5d7 100644
--- a/ruoyi-ui/src/api/stock/management.js
+++ b/ruoyi-ui/src/api/stock/management.js
@@ -10,10 +10,11 @@ export function listManagement(query) {
 }
 
 // 查询库存信息详细
-export function getManagement(stockId) {
+export function getManagement(stockId, warehouseCode) {
   return request({
     url: '/stock/management/' + stockId,
-    method: 'get'
+    method: 'get',
+    params: {"warehouseCode": warehouseCode}
   })
 }
 
@@ -45,12 +46,14 @@ export function updateManagement(data) {
 }
 
 // 删除库存信息
-export function delManagement(stockId) {
+export function delManagement(stockId, warehouseCode) {
   return request({
     url: '/stock/management/' + stockId,
-    method: 'delete'
+    method: 'delete',
+    params: {"warehouseCode": warehouseCode}
   })
 }
+
 //重置盘点记录
 export function resetPdRecord() {
   return request({
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 08ac487..eda541b 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 50, 100, 1000]
       }
     },
     // 移动端页码按钮的数量端默认值5
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 8b51fc4..a210626 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -5,6 +5,11 @@
     <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
     <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
 
+    <div v-if="licenseWarning" class="license-warning">
+      <i class="el-icon-warning-outline" />
+      系统授权将于 {{ licenseExpireText }} 后过期，请及时联系管理员续期
+    </div>
+
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
@@ -48,6 +53,7 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
+import { getLicenseInfo } from '@/api/license'
 // import RuoYiGit from '@/components/RuoYi/Git'
 // import RuoYiDoc from '@/components/RuoYi/Doc'
 
@@ -63,6 +69,13 @@ export default {
     // RuoYiGit,
     // RuoYiDoc
   },
+  data() {
+    return {
+      licenseWarning: false,
+      licenseExpireText: '',
+      licenseTimer: null
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',
@@ -81,7 +94,41 @@ export default {
       }
     }
   },
+  mounted() {
+    this.checkLicenseExpire()
+    this.licenseTimer = setInterval(this.checkLicenseExpire, 60 * 1000)
+  },
+  beforeDestroy() {
+    if (this.licenseTimer) {
+      clearInterval(this.licenseTimer)
+    }
+  },
   methods: {
+    checkLicenseExpire() {
+      getLicenseInfo().then(response => {
+        this.licenseWarning = false
+        this.licenseExpireText = ''
+        if (response.code !== 200 || !response.data || !response.data.expireTime) {
+          return
+        }
+        const expireTime = new Date(response.data.expireTime).getTime()
+        const diffMs = expireTime - Date.now()
+        const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24))
+        if (diffMs <= 0 || diffDays > 30) {
+          return
+        }
+        this.licenseWarning = true
+        if (diffMs < 1000 * 60 * 60 * 24) {
+          const hours = Math.floor(diffMs / (1000 * 60 * 60))
+          const minutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60))
+          this.licenseExpireText = hours > 0 ? `${hours} 小时 ${minutes} 分钟` : `${minutes} 分钟`
+        } else if (diffDays < 7) {
+          this.licenseExpireText = `${diffDays} 天`
+        } else {
+          this.licenseExpireText = `${Math.ceil(diffDays / 7)} 周`
+        }
+      }).catch(() => {})
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -113,6 +160,27 @@ export default {
   color: var(--navbar-color, #5a5e66);
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
+  .license-warning {
+    position: absolute;
+    left: 50%;
+    top: 0;
+    max-width: calc(100% - 420px);
+    height: 44px;
+    overflow: hidden;
+    color: #e6a23c;
+    font-size: 13px;
+    font-weight: 500;
+    line-height: 44px;
+    pointer-events: none;
+    text-overflow: ellipsis;
+    transform: translateX(-50%);
+    white-space: nowrap;
+
+    i {
+      margin-right: 4px;
+    }
+  }
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;
diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue
index 1e5973c..e23267a 100644
--- a/ruoyi-ui/src/views/bas/traycode/index.vue
+++ b/ruoyi-ui/src/views/bas/traycode/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
-<!--      <el-form-item label="格式ID" prop="formatId">-->
-<!--&lt;!&ndash;        <el-input-->
-<!--          v-model="queryParams.formatId"-->
-<!--          placeholder="请输入格式ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />&ndash;&gt;-->
-<!--        <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
-<!--          <el-option-->
-<!--            v-for="item in traycodeFormatList"-->
-<!--            :key="item.id"-->
-<!--            :label="item.remarks"-->
-<!--            :value="item.id"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="格式ID" prop="formatId">-->
+      <!--&lt;!&ndash;        <el-input-->
+      <!--          v-model="queryParams.formatId"-->
+      <!--          placeholder="请输入格式ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />&ndash;&gt;-->
+      <!--        <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
+      <!--          <el-option-->
+      <!--            v-for="item in traycodeFormatList"-->
+      <!--            :key="item.id"-->
+      <!--            :label="item.remarks"-->
+      <!--            :value="item.id"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
       <el-form-item label="条码" prop="trayCode">
         <el-input
           v-model="queryParams.trayCode"
@@ -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="格式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="id" />-->
+      <!--      <el-table-column label="格式ID" align="left" prop="formatName"  />-->
+      <el-table-column label="条码" align="center" prop="trayCode"  />
+      <!--      <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
+      <el-table-column label="是否可用" 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>
@@ -168,12 +187,28 @@
 
 
     <!-- 打印模板 -->
+<!--    <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-barcode-->
+<!--          :value=item.trayCode-->
+<!--          format="CODE39"-->
+<!--          width="2"-->
+<!--          height="100"-->
+<!--          display-value-->
+<!--          margin="2"-->
+<!--        />-->
+<!--      </div>-->
+<!--    </vue-easy-print>-->
     <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="CODE128"
+          width="4"
+          height="150"
+          display-value
+          margin="5"
+        />
       </div>
     </vue-easy-print>
   </div>
@@ -184,13 +219,15 @@ import { listTraycode, getTraycode, delTraycode, addTraycode, updateTraycode } f
 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 +390,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 +417,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)
       });
     },
@@ -405,7 +472,7 @@ export default {
 
 @media print {
   @page {
-    size: A4;
+    size: 80mm 50mm;
     margin: 0;
   }
 
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 8044138..64e0d68 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -31,25 +31,42 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="项目号" prop="departmentNo">
+      <el-form-item label="项目号" prop="spare4">
       <el-input
-        v-model="queryParams.departmentNo"
+        v-model="queryParams.spare4"
         placeholder="请输入项目号"
         clearable
         @keyup.enter.native="handleQuery"
       />
-    </el-form-item>
-      <el-form-item label="合同号" prop="spare1">
+      </el-form-item>
+      <el-form-item label="条码号" prop="stockinDetailId">
         <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入合同号"
+          v-model="queryParams.stockinDetailId"
+          placeholder="请输入条码号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="销售订单号" prop="spare2">
+        <el-form-item label="组件号" prop="cargoNo">
+          <el-input
+            v-model="queryParams.cargoNo"
+            placeholder="请输入组件号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+
+    </el-form-item>
+      <el-form-item label="wms单据号" prop="stockinId">
         <el-input
-          v-model="queryParams.spare2"
+          v-model="queryParams.stockinId"
+          placeholder="请输入单据号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="erp单据号" prop="erpBill">
+        <el-input
+          v-model="queryParams.erpBill"
           placeholder="请输入销售订单号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -65,15 +82,25 @@
         />
       </el-form-item>
 
-      <el-form-item label="批次号" prop="lotNo"><!--品名-->
+      <el-form-item label="存货编码" prop="productId"><!--品名-->
         <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
+          v-model="queryParams.productId"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
+
+<!--      <el-form-item label="批次号" prop="lotNo">&lt;!&ndash;品名&ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批次号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
       <el-form-item :label="'单据时间'" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -170,23 +197,14 @@
     <el-table v-loading="loading" :data="stockInList" @selection-change="handleSelectionChange"
               @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" width="60" align="center">
+        <template slot-scope="scope">
+          {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
       <el-table-column label="入库单据号" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
-      <el-table-column label="单据类型" align="left" prop="inType"><!--入库类型-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="单据状态" align="left" prop="status"><!--单据状态-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="单据来源" align="left" prop="stockSource"><!--单据来源-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="erp单据号" align="left" prop="erpBill" width="150" sortable/>
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
       <el-table-column label="供应商代码" align="left" prop="supplierNo"/><!--仓库-->
       <el-table-column label="供应商名称" align="left" prop="classNo" /><!--供应商-->
@@ -219,8 +237,8 @@
       <el-table-column label="单位" align="left" prop="unit"/><!--机型-->
       <el-table-column label="规格型号" align="left" prop="spec"/><!--规格-->
       <el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
-      <el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
+      <el-table-column label="组件号" align="left" prop="cargoNo"/><!--净重-->
+      <el-table-column label="项目号" align="left" prop="spare4"/><!--颜色-->
       <el-table-column label="计划数量" align="left" prop="quantity" sortable/><!--计划数量-->
       <el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
       <el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
@@ -328,7 +346,10 @@ export default {
         spare2: null,
         spare4: null,
         spare3: null,
-        spare5: null
+        spare5: null,
+        cargoNo:null,
+        productId:null,
+        stockinDetailId:null
       },
       queryDetailParams: {
         pageNum: 1,
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index 8fa9db0..4a97013 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -60,6 +60,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="项目号" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入存货编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
         <el-date-picker clearable
           v-model="queryParams.startTime"
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 304815b..c753ab9 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -56,8 +56,18 @@
             <router-link class="link-type" :to="'/register'">立即注册</router-link>
           </div>
         </el-form-item>
+        <el-form-item style="width:100%;">
+          <el-button size="medium" type="warning" plain class="license-button" @click.native.prevent="openLicenseDialog">激活授权码</el-button>
+        </el-form-item>
       </el-form>
     </div>
+    <el-dialog title="激活授权码" :visible.sync="licenseDialogVisible" width="420px" append-to-body>
+      <el-input v-model="licenseCode" type="textarea" :rows="4" placeholder="请输入授权码" />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="licenseDialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="licenseLoading" @click="handleActiveLicense">激 活</el-button>
+      </span>
+    </el-dialog>
     <!--  底部  -->
     <div class="el-login-footer">
       <span>{{ $t('login.bottom') }}</span>
@@ -70,6 +80,7 @@ import LangSelect from '@/components/LangSelect'
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { activeLicense } from '@/api/license'
 
 export default {
   name: "Login",
@@ -98,7 +109,10 @@ export default {
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      licenseDialogVisible: false,
+      licenseCode: '',
+      licenseLoading: false
     };
   },
   watch: {
@@ -156,6 +170,30 @@ export default {
           });
         }
       });
+    },
+    openLicenseDialog() {
+      this.licenseCode = ''
+      this.licenseDialogVisible = true
+    },
+    handleActiveLicense() {
+      const licenseCode = this.licenseCode.trim()
+      if (!licenseCode) {
+        this.$message.warning('请输入授权码')
+        return
+      }
+      this.licenseLoading = true
+      activeLicense(licenseCode).then(response => {
+        if (response.code === 200) {
+          this.$message.success(response.msg || '授权码激活成功')
+          this.licenseDialogVisible = false
+        } else {
+          this.$message.error(response.msg || '授权码激活失败')
+        }
+      }).catch(() => {
+        this.$message.error('授权码激活失败')
+      }).finally(() => {
+        this.licenseLoading = false
+      })
     }
   }
 };
@@ -177,7 +215,13 @@ export default {
   padding: 40px;
   padding-top: 50px;
   width: 480px;
-  height: 500px;
+  min-height: 560px;
+}
+
+.license-button {
+  width: 100%;
+  height: 40px;
+  font-size: 15px;
 }
 
 .title {
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index c796934..13f3619 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="'erp单据号'" prop="erpStockoutId"> <!-- 出库单编号 -->
+        <el-input
+          v-model="queryParams.erpStockoutId"
+          :placeholder="'请输入erp单据号'"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="'出库类型'" prop="outType"> <!-- 出库类型 -->
         <el-select v-model="queryParams.outType" :placeholder="'请选择出库类型'" clearable>
           <el-option
@@ -53,6 +61,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="'项目号'" prop="spare4">
+        <el-input
+          v-model="queryParams.spare4"
+          :placeholder="'请输入项目号'"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="'存货编码'" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          :placeholder="'请输入存货编码'"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="'存货名称'" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -74,8 +98,9 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}</el-button> <!-- 搜索 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{'重置'}}</el-button> <!-- 重置 -->
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ '搜索' }}</el-button>
+        <!-- 搜索 -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ '重置' }}</el-button> <!-- 重置 -->
       </el-form-item>
     </el-form>
 
@@ -89,7 +114,8 @@
           size="mini"
           @click="handleAudit(2)"
           v-hasPermi="['out:outStockout:changeStatus']"
-        >{{'单据审核'}}</el-button> <!-- 单据审核 -->
+        >{{ '单据审核' }}
+        </el-button> <!-- 单据审核 -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -99,7 +125,8 @@
           size="mini"
           @click="handleAudit(4)"
           v-hasPermi="['out:outStockout:changeStatus']"
-        >{{'单据确认'}}</el-button> <!-- 单据确认 -->
+        >{{ '单据确认' }}
+        </el-button> <!-- 单据确认 -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -109,7 +136,8 @@
           size="mini"
           @click="handleAudit(5)"
           v-hasPermi="['out:outStockout:changeStatus']"
-        >{{'单据作废'}}</el-button> <!-- 单据作废 -->
+        >{{ '单据作废' }}
+        </el-button> <!-- 单据作废 -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -119,7 +147,8 @@
           size="mini"
           @click="handleAutoAllot"
           v-hasPermi="['out:outStockout:autoAllot']"
-        >{{'自动分配'}}</el-button> <!-- 自动分配 -->
+        >{{ '自动分配' }}
+        </el-button> <!-- 自动分配 -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -129,14 +158,22 @@
           size="mini"
           @click="handleManualAllot"
           v-hasPermi="['out:outStockout:manualAllot']"
-        >{{'手动分配'}}</el-button> <!-- 手动分配 -->
+        >{{ '手动分配' }}
+        </el-button> <!-- 手动分配 -->
       </el-col>
     </el-row>
 
     <!-- 主表数据 -->
-    <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
+    <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange"
+              @row-click="handleRowClick" max-height="400">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" width="60" align="center">
+        <template slot-scope="scope">
+          {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'出库单编号'" align="left" prop="stockoutId"/>
+      <el-table-column :label="'erp单据号'" align="left" prop="erpStockoutId"/>
       <el-table-column :label="'出库类型'" align="left" prop="outType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -147,10 +184,11 @@
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column :label="'项目号'" align="left" prop="departmentNo" />
+
+      <el-table-column :label="'项目号'" align="left" prop="departmentNo"/>
       <el-table-column :label="'客商代号'" align="left" prop="customerNo"/>
       <el-table-column :label="'客商名称'" align="left" prop="classNowId"/>
-      <el-table-column :label="'建单人'" align="left" prop="createManId" />
+      <el-table-column :label="'建单人'" align="left" prop="createManId"/>
       <el-table-column :label="'出库方式'" align="left" prop="carNumber">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_method" :value="scope.row.carNumber"/>
@@ -161,16 +199,17 @@
           <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockoutSource"/>
         </template>
       </el-table-column>
+
       <el-table-column :label="'仓库编码'" align="left" prop="warehouseId"/>
       <el-table-column :label="'仓库名称'" align="left" prop="warehouseName"/>
       <!--      <el-table-column :label="'合同号'" align="left" prop="spare1" />-->
       <!--      <el-table-column :label="'销售订单号'" align="left" prop="spare2" />-->
-      <el-table-column :label="'审核时间'" align="left" prop="spare3" />
-      <el-table-column :label="'审核人'" align="left" prop="spare4" />
+      <el-table-column :label="'审核时间'" align="left" prop="spare3"/>
+      <el-table-column :label="'审核人'" align="left" prop="spare4"/>
       <el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
       <el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
       <el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
-      <el-table-column :label="'备注'" align="left" prop="spare5" />
+      <el-table-column :label="'备注'" align="left" prop="spare5"/>
     </el-table>
 
     <pagination
@@ -182,11 +221,12 @@
     />
 
     <!-- 子表数据 -->
-    <el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
+    <el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;"
+              @selection-change="handleDetailSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160"/> <!-- 出库子单编号 -->
       <el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
-      <el-table-column :label="'存货名称'" align="center" prop="productName" />
+      <el-table-column :label="'存货名称'" align="center" prop="productName"/>
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/>
       <el-table-column :label="'供应商编码'" align="center" prop="fid"/>
       <el-table-column :label="'计量单位'" align="center" prop="unit"/>
@@ -203,13 +243,13 @@
       <!--      <el-table-column :label="'备注'" align="center" prop="remark"/>-->
     </el-table>
 
-<!--    <pagination-->
-<!--      v-show="detailTotal>0"-->
-<!--      :total="detailTotal"-->
-<!--      :page.sync="detailQueryParams.pageNum"-->
-<!--      :limit.sync="detailQueryParams.pageSize"-->
-<!--      @pagination="getDetailList"-->
-<!--    />-->
+    <!--    <pagination-->
+    <!--      v-show="detailTotal>0"-->
+    <!--      :total="detailTotal"-->
+    <!--      :page.sync="detailQueryParams.pageNum"-->
+    <!--      :limit.sync="detailQueryParams.pageSize"-->
+    <!--      @pagination="getDetailList"-->
+    <!--    />-->
 
     <!-- 审核弹窗 -->
     <el-dialog :title="'审核'" :visible.sync="auditDialogVisible" width="400px" append-to-body>
@@ -226,8 +266,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAudit">{{"确认"}}</el-button>
-        <el-button @click="cancelAudit">{{"取消"}}</el-button>
+        <el-button type="primary" @click="submitAudit">{{ "确认" }}</el-button>
+        <el-button @click="cancelAudit">{{ "取消" }}</el-button>
       </div>
     </el-dialog>
 
@@ -237,7 +277,9 @@
       <el-row style="margin-bottom: 15px; padding: 10px; background-color: #f5f7fa; border-radius: 4px;">
         <el-col :span="8">
           <span style="font-weight: bold;">计划数量: </span>
-          <span style="color: #409EFF; font-size: 16px;">{{ selectedDetailRows.length > 0 ? selectedDetailRows[0].quantity : 0 }}</span>
+          <span style="color: #409EFF; font-size: 16px;">{{
+              selectedDetailRows.length > 0 ? selectedDetailRows[0].quantity : 0
+            }}</span>
         </el-col>
         <el-col :span="8">
           <span style="font-weight: bold;">已选库存数量: </span>
@@ -245,7 +287,9 @@
         </el-col>
         <el-col :span="8">
           <span style="font-weight: bold;">剩余可分配: </span>
-          <span :style="{ color: remainingQuantity >= 0 ? '#67C23A' : '#F56C6C', fontSize: '16px' }">{{ remainingQuantity }}</span>
+          <span :style="{ color: remainingQuantity >= 0 ? '#67C23A' : '#F56C6C', fontSize: '16px' }">{{
+              remainingQuantity
+            }}</span>
         </el-col>
       </el-row>
 
@@ -283,27 +327,28 @@
       </el-form>
 
       <!-- 库存明细表格 -->
-      <el-table ref="stockTable" v-loading="stockLoading" :data="stockList" @selection-change="handleStockSelectionChange" max-height="400">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="库存编码" align="center" prop="stockId" />
-        <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
-        <el-table-column label="批次号" align="center" prop="lotNo" />
-        <el-table-column label="品号" align="center" prop="productId" />
-        <el-table-column label="品名" align="center" prop="productName" />
-        <el-table-column label="数量" align="center" prop="quantity" width="80" />
-        <el-table-column label="规格" align="center" prop="spare1" />
-        <el-table-column label="单位" align="center" prop="spare3" />
-        <el-table-column label="型号" align="center" prop="spare4" />
-        <el-table-column label="颜色" align="center" prop="spare5" />
-        <el-table-column label="序列号" align="center" prop="spare6" />
-        <el-table-column label="电压" align="center" prop="voltage" />
-        <el-table-column label="功率" align="center" prop="power" />
-        <el-table-column label="相位" align="center" prop="phase" />
-        <el-table-column label="净重" align="center" prop="netWeight" />
-        <el-table-column label="毛重" align="center" prop="grossWeight" />
-        <el-table-column label="分销" align="center" prop="distribution" />
-        <el-table-column label="机型" align="center" prop="model" />
-        <el-table-column label="订单号" align="center" prop="orderId" />
+      <el-table ref="stockTable" v-loading="stockLoading" :data="stockList"
+                @selection-change="handleStockSelectionChange" max-height="400">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="库存编码" align="center" prop="stockId"/>
+        <el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
+        <el-table-column label="批次号" align="center" prop="lotNo"/>
+        <el-table-column label="品号" align="center" prop="productId"/>
+        <el-table-column label="品名" align="center" prop="productName"/>
+        <el-table-column label="数量" align="center" prop="quantity" width="80"/>
+        <el-table-column label="规格" align="center" prop="spare1"/>
+        <el-table-column label="单位" align="center" prop="spare3"/>
+        <el-table-column label="型号" align="center" prop="spare4"/>
+        <el-table-column label="颜色" align="center" prop="spare5"/>
+        <el-table-column label="序列号" align="center" prop="spare6"/>
+        <el-table-column label="电压" align="center" prop="voltage"/>
+        <el-table-column label="功率" align="center" prop="power"/>
+        <el-table-column label="相位" align="center" prop="phase"/>
+        <el-table-column label="净重" align="center" prop="netWeight"/>
+        <el-table-column label="毛重" align="center" prop="grossWeight"/>
+        <el-table-column label="分销" align="center" prop="distribution"/>
+        <el-table-column label="机型" align="center" prop="model"/>
+        <el-table-column label="订单号" align="center" prop="orderId"/>
 
       </el-table>
 
@@ -342,7 +387,7 @@ export default {
       // 遮罩层
       loading: true,
       detailLoading: false,
-      warehouseOptions:[],
+      warehouseOptions: [],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -374,13 +419,13 @@ export default {
       // 审核表单验证规则
       auditRules: {
         exitId: [
-          { required: true, message: '请选择出口', trigger: 'change' }
+          {required: true, message: '请选择出口', trigger: 'change'}
         ]
       },
       // 出口选项
       exitOptions: [
-        { exitId: '1', exitName: '一楼'},
-        { exitId: '2', exitName: '二楼'},
+        {exitId: '1', exitName: '一楼'},
+        {exitId: '2', exitName: '二楼'},
 
       ],
 
@@ -399,14 +444,17 @@ export default {
         productName: null,
         startDate: null,
         finishDate: null,
-        status: null
+        status: null,
+        spare4: null,
+        erpStockoutId: null,
+        productId: null
       },
       // 子表分页参数
       detailQueryParams: {
         pageNum: 1,
         pageSize: 99,
-        status:null,
-        stockoutGuid:null
+        status: null,
+        stockoutGuid: null
 
       },
       warehouseQueryParams: {
@@ -432,7 +480,7 @@ export default {
     // 计算选中库存的总数量
     selectedStockQuantity() {
       return this.selectedStockRows.reduce((total, stock) => {
-        console.log(total+ + (parseFloat(stock.quantity)))
+        console.log(total + +(parseFloat(stock.quantity)))
         return total + (parseFloat(stock.quantity) || 0)
       }, 0)
     },
@@ -466,7 +514,7 @@ export default {
         // 如果有数据，自动选中第一行
         if (this.outStockoutList.length > 0) {
           this.handleRowClick(this.outStockoutList[0]);
-        }else {
+        } else {
           this.outStockDetailList = []
           this.detailLoading = false
         }
@@ -474,7 +522,7 @@ export default {
       })
     },
     /** 查询子表数据 */
-    getDetailList(stockoutGuid,status) {
+    getDetailList(stockoutGuid, status) {
       this.detailLoading = true
       this.detailQueryParams.stockoutGuid = stockoutGuid
       this.detailQueryParams.status = status
@@ -510,7 +558,7 @@ export default {
     },
     /** 点击行加载明细数据 */
     handleRowClick(row) {
-      this.getDetailList(row.stockoutGuid,row.status)
+      this.getDetailList(row.stockoutGuid, row.status)
     },
     /** 多选框选中数据 */
     handleSelectionChange(selection) {
@@ -527,22 +575,21 @@ export default {
         return
       }
 
-     for(var i=0;i<this.selectedRows.length;i++){
-       if (this.selectedRows[i].status != "1" && status == 2) {
-        this.$modal.msgError(this.selectedRows[i].stockoutId+'单据已审核')
-        return
-      }
+      for (var i = 0; i < this.selectedRows.length; i++) {
+        if (this.selectedRows[i].status != "1" && status == 2) {
+          this.$modal.msgError(this.selectedRows[i].stockoutId + '单据已审核')
+          return
+        }
 
-       if (Number(this.selectedRows[i].status) < 3 && status == 4) {
-        this.$modal.msgError(this.selectedRows[i].stockoutId+"单据未开始，无法确认")
-        return
+        if (Number(this.selectedRows[i].status) < 3 && status == 4) {
+          this.$modal.msgError(this.selectedRows[i].stockoutId + "单据未开始，无法确认")
+          return
+        }
+        if (this.selectedRows[i].status != "1" && status == 5) {
+          this.$modal.msgError(this.selectedRows[i].stockoutId + '单据已审核，无法作废')
+          return;
+        }
       }
-       if (this.selectedRows[i].status != "1" && status == 5){
-         this.$modal.msgError(this.selectedRows[i].stockoutId+'单据已审核，无法作废')
-         return;
-       }
-     }
-
 
 
       // 如果是审核操作(status=2)，显示弹窗选择出口
@@ -582,15 +629,16 @@ export default {
       let outstock = this.selectedRows[0]
       if (outstock.status != "2" && outstock.status != "3") {
         this.$modal.msgError('请先审核出库单')
-         return
+        return
       }
       let data = {
         stockoutId: stockoutIds[0]
       }
+      console.log("进入自动分配")
       autoAllot(data).then(response => {
-        if (response.code !== 200){
+        if (response.code !== 200) {
           this.$modal.msgError(response.msg)
-        }else {
+        } else {
           this.$modal.msgSuccess(response.msg)
         }
         this.getList()
@@ -607,7 +655,7 @@ export default {
         return
       }
       // 检查主表状态
-      if(this.selectedRows.length >1){
+      if (this.selectedRows.length > 1) {
         this.$modal.msgError('只能选择一条主表数据进行手动分配')
         return
       }
@@ -624,7 +672,7 @@ export default {
         this.$modal.msgError('单据已结束，无法手动分配！')
         return
       }
-      if(this.selectedDetailRows[0].allotQuantity==this.selectedDetailRows[0].quantity){
+      if (this.selectedDetailRows[0].allotQuantity == this.selectedDetailRows[0].quantity) {
         this.$modal.msgError('该单据已分配完成，无法手动分配')
         return
       }
@@ -645,7 +693,7 @@ export default {
             newStatus: this.currentAuditStatus,
             exitId: this.auditForm.exitId
           }
-         // console.log("单据状态修改（含出口信息）：", params)
+          // console.log("单据状态修改（含出口信息）：", params)
 
           //调用单据状态改变接口
           updateOutStockStatus(params).then(response => {
@@ -727,7 +775,7 @@ export default {
     },
 
     /** 确认分配 */
-     confirmStockAllot() {
+    confirmStockAllot() {
       if (this.selectedStockRows.length === 0) {
         this.$modal.msgError('请选择要分配的库存')
         return
@@ -755,19 +803,18 @@ export default {
       console.log('手动分配参数：', allotParams)
       // 这里添加实际的分配API调用
       manualAllot(allotParams).then(response => {
-        if(response.code=="200"){
+        if (response.code == "200") {
           this.$modal.msgSuccess('分配成功')
           this.stockDialogVisible = false
           this.getList()
           this.getDetailList(this.selectedRows[0].stockoutGuid, this.selectedRows[0].status)
-        }else{
+        } else {
           this.$modal.msgError(response.msg)
         }
 
       })
 
 
-
     },
 
     /** 取消分配 */
@@ -778,8 +825,6 @@ export default {
     }
 
 
-
-
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/requestInterface/log/index.vue b/ruoyi-ui/src/views/requestInterface/log/index.vue
index 086176d..02a57ec 100644
--- a/ruoyi-ui/src/views/requestInterface/log/index.vue
+++ b/ruoyi-ui/src/views/requestInterface/log/index.vue
@@ -27,6 +27,44 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item :label="'接口名称'" prop="endpoint">
+        <el-select v-model="queryParams.endpoint" :placeholder="'请选择接口名称'" clearable>
+          <el-option
+            v-for="item in methodOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="'源系统'" prop="sourceSystem">
+        <el-select v-model="queryParams.sourceSystem" :placeholder="'请选择源系统'" clearable>
+          <el-option
+            v-for="item in sourceSystemOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item :label="'目标系统'" prop="targetSystem">
+        <el-select v-model="queryParams.targetSystem" :placeholder="'请选择目标系统'" clearable>
+          <el-option
+            v-for="item in targetSystemOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+
+
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ '搜索' }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ '重置' }}</el-button>
@@ -34,90 +72,29 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['requestInterface:log:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['requestInterface:log:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['requestInterface:log:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['requestInterface:log:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange" >
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column width="120" :label="'请求ID'" align="left" prop="requestId" show-overflow-tooltip />
-      <el-table-column width="160" :label="'请求时间'" align="left" prop="requestTime" show-overflow-tooltip />
-      <el-table-column width="120" :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip />
-      <el-table-column width="120" :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip />
-      <el-table-column width="120" :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip />
-      <el-table-column width="300" :label="'请求URL'"  align="left" prop="requestUrl" show-overflow-tooltip />
-      <el-table-column width="120" :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip />
-      <el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip />
-      <el-table-column width="300" :label="'请求体'" align="left" prop="requestBody" show-overflow-tooltip />
-      <el-table-column width="160" :label="'响应时间'"  align="left" prop="responseTime" show-overflow-tooltip />
-      <el-table-column width="120" :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip />
-      <el-table-column width="120" :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip />
-      <el-table-column width="120" :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip />
-      <el-table-column width="120" :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip />
+    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
+      <el-table-column width="120" :label="'请求ID'" align="left" prop="requestId" show-overflow-tooltip/>
+      <el-table-column width="160" :label="'请求时间'" align="left" sortable prop="requestTime" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'请求URL'" align="left" prop="requestUrl" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip/>
+<!--      <el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip/>-->
+      <el-table-column width="300" :label="'请求体'" align="left" prop="requestBody" show-overflow-tooltip/>
+      <el-table-column width="160" :label="'响应时间'" align="left" prop="responseTime" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip/>
+      <el-table-column width="120" :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip/>
+<!--      <el-table-column width="120" :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip/>-->
+      <el-table-column width="120" :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip/>
       <el-table-column width="120" :label="'是否成功'" align="left" prop="isSuccessful" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_available" :value="scope.row.isSuccessful"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['requestInterface:log:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['requestInterface:log:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -132,34 +109,34 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item :label="'源系统'" prop="sourceSystem">
-          <el-input v-model="form.sourceSystem" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.sourceSystem" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'目标系统'" prop="targetSystem">
-          <el-input v-model="form.targetSystem" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.targetSystem" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'接口名称'" prop="endpoint">
-          <el-input v-model="form.endpoint" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.endpoint" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'请求URL'" prop="requestUrl">
-          <el-input v-model="form.requestUrl" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.requestUrl" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'请求方法'" prop="requestMethod">
-          <el-input v-model="form.requestMethod" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.requestMethod" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'请求头'" prop="requestHeaders">
-          <el-input v-model="form.requestHeaders" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.requestHeaders" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'请求体'" prop="requestBody">
-          <el-input v-model="form.requestBody" :placeholder="'请输入请求参数'" />
+          <el-input v-model="form.requestBody" :placeholder="'请输入请求参数'"/>
         </el-form-item>
         <el-form-item :label="'响应体'" prop="responseBody">
-          <el-input v-model="form.responseBody" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.responseBody" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'错误详情'" prop="errorDetails">
-          <el-input v-model="form.errorDetails" :placeholder="'请输入错误信息'" />
+          <el-input v-model="form.errorDetails" :placeholder="'请输入错误信息'"/>
         </el-form-item>
         <el-form-item :label="'持续时间'" prop="duration">
-          <el-input v-model="form.duration" type="textarea" :placeholder="'请输入内容'" />
+          <el-input v-model="form.duration" type="textarea" :placeholder="'请输入内容'"/>
         </el-form-item>
         <el-form-item :label="'是否成功'" prop="isSuccessful">
           <el-select v-model="form.isSuccessful" :placeholder="'请选择是否成功'">
@@ -181,32 +158,25 @@
 </template>
 
 <script>
-import { listLog, getLog, delLog, addLog, updateLog } from "@/api/requestInterface/log"
+import {listLog, getLog, delLog, addLog, updateLog, getMethod, getSource, getTarget} from "@/api/requestInterface/log"
 
 export default {
   name: "Log",
   dicts: ['is_available'],
   data() {
     return {
-      // 遮罩层
       loading: true,
-      // 选中数组
       ids: [],
-      // 非单个禁用
       single: true,
-      // 非多个禁用
       multiple: true,
-      // 显示搜索条件
       showSearch: true,
-      // 总条数
+      methodOptions: [], // 下拉框选项
+      sourceSystemOption:[],
+      targetSystemOption:[],
       total: 0,
-      // 接口记录表格数据
       logList: [],
-      // 弹出层标题
       title: "",
-      // 是否显示弹出层
       open: false,
-      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -225,15 +195,15 @@ export default {
         duration: null,
         isSuccessful: null
       },
-      // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-      }
+      rules: {}
     }
   },
   created() {
     this.getList()
+    this.getMethod() // 现在可以正常调用了
+    this.getSource()
+    this.getTarget()
   },
   methods: {
     /** 查询接口记录列表 */
@@ -245,6 +215,43 @@ export default {
         this.loading = false
       })
     },
+    // ✅ 【核心修复】getMethod 移入 methods 内部
+    getMethod() {
+      getMethod().then(response => {
+        console.log("接口返回：", response.data)
+        // 后端返回 String数组，转换为 el-select 需要的 label/value 格式
+        this.methodOptions = response.data.map(item => ({
+          label: item,
+          value: item
+        }))
+      }).catch(err => {
+        console.error("获取方法列表失败：", err)
+      })
+    },
+    getSource() {
+      getSource().then(response => {
+        console.log("接口返回：", response.data)
+        // 后端返回 String数组，转换为 el-select 需要的 label/value 格式
+        this.sourceSystemOption = response.data.map(item => ({
+          label: item,
+          value: item
+        }))
+      }).catch(err => {
+        console.error("获取方法列表失败：", err)
+      })
+    },
+    getTarget() {
+      getTarget().then(response => {
+        console.log("接口返回：", response.data)
+        // 后端返回 String数组，转换为 el-select 需要的 label/value 格式
+        this.targetSystemOption = response.data.map(item => ({
+          label: item,
+          value: item
+        }))
+      }).catch(err => {
+        console.error("获取方法列表失败：", err)
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -284,7 +291,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.requestId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -326,12 +333,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const requestIds = row.requestId || this.ids
-      this.$modal.confirm('是否确认删除接口记录编号为"' + requestIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除接口记录编号为"' + requestIds + '"的数据项？').then(function () {
         return delLog(requestIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -342,3 +350,6 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+</style>
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index ba4cce7..eda0533 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -25,6 +25,43 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="项目号" prop="spare4"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.spare4"
+          placeholder="请输入组件号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="存货编码" prop="productId"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入存货编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="托盘类型" prop="ktpType"><!-- 库存状态 -->
+        <el-select v-model="queryParams.ktpType" placeholder="请选择托盘类型" clearable>
+          <el-option
+            v-for="item in ktpType"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
         <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
           <el-option
@@ -36,14 +73,36 @@
         </el-select>
       </el-form-item>
 
-<!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
-        <el-date-picker clearable
-                        v-model="queryParams.inDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择入库时间">
-        </el-date-picker>
-      </el-form-item>-->
+
+      <el-form-item label="物料类型" prop="model"><!--单据来源-->
+        <el-select v-model="queryParams.model" placeholder="请选择单据来源" clearable>
+          <el-option
+            v-for="dict in productType"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库选择" prop="warehouseCode"><!--单据来源-->
+        <el-select v-model="queryParams.warehouseCode" placeholder="请选择单据来源" clearable>
+          <el-option
+            v-for="item in warehouseCodeOptions"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
+              <el-date-picker clearable
+                              v-model="queryParams.inDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择入库时间">
+              </el-date-picker>
+            </el-form-item>-->
 
 
       <el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
@@ -99,36 +158,36 @@
     </el-row>
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
-      <el-table-column type="selection" align="center" />
+      <el-table-column type="selection" align="center"/>
       <el-table-column label="库存编码" align="left" prop="stockId" width="180" sortable/>
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="180"/>
-      <el-table-column width="180" label="库存状态" align="center" prop="stockStatus" >
+      <el-table-column width="180" label="库存状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column width="180"  label="物料编码" align="left" prop="productId" />
-      <el-table-column width="180"  label="物料名称" align="left" prop="productName" />
-      <el-table-column width="180"  label="批次号" align="left" prop="lotNo"  />
-<!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
-      <el-table-column width="180" label="入库时间" align="left" prop="inDate"  sortable/>
+      <el-table-column width="180" label="物料编码" align="left" prop="productId"/>
+      <el-table-column width="180" label="物料名称" align="left" prop="productName"/>
+      <el-table-column width="180" label="批次号" align="left" prop="lotNo"/>
+      <!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
+      <el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
       <el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
-      <el-table-column width="180" label="作业ID" align="left" prop="jobId"  sortable/>
-      <el-table-column width="180" label="出库数量" align="left" prop="outQuantity" />
-      <el-table-column width="180" label="入库单ID" align="left" prop="stockinId"  sortable/>
+      <el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>
+      <el-table-column width="180" label="出库数量" align="left" prop="outQuantity"/>
+      <el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
       <el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" sortable/>
-<!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
-<!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column width="180" label="层级关系" align="left" prop="spare1" />
-      <el-table-column width="180" label="上层物料" align="left" prop="spare2" />
-      <el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
-      <el-table-column width="180" label="项目号" align="left" prop="spare4" />
-      <el-table-column width="180" label="合同号" align="left" prop="spare5" />
-      <el-table-column width="180" label="销售订单" align="left" prop="spare6" />
-      <el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
-      <el-table-column width="180" label="规格型号" align="left" prop="power" />
-      <el-table-column width="180" label="计量单位" align="left" prop="phase" />
-<!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
+      <!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
+      <!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
+      <el-table-column width="180" label="托盘条码" align="left" prop="trayCode"/>
+<!--      <el-table-column width="180" label="上层物料" align="left" prop="spare2"/>-->
+<!--      <el-table-column width="180" label="顶层物料" align="left" prop="spare3"/>-->
+      <el-table-column width="180" label="项目号" align="left" prop="spare4"/>
+<!--      <el-table-column width="180" label="合同号" align="left" prop="spare5"/>-->
+<!--      <el-table-column width="180" label="销售订单" align="left" prop="spare6"/>-->
+      <el-table-column width="180" label="供应商编码" align="left" prop="voltage"/>
+      <el-table-column width="180" label="规格型号" align="left" prop="power"/>
+      <el-table-column width="180" label="计量单位" align="left" prop="phase"/>
+      <!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
           <el-button
@@ -160,12 +219,12 @@
     <!-- 添加或修改库存信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
-<!--          <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
-<!--          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
+        <!--          <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
+        <!--          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
+        <!--        </el-form-item>-->
 
         <el-form-item label="物料" prop="productId"> <!-- 物料 -->
           <el-input
@@ -207,7 +266,7 @@
         </el-form-item>
 
         <el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
-          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
+          <el-input v-model="form.quantity" placeholder="请输入库存数量"/>
         </el-form-item>
 
       </el-form>
@@ -248,11 +307,11 @@
         @row-click="handleProductRowClick"
         highlight-current-row
         max-height="400">
-        <el-table-column label="品号" align="center" prop="productId" />
-        <el-table-column label="品名" align="center" prop="productName" />
-        <el-table-column label="规格" align="center" prop="spec" />
-        <el-table-column label="型号" align="center" prop="spare1" />
-        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="品号" align="center" prop="productId"/>
+        <el-table-column label="品名" align="center" prop="productName"/>
+        <el-table-column label="规格" align="center" prop="spec"/>
+        <el-table-column label="型号" align="center" prop="spare1"/>
+        <el-table-column label="单位" align="center" prop="unit"/>
       </el-table>
 
       <pagination
@@ -288,7 +347,7 @@
             @keyup.enter.native="getCargoSpaceList"
           />
         </el-form-item>
-        <el-form-item label="仓库" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseCode">
           <el-select v-model="cargoSpaceQueryParams.warehouseId" placeholder="请选择仓库" clearable>
             <el-option
               v-for="item in warehouseOptions"
@@ -310,17 +369,17 @@
         @row-click="handleCargoSpaceRowClick"
         highlight-current-row
         max-height="400">
-        <el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
-        <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
-        <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+        <el-table-column label="货位编码" align="center" prop="cargoSpaceId"/>
+        <el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
+        <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="排" align="center" prop="thePlatoon" />
-        <el-table-column label="列" align="center" prop="theColumn" />
-        <el-table-column label="层" align="center" prop="theFloor" />
+        <el-table-column label="排" align="center" prop="thePlatoon"/>
+        <el-table-column label="列" align="center" prop="theColumn"/>
+        <el-table-column label="层" align="center" prop="theFloor"/>
       </el-table>
 
       <pagination
@@ -340,13 +399,14 @@
 </template>
 
 <script>
-import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
+import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
 import {listWarehouse} from "@/api/bas/warehouse"
-import { listBasProduct } from "@/api/bas/BasProduct"
-import { listCargoSpace } from "@/api/bas/cargoSpace"
+import {listBasProduct} from "@/api/bas/BasProduct"
+import {listCargoSpace} from "@/api/bas/cargoSpace"
+
 export default {
   name: "Management",
-  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
+  dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
@@ -365,6 +425,9 @@ export default {
       managementList: [],
       // 仓库选项
       warehouseOptions: [],
+      warehouseCodeOptions: [{label: '立库', value: '1'}, {label: '平库', value: '2'}],
+      productType:[{label:"满托",value:'1'},{label:"半托",value:'0'}],
+      ktpType:[{label:"物料",value:'2'},{label:"托盘",value:'1'}],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -397,10 +460,15 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null
+        spare6: null,
+        model: null,
+        ktpType: "1",
+        warehouseCode: "1",
+
+
       },
       queryWarehouse: {
-        pageNum:1,
+        pageNum: 1,
         pageSize: 99
       },
       // 表单参数
@@ -511,7 +579,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -524,7 +592,8 @@ export default {
     handleUpdate(row) {
       this.reset()
       const stockId = row.stockId || this.ids
-      getManagement(stockId).then(response => {
+      const warehouseCode=this.queryParams.warehouseCode;
+      getManagement(stockId,warehouseCode).then(response => {
         this.form = response.data
         this.open = true
         this.title = "修改库存信息" // 修改库存信息
@@ -535,6 +604,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.stockId != null) {
+            this.form.warehouseCode=this.queryParams.warehouseCode;
             updateManagement(this.form).then(response => {
               this.$modal.msgSuccess("修改成功") // 修改成功
               this.open = false
@@ -553,12 +623,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function() { // 是否确认删除库存信息编号为
-        return delManagement(stockIds)
+      const warehouseCode =this.queryParams.warehouseCode;
+      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function () { // 是否确认删除库存信息编号为
+        return delManagement(stockIds,warehouseCode)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功") // 删除成功
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 40e140d..fac19f4 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
-const baseUrl = 'http://localhost:8080' // 后端接口
+const baseUrl = 'http://192.168.188.236:8080' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口