From 73a7f6d6cab2f684467cd5cc4616d57a4f86516f Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Fri, 15 May 2026 15:16:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81CRM=E5=A4=84=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sip/controller/DataProcessController.java     | 15 +++++++--------
 .../ruoyi/sip/service/IDataProcessService.java    |  2 ++
 .../sip/service/impl/DataProcessServiceImpl.java  |  8 ++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
index d6d772e3..3e6cfd5b 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
@@ -2,17 +2,10 @@ package com.ruoyi.sip.controller;
 
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sip.dto.ProjectTransferRequest;
 import com.ruoyi.sip.service.IDataProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 数据处理控制器
@@ -43,4 +36,10 @@ public class DataProcessController {
         dataProcessService.generateServiceBillsWhenAllDelivered(orderCode);
     }
 
+    @Anonymous
+    @GetMapping("/projectPushCRM")
+    public void projectSendCRM(@RequestParam("projectId") Long projectId) {
+        dataProcessService.projectSendCRM(projectId);
+    }
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDataProcessService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDataProcessService.java
index eefdd88a..dde36e0c 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDataProcessService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDataProcessService.java
@@ -11,4 +11,6 @@ public interface IDataProcessService {
 
     void generateServiceBillsWhenAllDelivered(String orderCode);
 
+    void projectSendCRM(Long projectId);
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DataProcessServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DataProcessServiceImpl.java
index ce9e7c98..baa29331 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DataProcessServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DataProcessServiceImpl.java
@@ -54,6 +54,9 @@ public class DataProcessServiceImpl implements IDataProcessService {
     @Resource
     private IOmsPayableBillService payableBillService;
 
+    @Resource
+    private IProjectInfoService projectInfoService;
+
     @Resource
     private IVendorInfoService vendorInfoService;
 
@@ -165,5 +168,10 @@ public class DataProcessServiceImpl implements IDataProcessService {
         bindShiroUser(1L, "admin", "平台管理员");
         inventoryDeliveryService.generateServiceBillsWhenAllDelivered(orderCode);
     }
+
+    @Override
+    public void projectSendCRM(Long projectId) {
+        projectInfoService.scheduleOpportunityUpdateByProjectId(projectId);
+    }
     
 }

From 475229295a500900627ea489f31a039c145fa6fc Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Thu, 21 May 2026 02:18:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 7fa3c976..449df373 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -10,9 +10,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
+                url: jdbc:mysql://192.168.124.202:3307/oms_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
                 username: root
-                password: unis@db
+                password: Unis@123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

From 98b9097ff2bccda84d1ef81abb320a320a5d9dad Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Thu, 21 May 2026 05:31:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E5=BC=BA=E5=88=B6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=BF=E7=94=A8=E5=BC=BA=E5=AF=86=E7=A0=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oms_web/oms_vue/src/api/login.js              |  41 ++++
 oms_web/oms_vue/src/store/modules/user.js     |  21 +-
 oms_web/oms_vue/src/utils/request.js          |   2 +
 oms_web/oms_vue/src/views/login.vue           | 164 +++++++++++++++-
 .../controller/system/SysLoginController.java | 141 +++++++++++++-
 .../src/main/resources/application.yml        |   2 +-
 .../main/resources/ehcache/ehcache-shiro.xml  | 180 +++++++++---------
 .../resources/static/i18n/messages.properties |   4 +-
 .../ruoyi/common/constant/UserConstants.java  |   6 +-
 .../ruoyi/framework/config/ShiroConfig.java   |   2 +
 .../shiro/service/SysPasswordService.java     |   9 +
 11 files changed, 460 insertions(+), 112 deletions(-)

diff --git a/oms_web/oms_vue/src/api/login.js b/oms_web/oms_vue/src/api/login.js
index 186420d9..59a829a2 100644
--- a/oms_web/oms_vue/src/api/login.js
+++ b/oms_web/oms_vue/src/api/login.js
@@ -1,5 +1,11 @@
 import request from '@/utils/request'
 
+function createLoginFormData(data) {
+  const formData = new FormData()
+  Object.keys(data).forEach(key => formData.append(key, data[key]))
+  return formData
+}
+
 // 登录方法 - 基于 Session 认证，使用 FormData 格式
 export function login(username, password, code, rememberMe) {
   const formData = new FormData()
@@ -9,6 +15,41 @@ export function login(username, password, code, rememberMe) {
   formData.append('rememberMe', rememberMe || false)
   return request({
     url: '/login',
+    headers: {
+      isToken: false,
+      'Content-Type': 'multipart/form-data',
+      repeatSubmit: false,
+      allowWarning: true
+    },
+    method: 'post',
+    data: formData
+  })
+}
+
+export function resetLoginPwd(data) {
+  const formData = createLoginFormData({
+    username: data.username,
+    oldPassword: data.oldPassword,
+    newPassword: data.newPassword,
+    confirmPassword: data.confirmPassword,
+    emailCode: data.emailCode
+  })
+  return request({
+    url: '/login/resetPwd',
+    headers: {
+      isToken: false,
+      'Content-Type': 'multipart/form-data',
+      repeatSubmit: false
+    },
+    method: 'post',
+    data: formData
+  })
+}
+
+export function sendResetPwdEmailCode(username) {
+  const formData = createLoginFormData({ username })
+  return request({
+    url: '/login/sendResetPwdEmailCode',
     headers: {
       isToken: false,
       'Content-Type': 'multipart/form-data',
diff --git a/oms_web/oms_vue/src/store/modules/user.js b/oms_web/oms_vue/src/store/modules/user.js
index 71852f98..f4cb14c3 100644
--- a/oms_web/oms_vue/src/store/modules/user.js
+++ b/oms_web/oms_vue/src/store/modules/user.js
@@ -52,7 +52,7 @@ const user = {
       const rememberMe = userInfo.rememberMe
       return new Promise((resolve, reject) => {
         login(username, password, code, rememberMe).then(res => {
-          resolve()
+          resolve(res)
         }).catch(error => {
           reject(error)
         })
@@ -60,17 +60,16 @@ const user = {
     },
 
     // 获取用户信息
-    GetInfo({ commit, state }) {
+    GetInfo({ commit }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          // 后端返回的数据在 res.data 中
           const data = res.data || res
           const user = data.user
-          let avatar = user.avatar? '/common/download/resource?resource='+encodeURIComponent(user.avatar) : ""
+          let avatar = user.avatar ? '/common/download/resource?resource=' + encodeURIComponent(user.avatar) : ""
           if (!isHttp(avatar)) {
             avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
           }
-          if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          if (data.roles && data.roles.length > 0) {
             commit('SET_ROLES', data.roles)
             commit('SET_PERMISSIONS', data.permissions)
           } else {
@@ -82,15 +81,13 @@ const user = {
           commit('SET_NAME', user.loginName)
           commit('SET_NICK_NAME', user.userName)
           commit('SET_AVATAR', avatar)
-          /* 初始密码提示 */
-          if(data.isDefaultModifyPwd) {
-            MessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
+          if (data.isDefaultModifyPwd) {
+            MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
               router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
             }).catch(() => {})
           }
-          /* 过期密码提示 */
-          if(!data.isDefaultModifyPwd && data.isPasswordExpired) {
-            MessageBox.confirm('您的密码已过期，请尽快修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
+          if (!data.isDefaultModifyPwd && data.isPasswordExpired) {
+            MessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
               router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
             }).catch(() => {})
           }
@@ -102,7 +99,7 @@ const user = {
     },
 
     // 退出系统 - 基于 Session 认证
-    LogOut({ commit, state }) {
+    LogOut({ commit }) {
       return new Promise((resolve, reject) => {
         logout().then(() => {
           commit('SET_ROLES', [])
diff --git a/oms_web/oms_vue/src/utils/request.js b/oms_web/oms_vue/src/utils/request.js
index e8d13767..3d3e027e 100644
--- a/oms_web/oms_vue/src/utils/request.js
+++ b/oms_web/oms_vue/src/utils/request.js
@@ -110,6 +110,8 @@ service.interceptors.response.use(res => {
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
+    } else if (code === 301 && res.config.headers && res.config.headers.allowWarning) {
+      return res.data
     } else if (code !== 200) {
       Notification.error({ title: msg })
       return Promise.reject('error')
diff --git a/oms_web/oms_vue/src/views/login.vue b/oms_web/oms_vue/src/views/login.vue
index 6b2f50ba..a08f16d8 100644
--- a/oms_web/oms_vue/src/views/login.vue
+++ b/oms_web/oms_vue/src/views/login.vue
@@ -54,6 +54,37 @@
         </div>
       </el-form-item>
     </el-form>
+    <el-dialog
+      title="修改密码"
+      :visible.sync="resetPwdOpen"
+      width="420px"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      append-to-body
+    >
+      <el-form ref="resetPwdForm" :model="resetPwdForm" :rules="resetPwdRules" label-width="100px">
+        <el-form-item label="旧密码" prop="oldPassword">
+          <el-input v-model="resetPwdForm.oldPassword" type="password" placeholder="请输入旧密码" show-password />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPassword">
+          <el-input v-model="resetPwdForm.newPassword" type="password" placeholder="请输入新密码" show-password />
+        </el-form-item>
+        <el-form-item label="确认新密码" prop="confirmPassword">
+          <el-input v-model="resetPwdForm.confirmPassword" type="password" placeholder="请确认新密码" show-password />
+        </el-form-item>
+        <el-form-item label="邮箱验证码" prop="emailCode">
+          <el-input v-model="resetPwdForm.emailCode" placeholder="请输入邮箱验证码" maxlength="6" style="width: 190px" />
+          <el-button :loading="emailCodeLoading" :disabled="emailCodeCountdown > 0" @click="sendEmailCode">
+            {{ emailCodeCountdown > 0 ? emailCodeCountdown + '秒后重发' : '发送验证码' }}
+          </el-button>
+        </el-form-item>
+        <div class="password-tip">密码长度8-20位，需包含大小写字母、数字、特殊字符</div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" :loading="resetPwdLoading" @click="submitResetPwd">提 交</el-button>
+      </div>
+    </el-dialog>
     <!--  底部  -->
     <div class="el-login-footer">
       <span>Copyright © 2018-2025 unissense All Rights Reserved.</span>
@@ -64,6 +95,7 @@
 <script>
 import Cookies from "js-cookie"
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { resetLoginPwd, sendResetPwdEmailCode } from '@/api/login'
 
 export default {
   name: "Login",
@@ -77,6 +109,36 @@ export default {
         rememberMe: false,
         code: ""
       },
+      resetPwdForm: {
+        username: "",
+        oldPassword: "",
+        newPassword: "",
+        confirmPassword: "",
+        emailCode: ""
+      },
+      resetPwdOpen: false,
+      resetPwdLoading: false,
+      emailCodeLoading: false,
+      emailCodeCountdown: 0,
+      emailCodeTimer: null,
+      resetPwdRules: {
+        oldPassword: [
+          { required: true, trigger: "blur", message: "请输入旧密码" }
+        ],
+        newPassword: [
+          { required: true, trigger: "blur", message: "请输入新密码" },
+          { min: 8, max: 20, trigger: "blur", message: "密码长度为8到20个字符" },
+          { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,20}$/, trigger: "blur", message: "密码需包含大小写字母、数字、特殊字符" }
+        ],
+        confirmPassword: [
+          { required: true, trigger: "blur", message: "请确认新密码" },
+          { validator: (rule, value, callback) => this.equalToNewPassword(rule, value, callback), trigger: "blur" }
+        ],
+        emailCode: [
+          { required: true, trigger: "blur", message: "请输入邮箱验证码" },
+          { pattern: /^\d{6}$/, trigger: "blur", message: "邮箱验证码为6位数字" }
+        ]
+      },
       loginRules: {
         username: [
           { required: true, trigger: "blur", message: "请输入您的账号" }
@@ -103,9 +165,12 @@ export default {
     }
   },
   created() {
-    // this.getCode()
+    this.getCode()
     this.getCookie()
   },
+  beforeDestroy() {
+    this.clearEmailCodeTimer()
+  },
   methods: {
     getCode() {
       // 基于 Session 认证，直接使用图片 URL，添加时间戳防止缓存
@@ -120,9 +185,84 @@ export default {
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+        code: this.loginForm.code
       }
     },
+    equalToNewPassword(rule, value, callback) {
+      if (this.resetPwdForm.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"))
+      } else {
+        callback()
+      }
+    },
+    openResetPwdDialog() {
+      this.resetPwdOpen = true
+      this.clearEmailCodeTimer()
+      this.resetPwdForm = {
+        username: this.loginForm.username,
+        oldPassword: "",
+        newPassword: "",
+        confirmPassword: "",
+        emailCode: ""
+      }
+      this.$nextTick(() => {
+        if (this.$refs.resetPwdForm) {
+          this.$refs.resetPwdForm.clearValidate()
+        }
+      })
+    },
+    sendEmailCode() {
+      if (!this.resetPwdForm.username) {
+        this.$modal.msgError("请输入用户名")
+        return
+      }
+      this.emailCodeLoading = true
+      sendResetPwdEmailCode(this.resetPwdForm.username).then(() => {
+        this.$modal.msgSuccess("验证码已发送")
+        this.startEmailCodeCountdown()
+      }).finally(() => {
+        this.emailCodeLoading = false
+      })
+    },
+    startEmailCodeCountdown() {
+      this.clearEmailCodeTimer()
+      this.emailCodeCountdown = 60
+      this.emailCodeTimer = setInterval(() => {
+        if (this.emailCodeCountdown <= 1) {
+          this.clearEmailCodeTimer()
+        } else {
+          this.emailCodeCountdown--
+        }
+      }, 1000)
+    },
+    clearEmailCodeTimer() {
+      if (this.emailCodeTimer) {
+        clearInterval(this.emailCodeTimer)
+        this.emailCodeTimer = null
+      }
+      this.emailCodeCountdown = 0
+    },
+    submitResetPwd() {
+      this.$refs.resetPwdForm.validate(valid => {
+        if (!valid) {
+          return
+        }
+        this.resetPwdLoading = true
+        resetLoginPwd(this.resetPwdForm).then(() => {
+          this.$modal.msgSuccess("密码修改成功，请重新登录")
+          this.resetPwdOpen = false
+          this.$refs.loginForm.resetFields()
+          this.loginForm.password = ""
+          this.$nextTick(() => {
+            window.location.reload()
+          })
+        }).catch(() => {
+        }).finally(() => {
+          this.resetPwdLoading = false
+        })
+      })
+    },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
@@ -136,7 +276,18 @@ export default {
             Cookies.remove("password")
             Cookies.remove('rememberMe')
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          this.$store.dispatch("Login", this.loginForm).then((res) => {
+            if (res && res.code === 301) {
+              this.resetPwdForm.username = this.loginForm.username
+              this.resetPwdForm.oldPassword = this.loginForm.password
+              this.resetPwdForm.newPassword = ""
+              this.resetPwdForm.confirmPassword = ""
+              this.resetPwdForm.emailCode = ""
+              this.clearEmailCodeTimer()
+              this.resetPwdOpen = true
+              this.loading = false
+              return
+            }
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
           }).catch(() => {
             this.loading = false
@@ -160,6 +311,13 @@ export default {
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+.password-tip {
+  margin-top: -5px;
+  margin-bottom: 15px;
+  color: #f56c6c;
+  font-size: 12px;
+  line-height: 18px;
+}
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 3145698c..3d33dbca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,13 +1,19 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.concurrent.ThreadLocalRandom;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.extra.mail.Mail;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.IncorrectCredentialsException;
+import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +39,12 @@ import com.ruoyi.framework.web.service.ConfigService;
 @Slf4j
 public class SysLoginController extends BaseController
 {
+    private static final String RESET_PWD_EMAIL_CODE_KEY = "RESET_PWD_EMAIL_CODE_";
+
+    private static final String RESET_PWD_EMAIL_CODE_TIME_KEY = "RESET_PWD_EMAIL_CODE_TIME_";
+
+    private static final long RESET_PWD_EMAIL_CODE_EXPIRE_TIME = 5 * 60 * 1000L;
+
     /**
      * 是否开启记住我功能
      */
@@ -42,6 +54,12 @@ public class SysLoginController extends BaseController
     @Autowired
     private ConfigService configService;
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private SysPasswordService passwordService;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap)
     {
@@ -69,15 +87,24 @@ public class SysLoginController extends BaseController
     @ResponseBody
     public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
     {
-        UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
+        UsernamePasswordToken token = new UsernamePasswordToken(username, password, Boolean.TRUE.equals(rememberMe));
         Subject subject = SecurityUtils.getSubject();
         try
         {
             subject.login(token);
+            if (!passwordService.isStrongPassword(password))
+            {
+                subject.logout();
+                return AjaxResult.warn("当前密码不符合安全规则，请修改密码后重新登录");
+            }
             return success();
         }
         catch (AuthenticationException e)
         {
+            if (e instanceof UnknownAccountException || e instanceof IncorrectCredentialsException)
+            {
+                return error("用户名或密码错误");
+            }
             String msg = "用户或密码错误";
             if (StringUtils.isNotEmpty(e.getMessage()))
             {
@@ -87,6 +114,118 @@ public class SysLoginController extends BaseController
         }
     }
 
+    @PostMapping("/login/sendResetPwdEmailCode")
+    @ResponseBody
+    public AjaxResult sendResetPwdEmailCode(String username)
+    {
+        if (StringUtils.isEmpty(username))
+        {
+            return error("请输入用户名");
+        }
+        SysUser user = userService.selectUserByLoginName(username);
+        if (user == null)
+        {
+            return error("用户不存在");
+        }
+        if (StringUtils.isEmpty(user.getEmail()))
+        {
+            return error("请联系管理员绑定邮箱1");
+        }
+        String code = String.valueOf(ThreadLocalRandom.current().nextInt(100000, 1000000));
+        try
+        {
+            Mail.create()
+                    .setTos(user.getEmail())
+                    .setTitle("OMS系统修改密码邮箱验证码")
+                    .setContent("您的修改密码邮箱验证码为：" + code + "，有效期5分钟。如非本人操作，请忽略本邮件。")
+                    .setHtml(false)
+                    .send();
+            ServletUtils.getRequest().getSession().setAttribute(RESET_PWD_EMAIL_CODE_KEY + username, code);
+            ServletUtils.getRequest().getSession().setAttribute(RESET_PWD_EMAIL_CODE_TIME_KEY + username, System.currentTimeMillis());
+            return success("验证码已发送");
+        }
+        catch (Exception e)
+        {
+            log.error("发送修改密码邮箱验证码失败", e);
+            return error("验证码发送失败，请联系管理员");
+        }
+    }
+
+    @PostMapping("/login/resetPwd")
+    @ResponseBody
+    public AjaxResult resetPwd(String username, String oldPassword, String newPassword, String confirmPassword, String emailCode)
+    {
+        if (StringUtils.isEmpty(username))
+        {
+            return error("请输入用户名");
+        }
+        if (StringUtils.isEmpty(emailCode))
+        {
+            return error("请输入邮箱验证码");
+        }
+        if (!StringUtils.equals(newPassword, confirmPassword))
+        {
+            return error("两次密码输入不一致");
+        }
+        if (!passwordService.isStrongPassword(newPassword))
+        {
+            return error("新密码长度为8-20位，且需包含大小写字母、数字、特殊字符");
+        }
+        SysUser user = userService.selectUserByLoginName(username);
+        if (user == null)
+        {
+            return error("用户不存在");
+        }
+        if (StringUtils.isEmpty(user.getEmail()))
+        {
+            return error("请联系管理员绑定邮箱1");
+        }
+        AjaxResult emailCodeValidateResult = validateResetPwdEmailCode(username, emailCode);
+        if (emailCodeValidateResult != null)
+        {
+            return emailCodeValidateResult;
+        }
+        if (!passwordService.matches(user, oldPassword))
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+        if (passwordService.matches(user, newPassword))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        user.setSalt(ShiroUtils.randomSalt());
+        user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
+        user.setPwdUpdateDate(new java.util.Date());
+        if (userService.resetUserPwd(user) > 0)
+        {
+            ServletUtils.getRequest().getSession().removeAttribute(RESET_PWD_EMAIL_CODE_KEY + username);
+            ServletUtils.getRequest().getSession().removeAttribute(RESET_PWD_EMAIL_CODE_TIME_KEY + username);
+            return success("密码修改成功，请重新登录");
+        }
+        return error("修改密码异常，请联系管理员");
+    }
+
+    private AjaxResult validateResetPwdEmailCode(String username, String emailCode)
+    {
+        Object sessionCode = ServletUtils.getRequest().getSession().getAttribute(RESET_PWD_EMAIL_CODE_KEY + username);
+        Object sessionCodeTime = ServletUtils.getRequest().getSession().getAttribute(RESET_PWD_EMAIL_CODE_TIME_KEY + username);
+        if (sessionCode == null || sessionCodeTime == null)
+        {
+            return error("请先获取邮箱验证码");
+        }
+        if (System.currentTimeMillis() - (Long) sessionCodeTime > RESET_PWD_EMAIL_CODE_EXPIRE_TIME)
+        {
+            ServletUtils.getRequest().getSession().removeAttribute(RESET_PWD_EMAIL_CODE_KEY + username);
+            ServletUtils.getRequest().getSession().removeAttribute(RESET_PWD_EMAIL_CODE_TIME_KEY + username);
+            return error("邮箱验证码已过期，请重新获取");
+        }
+        if (!StringUtils.equals(String.valueOf(sessionCode), emailCode))
+        {
+            return error("邮箱验证码错误");
+        }
+        return null;
+    }
+
     @GetMapping("/unauth")
     public String unauth()
     {
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 82feed8d..6c66b716 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -97,7 +97,7 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: false
+    captchaEnabled: true
     # 验证码类型 math 数字计算 char 字符验证
     captchaType: math
   cookie:
diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
index 8ffd5ed0..7bf080fc 100644
--- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
+++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ehcache name="ruoyi" updateCheck="false">
-
-    <!-- 磁盘缓存位置 -->
-    <diskStore path="java.io.tmpdir"/>
-    
-    <!-- maxEntriesLocalHeap:堆内存中最大缓存对象数，0没有限制 -->
-    <!-- maxElementsInMemory： 在内存中缓存的element的最大数目。-->
-    <!-- eternal:elements是否永久有效，如果为true，timeouts将被忽略，element将永不过期 -->
-    <!-- timeToIdleSeconds:失效前的空闲秒数，当eternal为false时，这个属性才有效，0为不限制 -->
-    <!-- timeToLiveSeconds:失效前的存活秒数，创建时间到失效时间的间隔为存活时间，当eternal为false时，这个属性才有效，0为不限制 -->
-    <!-- overflowToDisk： 如果内存中数据超过内存限制，是否要缓存到磁盘上 -->
-    <!-- statistics：是否收集统计信息。如果需要监控缓存使用情况，应该打开这个选项。默认为关闭（统计会影响性能）。设置statistics="true"开启统计 -->
-    
-    <!-- 默认缓存 -->
-    <defaultCache
-            maxEntriesLocalHeap="1000"
-            eternal="false"
-            timeToIdleSeconds="3600"
-            timeToLiveSeconds="3600"
-            overflowToDisk="false">
-    </defaultCache>
-
-    <!-- 登录记录缓存 锁定10分钟 -->
-    <cache name="loginRecordCache"
-           maxEntriesLocalHeap="2000"
-           eternal="false"
-           timeToIdleSeconds="600"
-           timeToLiveSeconds="0"
-           overflowToDisk="false"
-           statistics="false">
-    </cache>
-
-    <!-- 系统活跃用户缓存 -->
-    <cache name="sys-userCache"
-           maxEntriesLocalHeap="10000"
-           overflowToDisk="false"
-           eternal="false"
-           diskPersistent="false"
-           timeToLiveSeconds="0"
-           timeToIdleSeconds="0"
-           statistics="false">
-    </cache>
-    
-    <!-- 系统用户授权缓存  没必要过期 -->
-    <cache name="sys-authCache"
-           maxEntriesLocalHeap="10000"
-           overflowToDisk="false"
-           eternal="false"
-           diskPersistent="false"
-           timeToLiveSeconds="0"
-           timeToIdleSeconds="0"
-           memoryStoreEvictionPolicy="LRU"
-           statistics="false"/>
-    
-    <!-- 系统缓存 -->
-    <cache name="sys-cache"
-           maxEntriesLocalHeap="1000"
-           eternal="true"
-           overflowToDisk="true"
-           statistics="false">
-    </cache>
-    
-    <!-- 系统参数缓存 -->
-    <cache name="sys-config"
-           maxEntriesLocalHeap="1000"
-           eternal="true"
-           overflowToDisk="true"
-           statistics="false">
-    </cache>
-    
-    <!-- 系统字典缓存 -->
-    <cache name="sys-dict"
-           maxEntriesLocalHeap="1000"
-           eternal="true"
-           overflowToDisk="true"
-           statistics="false">
-    </cache>
-    
-    <!-- 系统会话缓存 -->
-    <cache name="shiro-activeSessionCache"
-           maxEntriesLocalHeap="10000"
-           overflowToDisk="false"
-           eternal="false"
-           diskPersistent="false"
-           timeToLiveSeconds="0"
-           timeToIdleSeconds="0"
-           statistics="false"/>
-    
-</ehcache>
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache name="ruoyi" updateCheck="false">
+
+    <!-- 磁盘缓存位置 -->
+    <diskStore path="java.io.tmpdir"/>
+    
+    <!-- maxEntriesLocalHeap:堆内存中最大缓存对象数，0没有限制 -->
+    <!-- maxElementsInMemory： 在内存中缓存的element的最大数目。-->
+    <!-- eternal:elements是否永久有效，如果为true，timeouts将被忽略，element将永不过期 -->
+    <!-- timeToIdleSeconds:失效前的空闲秒数，当eternal为false时，这个属性才有效，0为不限制 -->
+    <!-- timeToLiveSeconds:失效前的存活秒数，创建时间到失效时间的间隔为存活时间，当eternal为false时，这个属性才有效，0为不限制 -->
+    <!-- overflowToDisk： 如果内存中数据超过内存限制，是否要缓存到磁盘上 -->
+    <!-- statistics：是否收集统计信息。如果需要监控缓存使用情况，应该打开这个选项。默认为关闭（统计会影响性能）。设置statistics="true"开启统计 -->
+    
+    <!-- 默认缓存 -->
+    <defaultCache
+            maxEntriesLocalHeap="1000"
+            eternal="false"
+            timeToIdleSeconds="3600"
+            timeToLiveSeconds="3600"
+            overflowToDisk="false">
+    </defaultCache>
+
+    <!-- 登录记录缓存 锁定10分钟 -->
+    <cache name="loginRecordCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="600"
+           timeToLiveSeconds="0"
+           overflowToDisk="false"
+           statistics="false">
+    </cache>
+
+    <!-- 系统活跃用户缓存 -->
+    <cache name="sys-userCache"
+           maxEntriesLocalHeap="10000"
+           overflowToDisk="false"
+           eternal="false"
+           diskPersistent="false"
+           timeToLiveSeconds="0"
+           timeToIdleSeconds="0"
+           statistics="false">
+    </cache>
+    
+    <!-- 系统用户授权缓存  没必要过期 -->
+    <cache name="sys-authCache"
+           maxEntriesLocalHeap="10000"
+           overflowToDisk="false"
+           eternal="false"
+           diskPersistent="false"
+           timeToLiveSeconds="0"
+           timeToIdleSeconds="0"
+           memoryStoreEvictionPolicy="LRU"
+           statistics="false"/>
+    
+    <!-- 系统缓存 -->
+    <cache name="sys-cache"
+           maxEntriesLocalHeap="1000"
+           eternal="true"
+           overflowToDisk="true"
+           statistics="false">
+    </cache>
+    
+    <!-- 系统参数缓存 -->
+    <cache name="sys-config"
+           maxEntriesLocalHeap="1000"
+           eternal="true"
+           overflowToDisk="true"
+           statistics="false">
+    </cache>
+    
+    <!-- 系统字典缓存 -->
+    <cache name="sys-dict"
+           maxEntriesLocalHeap="1000"
+           eternal="true"
+           overflowToDisk="true"
+           statistics="false">
+    </cache>
+    
+    <!-- 系统会话缓存 -->
+    <cache name="shiro-activeSessionCache"
+           maxEntriesLocalHeap="10000"
+           overflowToDisk="false"
+           eternal="false"
+           diskPersistent="false"
+           timeToLiveSeconds="0"
+           timeToIdleSeconds="0"
+           statistics="false"/>
+    
+</ehcache>
 	
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/i18n/messages.properties b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
index 02cb2fda..dc791eed 100644
--- a/ruoyi-admin/src/main/resources/static/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
@@ -1,8 +1,8 @@
 #错误消息
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
-user.not.exists=用户不存在/密码错误
-user.password.not.match=用户不存在/密码错误
+user.not.exists=用户名或密码错误
+user.password.not.match=用户名或密码错误
 user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
 user.password.delete=对不起，您的账号已被删除
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 2dde9d0e..458f7373 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -49,12 +49,12 @@ public class UserConstants
     public static final int USERNAME_MIN_LENGTH = 2;
     public static final int USERNAME_MAX_LENGTH = 20;
 
-    /**
-     * 密码长度限制
-     */
+    /** 密码长度限制 */
     public static final int PASSWORD_MIN_LENGTH = 5;
     public static final int PASSWORD_MAX_LENGTH = 20;
 
+    public static final String PASSWORD_COMPLEXITY_PATTERN = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[^A-Za-z0-9]).{8,20}$";
+
     /**
      * 用户类型
      */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index 248d0e32..c068368b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -305,6 +305,8 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/mcp/**", "mcpBot");
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问
+        filterChainDefinitionMap.put("/login/resetPwd", "anon");
+        filterChainDefinitionMap.put("/login/sendResetPwdEmailCode", "anon");
         filterChainDefinitionMap.put("/login", "anon,captchaValidate");
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
index 338e7293..e3d0f3e9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.framework.shiro.service;
 
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 import javax.annotation.PostConstruct;
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheManager;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.ShiroConstants;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
 import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException;
@@ -33,6 +35,8 @@ public class SysPasswordService
     @Value(value = "${user.password.maxRetryCount}")
     private String maxRetryCount;
 
+    private static final Pattern PASSWORD_COMPLEXITY_PATTERN = Pattern.compile(UserConstants.PASSWORD_COMPLEXITY_PATTERN);
+
     @PostConstruct
     public void init()
     {
@@ -73,6 +77,11 @@ public class SysPasswordService
         return user.getPassword().equals(encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
     }
 
+    public boolean isStrongPassword(String password)
+    {
+        return password != null && PASSWORD_COMPLEXITY_PATTERN.matcher(password).matches();
+    }
+
     public void clearLoginRecordCache(String loginName)
     {
         loginRecordCache.remove(loginName);

From f68242d2e705b5b7dbb8975d4e784596b110e93c Mon Sep 17 00:00:00 2001
From: jiangpeng <rdpnr_jiang.peng@unisinsight.com>
Date: Thu, 21 May 2026 10:28:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oms_web/oms_vue/src/api/project/order.js      |   45 +
 .../src/views/inventory/execution/index.vue   | 1005 ++++++++++++++++-
 .../outer/components/GenerateDeliveryForm.vue |    4 +
 .../src/views/project/info/ProductConfig.vue  |    2 +-
 .../ProjectOrderInfoController.java           |   50 +-
 .../vue/VueProjectOrderInfoController.java    |   50 +
 .../com/ruoyi/sip/domain/InventoryInfo.java   |    1 +
 .../ruoyi/sip/domain/OmsPurchaseOrderMap.java |   15 +
 .../ruoyi/sip/domain/ProjectOrderInfo.java    |   21 +
 .../sip/dto/OrderProductMatchBindDto.java     |   41 +
 .../ruoyi/sip/dto/OrderProductMatchDto.java   |   32 +
 .../sip/dto/OrderProductMatchSnDetailDto.java |   23 +
 .../ruoyi/sip/dto/OrderProductMatchSnDto.java |   25 +
 .../dto/OrderProductMatchWarehouseDto.java    |   18 +
 .../ruoyi/sip/mapper/InventoryInfoMapper.java |    4 +
 .../sip/mapper/OmsPurchaseOrderMapMapper.java |   13 +
 .../sip/mapper/ProjectOrderInfoMapper.java    |   18 +
 .../sip/service/IProjectOrderInfoService.java |   14 +
 .../impl/ProjectOrderInfoServiceImpl.java     |  100 +-
 .../mapper/inventory/InventoryInfoMapper.xml  |   21 +-
 .../mapper/sip/OmsPurchaseOrderMapMapper.xml  |   33 +
 .../mapper/sip/ProjectOrderInfoMapper.xml     |  115 +-
 22 files changed, 1639 insertions(+), 11 deletions(-)
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchBindDto.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchDto.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDetailDto.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDto.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchWarehouseDto.java
 create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java
 create mode 100644 ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml

diff --git a/oms_web/oms_vue/src/api/project/order.js b/oms_web/oms_vue/src/api/project/order.js
index ac617551..8a745ef6 100644
--- a/oms_web/oms_vue/src/api/project/order.js
+++ b/oms_web/oms_vue/src/api/project/order.js
@@ -85,3 +85,48 @@ export function updateFinanceStatus(id, status) {
     data: data
   })
 }
+
+// 查询产品配货备货明细
+export function productMatchList(orderCode) {
+  return request({
+    url: '/project/order/vue/productMatchList',
+    method: 'get',
+    params: { orderCode }
+  })
+}
+
+// 查询产品配备货绑定信息
+export function productMatchBindList(orderCode, productCode, params = {}) {
+  return request({
+    url: '/project/order/vue/productMatchBindList',
+    method: 'get',
+    params: { orderCode, productCode, ...params }
+  })
+}
+
+// 保存订单关联采购单
+export function savePurchaseOrderMap(data) {
+  return request({
+    url: '/project/order/vue/purchaseOrderMap',
+    method: 'post',
+    data
+  })
+}
+
+// 查询采购单SN码列表
+export function purchaseSnList(purchaseNo, orderCode) {
+  return request({
+    url: '/project/order/vue/purchaseSnList',
+    method: 'get',
+    params: { purchaseNo, orderCode }
+  })
+}
+
+// 订单绑定SN码
+export function bindOrderSnCodes(orderCode, productCode, productSnList) {
+  return request({
+    url: '/project/order/vue/bindOrderSnCodes',
+    method: 'post',
+    data: { orderCode, productCode, productSnList }
+  })
+}
diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue
index 43a554b8..4692b966 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue
@@ -101,6 +101,13 @@
           <a @click="handleViewProject(scope.row)" class="link-type">{{ scope.row.projectName }}</a>
         </template>
       </el-table-column>
+      <el-table-column label="备货状态" align="center" prop="orderStockingStatus" width="120">
+        <template slot-scope="scope">
+          <span class="stocking-status" :class="getOrderStockingStatusClass(scope.row.orderStockingStatus)" @click="handleShowStockingDetail(scope.row)" style="cursor: pointer;">
+            {{ formatOrderStockingStatus(scope.row.orderStockingStatus) }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="出库状态" align="center" prop="outerStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.execution_outer_status" :value="scope.row.outerStatus"/>
@@ -214,11 +221,238 @@
     <!-- 订单详情抽屉 -->
     <order-detail-drawer :visible.sync="orderDrawerVisible" :order-id="currentOrderId" title="订单详情" />
 
+    <!-- 备货明细弹窗 -->
+    <el-dialog :close-on-click-modal="false" :visible.sync="stockingDetailVisible" width="1120px" append-to-body>
+      <span slot="title">
+        <i class="el-icon-s-order" style="margin-right: 6px; color: #409EFF;"></i>备货明细
+      </span>
+      <div class="stocking-detail-project">
+        项目：{{ stockingDetailRow.projectName }}（{{ stockingDetailRow.projectCode }}）
+      </div>
+      <div v-loading="stockingDetailLoading" class="stocking-detail-content">
+        <div
+          v-for="(item, index) in stockingDetailList"
+          :key="item.productCode || item.model || index"
+          class="stocking-product-card"
+        >
+          <div class="stocking-product-card__header">
+            <div class="stocking-product-meta">
+              <span class="stocking-product-meta__label">产品编码：</span>
+              <span class="stocking-product-meta__value">{{ item.productCode || '-' }}</span>
+            </div>
+            <div class="stocking-product-meta">
+              <span class="stocking-product-meta__label">产品型号：</span>
+              <span class="stocking-product-meta__value stocking-product-meta__value--strong">{{ item.model || '-' }}</span>
+            </div>
+            <div class="stocking-product-summary">
+              <div class="stocking-product-summary__item">
+                <span class="stocking-product-summary__label">订单需求:</span>
+                <span class="stocking-product-summary__value">{{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum : '-' }}</span>
+              </div>
+              <div class="stocking-product-summary__item">
+                <span class="stocking-product-summary__label">已配货:</span>
+                <span class="stocking-product-summary__value stocking-product-summary__value--green">{{ item.phNum !== undefined && item.phNum !== null ? item.phNum : '-' }}</span>
+              </div>
+              <div class="stocking-product-summary__item">
+                <span class="stocking-product-summary__label">已备货:</span>
+                <span class="stocking-product-summary__value stocking-product-summary__value--green">{{ item.bhNum !== undefined && item.bhNum !== null ? item.bhNum : '-' }}</span>
+              </div>
+            </div>
+          </div>
+          <el-table :data="item.bindList || []" class="stocking-product-table">
+            <el-table-column label="采购单号" align="center" prop="purchaseNo" width="200" />
+            <el-table-column label="制造者" align="center" prop="vendorAddress" width="200" />
+            <el-table-column label="批次数量" align="center" prop="cgNum" />
+            <el-table-column label="可用" align="center" prop="kyNum" />
+            <el-table-column label="配额量" align="center" prop="phNum" width="140">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.phNum"
+                  type="number"
+                  :min="scope.row.bhNum || 0"
+                  :max="scope.row.cgNum || 0"
+                  size="small"
+                  class="stocking-bind-input"
+                  @input="handleBindNumInput(scope.row)"
+                  @change="handleBindNumChange(scope.row)"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="入库状态" align="center" prop="status" width="120">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.purchase_status" :value="String(scope.row.status)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="200">
+              <template slot-scope="scope">
+                <el-button
+                  v-if="['1', '2'].includes(String(scope.row.status))"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="handleAssignOuterSnCode(scope.row, item)"
+                >分配出库SN码</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="item.bindTotal > 0"
+            small
+            class="stocking-bind-pagination"
+            :total="item.bindTotal || 0"
+            :page.sync="item.bindPageNum"
+            :limit.sync="item.bindPageSize"
+            :pageSizes="[3, 5, 10]"
+            @pagination="handleBindPageChange(item)"
+          />
+        </div>
+        <el-empty v-if="!stockingDetailLoading && !stockingDetailList.length" description="暂无数据" />
+      </div>
+      <div slot="footer" class="dialog-footer stocking-detail-footer">
+        <div class="stocking-cost-total">
+          <span class="stocking-cost-total__label">出库成本合计：</span>
+          <span class="stocking-cost-total__value">¥ {{ formatCurrency(stockingTotalCost) }}</span>
+        </div>
+        <div>
+          <el-button @click="stockingDetailVisible = false">关 闭</el-button>
+          <el-button type="primary" :loading="stockingDetailSaving" @click="handleSaveStockingBind">保存修改</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="确认保存备货修改"
+      :close-on-click-modal="false"
+      :visible.sync="stockingSaveConfirmVisible"
+      width="520px"
+      append-to-body
+    >
+      <div class="stocking-save-confirm">
+        <div class="stocking-save-confirm__title">本次将保存 {{ stockingSaveChangedList.length }} 条配额量变更，是否继续？</div>
+        <el-table :data="stockingSaveChangedList" max-height="300" size="mini">
+          <el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="160" :show-overflow-tooltip="true" />
+          <el-table-column label="原配额量" align="center" prop="originalBindNum" width="100" />
+          <el-table-column label="新配额量" align="center" prop="bindNum" width="100" />
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="stockingSaveConfirmVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="stockingDetailSaving" @click="confirmSaveStockingBind">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="outerSnDialogVisible"
+      width="720px"
+      append-to-body
+      custom-class="outer-sn-dialog"
+    >
+      <div slot="title" class="outer-sn-dialog-title">
+        <i class="el-icon-box"></i>
+        <span>分配出库 SN 码</span>
+      </div>
+      <div v-loading="outerSnLoading" class="outer-sn-dialog-body">
+        <div class="outer-sn-header">
+          <div class="outer-sn-tags">
+            <el-tag size="small" type="info">{{ outerSnProductRow.productCode || '-' }}</el-tag>
+            <el-tag size="small" type="info">{{ outerSnProductRow.model || '-' }}</el-tag>
+            |
+            <span>采购单号：{{ outerSnBindRow.purchaseNo || '-' }}</span>
+          </div>
+        </div>
+
+        <div class="outer-sn-stats">
+          <div class="outer-sn-stat-item">
+            <span class="outer-sn-stat-label">本批次可用数量：</span>
+            <span class="outer-sn-stat-value">{{ outerSnDetail.totalQuantity || 0 }}</span>
+            <span class="outer-sn-stat-label outer-sn-stat-label--quota">配额：</span>
+            <span class="outer-sn-stat-value">{{ outerSnDetail.quotaQuantity || 0 }}</span>
+          </div>
+          <div class="outer-sn-stat-item outer-sn-stat-item--selected">
+            <span class="outer-sn-stat-label">已选：</span>
+            <span class="outer-sn-stat-value">{{ outerSnSelectedCount }}</span>
+          </div>
+        </div>
+
+        <div class="outer-sn-tabs">
+          <div
+            v-for="(warehouse, index) in outerSnDetail.warehouseList"
+            :key="index"
+            class="outer-sn-tab"
+            :class="{ 'outer-sn-tab--active': outerSnActiveWarehouse === warehouse.warehouseName }"
+            @click="outerSnActiveWarehouse = warehouse.warehouseName"
+          >
+            <span class="outer-sn-tab-name">{{ warehouse.warehouseName || '-' }}</span>
+            <span class="outer-sn-tab-count">({{ warehouse.bindNum }})</span>
+          </div>
+        </div>
+
+        <div class="outer-sn-search">
+          <el-input
+            v-model="outerSnSearchKeyword"
+            placeholder="搜索指定的SN码..."
+            prefix-icon="el-icon-search"
+            size="small"
+            clearable
+          />
+        </div>
+
+        <div class="outer-sn-grid-container">
+          <div class="outer-sn-grid-header">
+            <el-checkbox
+              v-model="outerSnSelectAll"
+              :indeterminate="outerSnSelectIndeterminate"
+              @change="handleOuterSnSelectAll"
+            >
+              全选
+            </el-checkbox>
+            <span class="outer-sn-current-count">当前仓库SN码总数：{{ getWarehouseSnCount(outerSnActiveWarehouse) }}</span>
+            <el-button
+              type="text"
+              size="small"
+              style="color: #f56c6c;"
+              @click="handleOuterSnClearSelected"
+            >
+              清空已选
+            </el-button>
+          </div>
+          <div class="outer-sn-grid">
+            <div
+              v-for="sn in filteredSnList"
+              :key="sn.productSn"
+              class="outer-sn-card"
+              :class="{
+                'outer-sn-card--selected': isSnSelected(sn.productSn),
+                'outer-sn-card--disabled': isSnDisabled(sn)
+              }"
+              @click="handleSnCardClick(sn)"
+            >
+              <el-checkbox
+                :value="isSnSelected(sn.productSn)"
+                :disabled="isSnDisabled(sn)"
+                @click.native.stop
+                @change="handleSnCheckboxChange(sn, $event)"
+              />
+              <span class="outer-sn-card-text">{{ sn.productSn }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="outerSnDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleConfirmSnSelection">
+          确认分配 {{ outerSnSelectedCount }}
+        </el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listExecution, recallExecution, downloadSignFile,exportExecution } from "@/api/inventory/execution";
+import { productMatchList, productMatchBindList, savePurchaseOrderMap, purchaseSnList, bindOrderSnCodes } from "@/api/project/order";
+import { formatCurrency } from "@/utils";
 import { getToken } from "@/utils/auth";
 import OrderDetailDrawer from '../../project/order/OrderDetailDrawer.vue';
 import ProjectDetailDrawer from '../../project/info/ProjectDetailDrawer.vue';
@@ -231,7 +465,7 @@ export default {
     OrderDetailDrawer,
     Edit // Register the Edit component
   },
-  dicts: ['execution_outer_status', 'execution_delivery_status', 'execution_sign_status'],
+  dicts: ['execution_outer_status', 'execution_delivery_status', 'execution_sign_status', 'purchase_status'],
   data() {
     return {
       // 遮罩层
@@ -252,6 +486,31 @@ export default {
       orderDrawerVisible: false,
       currentProjectId: null,
       currentOrderId: null,
+      // --- 备货明细 ---
+      stockingDetailVisible: false,
+      stockingDetailLoading: false,
+      stockingDetailSaving: false,
+      stockingDetailList: [],
+      stockingBindDraftMap: {},
+      stockingBindPageSize: 3,
+      stockingDetailRow: {},
+      stockingSaveConfirmVisible: false,
+      stockingSaveChangedList: [],
+      outerSnDialogVisible: false,
+      outerSnLoading: false,
+      outerSnBindRow: {},
+      outerSnProductRow: {},
+      outerSnDetail: {
+        totalQuantity: 0,
+        quotaQuantity: 0,
+        warehouseList: [],
+        snList: []
+      },
+      outerSnActiveWarehouse: '',
+      outerSnSearchKeyword: '',
+      outerSnSelectedList: [],
+      outerSnSelectAll: false,
+      outerSnSelectIndeterminate: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -284,7 +543,31 @@ export default {
   created() {
     this.getList();
   },
+  computed: {
+    outerSnSelectedCount() {
+      return this.outerSnSelectedList.length;
+    },
+    outerSnQuotaQuantity() {
+      const quotaQuantity = Number(this.outerSnDetail.quotaQuantity);
+      return Number.isNaN(quotaQuantity) ? 0 : quotaQuantity;
+    },
+    stockingTotalCost() {
+      return (this.stockingDetailList || []).reduce((total, item) => total + (Number(item.sumCost) || 0), 0);
+    },
+    filteredSnList() {
+      let list = this.outerSnDetail.snList || [];
+      if (this.outerSnActiveWarehouse) {
+        list = list.filter(sn => sn.warehouseName === this.outerSnActiveWarehouse);
+      }
+      if (this.outerSnSearchKeyword) {
+        const keyword = this.outerSnSearchKeyword.toLowerCase();
+        list = list.filter(sn => (sn.productSn || '').toLowerCase().includes(keyword));
+      }
+      return list;
+    }
+  },
   methods: {
+    formatCurrency,
     /** 查询订单执行列表 */
     getList() {
       this.loading = true;
@@ -390,6 +673,316 @@ export default {
     handleViewOrder(row) {
       this.currentOrderId = row.id;
       this.orderDrawerVisible = true;
+    },
+    /** 查看备货明细 */
+    handleShowStockingDetail(row) {
+      this.stockingDetailRow = row;
+      this.stockingBindDraftMap = {};
+      this.stockingDetailVisible = true;
+      this.stockingDetailLoading = true;
+      productMatchList(row.orderCode).then(response => {
+        const list = response.data || [];
+        return Promise.all(list.map(item => this.loadBindPageData(row.orderCode, {
+          ...item,
+          bindList: [],
+          bindTotal: 0,
+          bindPageNum: 1,
+          bindPageSize: this.stockingBindPageSize
+        })));
+      }).then(list => {
+        this.stockingDetailList = list;
+        this.stockingDetailLoading = false;
+      }).catch(() => {
+        this.stockingDetailList = [];
+        this.stockingDetailLoading = false;
+      });
+    },
+    getDraftBindNum(purchaseId, defaultValue) {
+      if (this.stockingBindDraftMap[purchaseId] !== undefined) {
+        return this.stockingBindDraftMap[purchaseId];
+      }
+      return defaultValue;
+    },
+    handleBindNumInput(row) {
+      this.$set(this.stockingBindDraftMap, row.purchaseId, row.phNum);
+    },
+    loadBindPageData(orderCode, item) {
+      return productMatchBindList(orderCode, item.productCode, {
+        pageNum: item.bindPageNum,
+        pageSize: item.bindPageSize,
+        orderByColumn: 't6.createTime',
+        isAsc: 'desc'
+      }).then(bindResponse => {
+        const bindList = (bindResponse.rows || []).map(bindItem => ({
+          ...bindItem,
+          phNum: this.getDraftBindNum(bindItem.purchaseId, bindItem.phNum),
+          originalPhNum: bindItem.originalPhNum !== undefined ? bindItem.originalPhNum : bindItem.phNum
+        }));
+        return {
+          ...item,
+          bindList,
+          bindTotal: bindResponse.total || 0
+        };
+      }).catch(() => {
+        return {
+          ...item,
+          bindList: [],
+          bindTotal: 0
+        };
+      });
+    },
+    handleBindPageChange(item) {
+      this.stockingDetailLoading = true;
+      this.loadBindPageData(this.stockingDetailRow.orderCode, item).then(updatedItem => {
+        this.stockingDetailList = this.stockingDetailList.map(currentItem => {
+          if (currentItem.productCode === updatedItem.productCode) {
+            return updatedItem;
+          }
+          return currentItem;
+        });
+      }).finally(() => {
+        this.stockingDetailLoading = false;
+      });
+    },
+    handleBindNumChange(row) {
+      const rawValue = row.phNum === '' || row.phNum === null || row.phNum === undefined ? 0 : Number(row.phNum);
+      const cgNum = row.cgNum === '' || row.cgNum === null || row.cgNum === undefined ? 0 : Number(row.cgNum);
+      const kyNum = row.kyNum === '' || row.kyNum === null || row.kyNum === undefined ? 0 : Number(row.kyNum);
+      const bhNum = row.bhNum === '' || row.bhNum === null || row.bhNum === undefined ? 0 : Number(row.bhNum);
+      const originalPhNum = row.originalPhNum === '' || row.originalPhNum === null || row.originalPhNum === undefined ? 0 : Number(row.originalPhNum);
+      let nextValue = Math.max(rawValue, bhNum);
+      nextValue = Math.min(nextValue, cgNum);
+      const increasedValue = nextValue - originalPhNum;
+      if (increasedValue > kyNum) {
+        nextValue = originalPhNum + kyNum;
+      }
+      if (nextValue < bhNum) {
+        nextValue = bhNum;
+      }
+      if (nextValue > cgNum) {
+        nextValue = cgNum;
+      }
+      row.phNum = nextValue;
+      this.$set(this.stockingBindDraftMap, row.purchaseId, nextValue);
+    },
+    handleSaveStockingBind() {
+      const changedList = [];
+      this.stockingDetailList.forEach(item => {
+        (item.bindList || []).forEach(bindItem => {
+          this.handleBindNumChange(bindItem);
+          const currentPhNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum);
+          const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum);
+          if (currentPhNum !== originalPhNum) {
+            changedList.push({
+              orderId: this.stockingDetailRow.id,
+              purchaseId: bindItem.purchaseId,
+              purchaseNo: bindItem.purchaseNo,
+              originalBindNum: originalPhNum,
+              bindNum: currentPhNum
+            });
+          }
+        });
+      });
+      if (!changedList.length) {
+        this.$message.warning('暂无变更数据');
+        return;
+      }
+      this.stockingSaveChangedList = changedList;
+      this.stockingSaveConfirmVisible = true;
+    },
+    confirmSaveStockingBind() {
+      this.stockingDetailSaving = true;
+      Promise.all(this.stockingSaveChangedList.map(item => savePurchaseOrderMap({
+        orderId: item.orderId,
+        purchaseId: item.purchaseId,
+        bindNum: item.bindNum
+      }))).then(() => {
+        this.$message.success('保存成功');
+        this.stockingDetailList.forEach(item => {
+          (item.bindList || []).forEach(bindItem => {
+            bindItem.originalPhNum = bindItem.phNum;
+            this.$delete(this.stockingBindDraftMap, bindItem.purchaseId);
+          });
+        });
+        this.stockingSaveConfirmVisible = false;
+        this.stockingDetailVisible = false;
+        this.stockingSaveChangedList = [];
+        this.getList();
+      }).finally(() => {
+        this.stockingDetailSaving = false;
+      });
+    },
+    handleAssignOuterSnCode(row, item) {
+      this.outerSnBindRow = row || {};
+      this.outerSnProductRow = item || {};
+      this.outerSnDetail = {
+        totalQuantity: 0,
+        quotaQuantity: 0,
+        warehouseList: [],
+        snList: []
+      };
+      this.outerSnActiveWarehouse = '';
+      this.outerSnSearchKeyword = '';
+      this.outerSnSelectedList = [];
+      this.outerSnSelectAll = false;
+      this.outerSnSelectIndeterminate = false;
+      if (!row || !row.purchaseNo) {
+        this.$message.warning('采购单号为空，无法查询SN码');
+        return;
+      }
+      this.outerSnDialogVisible = true;
+      this.outerSnLoading = true;
+      purchaseSnList(row.purchaseNo, this.stockingDetailRow.orderCode).then(response => {
+        const data = response.data || {};
+        this.outerSnDetail = {
+          totalQuantity: data.totalQuantity || 0,
+          quotaQuantity: data.quotaQuantity || 0,
+          warehouseList: data.warehouseList || [],
+          snList: data.snList || []
+        };
+        if (this.outerSnDetail.warehouseList.length > 0) {
+          this.outerSnActiveWarehouse = this.outerSnDetail.warehouseList[0].warehouseName;
+        }
+        this.outerSnSelectedList = this.outerSnDetail.snList
+          .filter(sn => sn.orderCode && sn.orderCode === this.stockingDetailRow.orderCode)
+          .map(sn => sn.productSn)
+          .slice(0, this.outerSnQuotaQuantity);
+        this.updateSelectAllState();
+      }).finally(() => {
+        this.outerSnLoading = false;
+      });
+    },
+    getWarehouseSnCount(warehouseName) {
+      if (!warehouseName) return 0;
+      return (this.outerSnDetail.snList || []).filter(sn => sn.warehouseName === warehouseName).length;
+    },
+    isSnSelected(productSn) {
+      return this.outerSnSelectedList.includes(productSn);
+    },
+    isSnDisabled(sn) {
+      return !!(sn.outerCode || (sn.orderCode && sn.orderCode !== (this.stockingDetailRow && this.stockingDetailRow.orderCode)));
+    },
+    handleSnCardClick(sn) {
+      if (this.isSnDisabled(sn)) return;
+      this.toggleSnSelection(sn.productSn);
+    },
+    handleSnCheckboxChange(sn, checked) {
+      if (this.isSnDisabled(sn)) return;
+      const index = this.outerSnSelectedList.indexOf(sn.productSn);
+      if (checked && index === -1) {
+        if (!this.canSelectMoreSn()) return;
+        this.outerSnSelectedList.push(sn.productSn);
+      } else if (!checked && index !== -1) {
+        this.outerSnSelectedList.splice(index, 1);
+      }
+      this.updateSelectAllState();
+    },
+    toggleSnSelection(productSn) {
+      const index = this.outerSnSelectedList.indexOf(productSn);
+      if (index === -1) {
+        if (!this.canSelectMoreSn()) return;
+        this.outerSnSelectedList.push(productSn);
+      } else {
+        this.outerSnSelectedList.splice(index, 1);
+      }
+      this.updateSelectAllState();
+    },
+    handleOuterSnSelectAll(checked) {
+      const quotaQuantity = this.outerSnQuotaQuantity;
+      const availableSns = this.filteredSnList.filter(sn => !this.isSnDisabled(sn)).map(sn => sn.productSn);
+      if (checked) {
+        if (quotaQuantity <= 0) {
+          this.$message.warning('当前配额数量为0，不能选择SN码');
+          this.outerSnSelectAll = false;
+          this.outerSnSelectIndeterminate = false;
+          return;
+        }
+        const normalizedSelectedList = this.outerSnSelectedList.slice(0, quotaQuantity);
+        const unselectedSns = availableSns.filter(sn => !normalizedSelectedList.includes(sn));
+        const remainCount = quotaQuantity - normalizedSelectedList.length;
+        this.outerSnSelectedList = normalizedSelectedList.concat(unselectedSns.slice(0, Math.max(remainCount, 0)));
+        if (availableSns.length > this.outerSnSelectedList.filter(sn => availableSns.includes(sn)).length) {
+          this.$message.warning(`最多只能选择 ${quotaQuantity} 个SN码`);
+        }
+      } else {
+        this.outerSnSelectedList = this.outerSnSelectedList.filter(sn => !availableSns.includes(sn)).slice(0, quotaQuantity);
+      }
+      this.updateSelectAllState();
+    },
+    handleOuterSnClearSelected() {
+      const quotaQuantity = this.outerSnQuotaQuantity;
+      if (this.outerSnSelectedList.length > quotaQuantity) {
+        this.$message.warning(`已选SN码数量超过配额 ${quotaQuantity}，已清空选择`);
+      }
+      this.outerSnSelectedList = [];
+      this.updateSelectAllState();
+    },
+    canSelectMoreSn(showMessage = true) {
+      if (this.outerSnSelectedList.length < this.outerSnQuotaQuantity) {
+        return true;
+      }
+      if (showMessage) {
+        this.$message.warning(`最多只能选择 ${this.outerSnQuotaQuantity} 个SN码`);
+      }
+      return false;
+    },
+    updateSelectAllState() {
+      const availableSns = this.filteredSnList.filter(sn => !this.isSnDisabled(sn)).map(sn => sn.productSn);
+      if (availableSns.length === 0) {
+        this.outerSnSelectAll = false;
+        this.outerSnSelectIndeterminate = false;
+        return;
+      }
+      const selectedInCurrent = availableSns.filter(sn => this.outerSnSelectedList.includes(sn)).length;
+      this.outerSnSelectAll = selectedInCurrent === availableSns.length;
+      this.outerSnSelectIndeterminate = selectedInCurrent > 0 && selectedInCurrent < availableSns.length;
+    },
+    handleConfirmSnSelection() {
+      if (this.outerSnSelectedList.length > this.outerSnQuotaQuantity) {
+        this.$message.warning(`最多只能选择 ${this.outerSnQuotaQuantity} 个SN码`);
+        return;
+      }
+      this.$confirm(`确认将选中的 ${this.outerSnSelectedList.length} 个SN码分配给当前订单？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在分配SN码...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        bindOrderSnCodes(this.stockingDetailRow.orderCode, this.outerSnProductRow.productCode, this.outerSnSelectedList).then(response => {
+          loading.close();
+          this.$message.success(`成功分配 ${this.outerSnSelectedList.length} 个SN码`);
+          this.outerSnDialogVisible = false;
+          this.handleShowStockingDetail(this.stockingDetailRow);
+          this.getList();
+        }).catch(() => {
+          loading.close();
+        });
+      }).catch(() => {});
+    },
+    /** 格式化备货状态 */
+    formatOrderStockingStatus(value) {
+      const statusMap = {
+        PHZ: '配货中',
+        YPH: '已配货',
+        BFBH: '部分备货',
+        BHWC: '备货完成'
+      };
+      return statusMap[value] || value || '配货中';
+    },
+    /** 备货状态样式 */
+    getOrderStockingStatusClass(value) {
+      const classMap = {
+        PHZ: 'stocking-status--yellow',
+        YPH: 'stocking-status--purple',
+        BFBH: 'stocking-status--blue',
+        BHWC: 'stocking-status--green'
+      };
+      return classMap[value] || 'stocking-status--yellow';
     }
   }
 };
@@ -400,3 +993,413 @@ export default {
   padding: 0px 20px 20px 20px !important;
 }
 </style>
+
+<style scoped>
+.stocking-detail-project {
+  margin-top: -25px;
+  margin-bottom: 16px;
+  color: #606266;
+  font-size: 14px;
+}
+
+.stocking-detail-content {
+  max-height: 65vh;
+  overflow-y: auto;
+}
+
+.stocking-product-card {
+  margin-bottom: 20px;
+  background: #fff;
+  border: 1px solid #ebeef5;
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 2px 10px rgba(31, 35, 41, 0.05);
+}
+
+.stocking-product-card:last-child {
+  margin-bottom: 0;
+}
+
+.stocking-product-card__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 16px;
+  padding: 18px 20px;
+  background: linear-gradient(180deg, #f9fbff 0%, #f5f7fa 100%);
+  border-bottom: 1px solid #ebeef5;
+}
+
+.stocking-product-meta {
+  display: flex;
+  align-items: center;
+  color: #606266;
+  font-size: 14px;
+}
+
+.stocking-product-meta__label {
+  color: #909399;
+}
+
+.stocking-product-meta__value {
+  color: #303133;
+}
+
+.stocking-product-meta__value--strong {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.stocking-product-summary {
+  display: flex;
+  align-items: center;
+  gap: 28px;
+  margin-left: auto;
+}
+
+.stocking-product-summary__item {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  white-space: nowrap;
+}
+
+.stocking-product-summary__label {
+  color: #606266;
+  font-size: 14px;
+}
+
+.stocking-product-summary__value {
+  color: #303133;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.stocking-product-summary__value--green {
+  color: #19be6b;
+}
+
+.stocking-product-table {
+  border-top: none;
+}
+
+.stocking-product-table /deep/ .el-table__header-wrapper th {
+  background: #fff;
+  color: #606266;
+  font-weight: 500;
+}
+
+.stocking-bind-pagination {
+  margin-top: 8px;
+}
+
+.stocking-bind-pagination /deep/ .pagination-container {
+  padding: 6px 0 0;
+  background: transparent;
+}
+
+.stocking-bind-pagination /deep/ .el-pagination {
+  justify-content: flex-end;
+  font-size: 12px;
+}
+
+.stocking-bind-pagination /deep/ .el-pagination .btn-prev,
+.stocking-bind-pagination /deep/ .el-pagination .btn-next,
+.stocking-bind-pagination /deep/ .el-pager li,
+.stocking-bind-pagination /deep/ .el-pagination__sizes .el-input__inner {
+  min-width: 28px;
+  height: 28px;
+  line-height: 28px;
+}
+
+.stocking-bind-pagination /deep/ .el-pagination__total,
+.stocking-bind-pagination /deep/ .el-pagination__jump {
+  margin-top: 0;
+}
+
+.stocking-bind-input /deep/ .el-input__inner {
+  text-align: center;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 8px;
+}
+
+.stocking-detail-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.stocking-cost-total {
+  display: inline-flex;
+  align-items: center;
+  min-height: 38px;
+  padding: 0 14px;
+  border: 1px solid #ffd8a8;
+  border-radius: 4px;
+  background: #fff7e6;
+}
+
+.stocking-cost-total__label {
+  color: #303133;
+  font-size: 14px;
+}
+
+.stocking-cost-total__value {
+  margin-left: 8px;
+  color: #f05a00;
+  font-size: 18px;
+  font-weight: 700;
+}
+
+.stocking-save-confirm__title {
+  margin-bottom: 12px;
+  color: #303133;
+  font-size: 14px;
+}
+
+.outer-sn-dialog-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.outer-sn-dialog-title i {
+  color: #409EFF;
+}
+
+.outer-sn-dialog-body {
+  padding: 0;
+}
+
+.outer-sn-header {
+  margin-bottom: 16px;
+}
+
+.outer-sn-tags {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 8px;
+}
+
+.outer-sn-info {
+  font-size: 13px;
+  color: #606266;
+}
+
+.outer-sn-info-label {
+  color: #909399;
+}
+
+.outer-sn-info-value {
+  color: #303133;
+  font-weight: 500;
+}
+
+.outer-sn-stats {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 16px;
+  background: linear-gradient(135deg, #f5f7fa 0%, #f9fbff 100%);
+  border-radius: 8px;
+  margin-bottom: 16px;
+}
+
+.outer-sn-stat-item {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+}
+
+.outer-sn-stat-label {
+  font-size: 14px;
+  color: #606266;
+}
+
+.outer-sn-stat-label--quota {
+  margin-left: 16px;
+}
+
+.outer-sn-stat-value {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.outer-sn-stat-item--selected .outer-sn-stat-value {
+  color: #409EFF;
+}
+
+.outer-sn-tabs {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 16px;
+  border-bottom: 1px solid #e4e7ed;
+}
+
+.outer-sn-tab {
+  padding: 10px 16px;
+  cursor: pointer;
+  font-size: 14px;
+  color: #606266;
+  border-bottom: 2px solid transparent;
+  transition: all 0.3s;
+  user-select: none;
+}
+
+.outer-sn-tab:hover {
+  color: #409EFF;
+}
+
+.outer-sn-tab--active {
+  color: #409EFF;
+  border-bottom-color: #409EFF;
+  font-weight: 500;
+}
+
+.outer-sn-tab-name {
+  margin-right: 4px;
+}
+
+.outer-sn-tab-count {
+  color: #909399;
+  font-size: 13px;
+}
+
+.outer-sn-tab--active .outer-sn-tab-count {
+  color: #409EFF;
+}
+
+.outer-sn-search {
+  margin-bottom: 16px;
+}
+
+.outer-sn-grid-container {
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.outer-sn-grid-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 16px;
+  background: #f5f7fa;
+  border-bottom: 1px solid #e4e7ed;
+}
+
+.outer-sn-current-count {
+  flex: 1;
+  margin-left: 16px;
+  color: #606266;
+  font-size: 13px;
+}
+
+.outer-sn-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 12px;
+  padding: 16px;
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.outer-sn-card {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 12px 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s;
+  background: #fff;
+  user-select: none;
+}
+
+.outer-sn-card:hover:not(.outer-sn-card--disabled) {
+  border-color: #409EFF;
+  background: #ecf5ff;
+}
+
+.outer-sn-card--selected {
+  border-color: #409EFF;
+  background: #ecf5ff;
+}
+
+.outer-sn-card--disabled {
+  background: #f5f7fa;
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+
+.outer-sn-card-text {
+  flex: 1;
+  font-size: 13px;
+  color: #303133;
+  font-family: 'Courier New', monospace;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.outer-sn-card--disabled .outer-sn-card-text {
+  color: #909399;
+}
+
+.outer-sn-summary {
+  margin-bottom: 12px;
+}
+
+.outer-sn-warehouse-table {
+  margin-bottom: 12px;
+}
+
+.stocking-status {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 64px;
+  height: 24px;
+  padding: 0 10px;
+  border-radius: 12px;
+  font-size: 12px;
+  line-height: 1;
+  font-weight: 500;
+}
+
+.stocking-status--yellow {
+  color: #e6a23c;
+  background: #fdf6ec;
+  border: 1px solid #faecd8;
+}
+
+.stocking-status--purple {
+  color: #8a4f83;
+  background: #f6f0f7;
+  border: 1px solid #eadfec;
+}
+
+.stocking-status--blue {
+  color: #409eff;
+  background: #ecf5ff;
+  border: 1px solid #d9ecff;
+}
+
+.stocking-status--green {
+  color: #67c23a;
+  background: #f0f9eb;
+  border: 1px solid #e1f3d8;
+}
+
+.stocking-status--green {
+  color: #67c23a;
+  background: #f0f9eb;
+  border: 1px solid #e1f3d8;
+}
+</style>
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
index 23257cc0..a1f54058 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
@@ -135,6 +135,7 @@ export default {
         inventoryStatus: '0',
         productCode: undefined,
         warehouseId: undefined,
+        orderCode: undefined,
       },
       isImported: false, // Flag to track if data is from import
       isInitialLoad: false,
@@ -168,6 +169,7 @@ export default {
       });
       console.log('outerForm 关键字段:', {
         outerCode: outerForm && outerForm.outerCode,
+        orderCode: outerForm && outerForm.orderCode,
         deliveryTime: outerForm && outerForm.deliveryTime,
         vendorName: outerForm && outerForm.vendorName,
         notifierAddress: outerForm && outerForm.notifierAddress
@@ -183,6 +185,7 @@ export default {
 
       this.queryParams.productCode = productRow.productCode;
       this.queryParams.warehouseId = productRow.warehouseId;
+      this.queryParams.orderCode = outerForm && outerForm.orderCode;
       this.queryParams.pageSize = productRow.quantity - productRow.deliveryGenerateQuantity - productRow.deliveryConfirmQuantity;
 
       this.isInitialLoad = true;
@@ -333,6 +336,7 @@ export default {
             inventoryStatus: '0',
             productCode: undefined,
             warehouseId: undefined,
+            orderCode: undefined,
         };
         this.isImported = false;
         this.price = null;
diff --git a/oms_web/oms_vue/src/views/project/info/ProductConfig.vue b/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
index d8fdeae9..73d545e0 100644
--- a/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
+++ b/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
@@ -391,7 +391,7 @@ export default {
       } else if (type === 'hardware') {
         this.currentProductType = '2';
       } else if (type === 'maintenance') {
-        this.currentProductType = '3';
+        this.currentProductType = '3,22';
       }
 
       this.selectProductVisible = true;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
index 9625cff3..88e56d75 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
@@ -6,9 +6,13 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
@@ -421,13 +425,17 @@ public class ProjectOrderInfoController extends BaseController
     @PostMapping("/importContractData")
     @ResponseBody
     public AjaxResult importContractData(@RequestPart("file") MultipartFile file, @RequestParam(value = "orderId",required = false) Long orderId, @RequestParam("fileSort") String fileSort, @RequestParam("versionCode") String versionCode) {
+        String fileName = file.getOriginalFilename();
+        if (!isAllowedContractFile(fileName, fileSort)) {
+            return AjaxResult.error(getContractFileTypeError(fileSort));
+        }
         ProjectOrderFileLog projectOrderFileLog = new ProjectOrderFileLog();
         projectOrderFileLog.setFileType(ProjectOrderFileLog.FileTypeEnum.CONTRACT.getCode());
         projectOrderFileLog.setOrderId(orderId);
         projectOrderFileLog.setUploadTime(DateUtils.getNowDate());
         projectOrderFileLog.setUploadUser(ShiroUtils.getUserId().toString());
         projectOrderFileLog.setUploadUserName(ShiroUtils.getSysUser().getUserName().toString());
-        projectOrderFileLog.setFileName(file.getOriginalFilename());
+        projectOrderFileLog.setFileName(fileName);
         projectOrderFileLog.setFileSort(fileSort);
         projectOrderFileLog.setFileVersionCode(versionCode);
         try {
@@ -440,6 +448,46 @@ public class ProjectOrderInfoController extends BaseController
         return AjaxResult.success(projectOrderFileLog);
     }
 
+    private boolean isAllowedContractFile(String fileName, String fileSort) {
+        if (StringUtils.isEmpty(fileName) || StringUtils.isEmpty(fileSort)) {
+            return false;
+        }
+        int dotIndex = fileName.lastIndexOf('.');
+        if (dotIndex < 0 || dotIndex == fileName.length() - 1) {
+            return false;
+        }
+        String extension = fileName.substring(dotIndex + 1).toLowerCase(Locale.ROOT);
+        return getAllowedContractExtensions(fileSort).contains(extension);
+    }
+
+    private Set<String> getAllowedContractExtensions(String fileSort) {
+        switch (fileSort) {
+            case "0":
+            case "1":
+            case "3":
+                return new HashSet<>(Arrays.asList("pdf", "jpg", "png"));
+            case "2":
+                return new HashSet<>(Arrays.asList("zip", "rar", "jpg", "png"));
+            default:
+                return Collections.emptySet();
+        }
+    }
+
+    private String getContractFileTypeError(String fileSort) {
+        switch (fileSort) {
+            case "0":
+                return "商务折扣审批文件仅支持 pdf、jpg、png 格式";
+            case "1":
+                return "合同文件仅支持 pdf、jpg、png 格式";
+            case "2":
+                return "补充附件仅支持 zip、rar、jpg、png 格式";
+            case "3":
+                return "已盖章合同文件仅支持 pdf、jpg、png 格式";
+            default:
+                return "不支持的文件类型";
+        }
+    }
+
 
     @GetMapping("/contract/export")
     public void contractExport(@RequestParam(required = false) String fileName, 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java
index d172a98c..22fe4b7e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java
@@ -7,8 +7,11 @@ 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.ShiroUtils;
+import com.ruoyi.sip.domain.OmsPurchaseOrderMap;
 import com.ruoyi.sip.domain.ProjectOrderFileLog;
 import com.ruoyi.sip.domain.ProjectOrderInfo;
+import com.ruoyi.sip.dto.OrderProductMatchBindDto;
+import com.ruoyi.sip.dto.OrderProductMatchDto;
 import com.ruoyi.sip.flowable.domain.Todo;
 import com.ruoyi.sip.flowable.service.TodoService;
 import com.ruoyi.sip.service.IProjectOrderFileLogService;
@@ -155,4 +158,51 @@ public class VueProjectOrderInfoController extends BaseController {
         String fileName = projectOrderInfoService.exportMcpList(projectOrderInfo);
         return AjaxResult.success(fileName);
     }
+
+    /**
+     * 配备货产品信息
+     */
+    @GetMapping("/productMatchList")
+    public AjaxResult productMatchList(@RequestParam String orderCode) {
+        List<OrderProductMatchDto> list = projectOrderInfoService.selectProductMatchList(orderCode);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 配备货绑定信息
+     */
+    @GetMapping("/productMatchBindList")
+    public TableDataInfo productMatchBindList(@RequestParam String orderCode, @RequestParam String productCode) {
+        startPage();
+        List<OrderProductMatchBindDto> list = projectOrderInfoService.selectProductMatchBindList(orderCode, productCode);
+        return getDataTable(list);
+    }
+
+    /**
+     * 订单关联采购单保存
+     */
+    @PostMapping("/purchaseOrderMap")
+    public AjaxResult savePurchaseOrderMap(@RequestBody OmsPurchaseOrderMap omsPurchaseOrderMap) {
+        return toAjax(projectOrderInfoService.savePurchaseOrderMap(omsPurchaseOrderMap));
+    }
+
+    /**
+     * 采购单SN码列表
+     */
+    @GetMapping("/purchaseSnList")
+    public AjaxResult purchaseSnList(@RequestParam String purchaseNo, @RequestParam String orderCode) {
+        return AjaxResult.success(projectOrderInfoService.selectPurchaseSnList(purchaseNo, orderCode));
+    }
+
+    /**
+     * 订单绑定SN码
+     */
+    @PostMapping("/bindOrderSnCodes")
+    public AjaxResult bindOrderSnCodes(@RequestBody Map<String, Object> params) {
+        String orderCode = (String) params.get("orderCode");
+        String productCode = (String) params.get("productCode");
+        List<String> productSnList = (List<String>) params.get("productSnList");
+        return toAjax(projectOrderInfoService.bindOrderSnCodes(orderCode, productCode, productSnList));
+    }
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
index 7739cb01..44b11131 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryInfo.java
@@ -50,6 +50,7 @@ public class InventoryInfo extends BaseEntity
     /** 出库单号 */
     @Excel(name = "出库单号")
     private String outerCode;
+    private String orderCode;
 
     /** 所属仓库 */
     @Excel(name = "所属仓库")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java
new file mode 100644
index 00000000..2c87d4db
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java
@@ -0,0 +1,15 @@
+package com.ruoyi.sip.domain;
+
+import lombok.Data;
+
+@Data
+public class OmsPurchaseOrderMap {
+
+    private Long id;
+
+    private Long orderId;
+
+    private Long purchaseId;
+
+    private Integer bindNum;
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
index 223390fd..e74554c6 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
@@ -264,6 +264,10 @@ public class ProjectOrderInfo extends BaseEntity {
     private String approveNode;
     //计收状态
     private String chargeStatus;
+    /**
+     * 备货状态
+     */
+    private String orderStockingStatus;
 
     /**
      * 付款方式
@@ -435,4 +439,21 @@ public class ProjectOrderInfo extends BaseEntity {
         }
     }
 
+    @Getter
+    public enum OrderStockingStatusEnum {
+        PHZ("PHZ", "配货中"),
+        YPH("YPH", "已配货"),
+        BFBH("BFBH", "部分备货"),
+        BHWC("BHWC", "备货完成"),
+        ;
+
+        private final String code;
+        private final String value;
+
+        OrderStockingStatusEnum(String code, String value) {
+            this.code = code;
+            this.value = value;
+        }
+    }
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchBindDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchBindDto.java
new file mode 100644
index 00000000..93bc41cf
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchBindDto.java
@@ -0,0 +1,41 @@
+package com.ruoyi.sip.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductMatchBindDto {
+
+    /** 产品编号 */
+    private String productCode;
+
+    /** 产品型号 */
+    private String model;
+
+    /** 采购单主键 */
+    private Long purchaseId;
+
+    /** 采购单号 */
+    private String purchaseNo;
+
+    /** 制造商 */
+    private String vendorAddress;
+
+    /** 采购数量 */
+    private Integer cgNum;
+
+    /** 可用数量 */
+    private Integer kyNum;
+
+    /** 配额数量 */
+    private Integer phNum;
+
+    /** 备货数量 */
+    private Integer bhNum;
+
+    /** 入库状态 */
+    private String status;
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchDto.java
new file mode 100644
index 00000000..a603efef
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.sip.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductMatchDto {
+
+    /** 产品编码 */
+    private String productCode;
+
+    /** 产品型号 */
+    private String model;
+
+    /** 订单数量 */
+    private Integer orderNum;
+
+    /** 配货数量 */
+    private Integer phNum;
+
+    /** 备货数量 */
+    private Integer bhNum;
+
+    /** 总成本 */
+    private BigDecimal sumCost;
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDetailDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDetailDto.java
new file mode 100644
index 00000000..25960982
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDetailDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.sip.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductMatchSnDetailDto {
+
+    /** 产品SN码 */
+    private String productSn;
+
+    /** 仓库名称 */
+    private String warehouseName;
+
+    /** 订单编号 */
+    private String orderCode;
+
+    /** 出库单号 */
+    private String outerCode;
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDto.java
new file mode 100644
index 00000000..51f5e2ae
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchSnDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.sip.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductMatchSnDto {
+
+    /** SN码总数量 */
+    private Integer totalQuantity;
+
+    private Integer quotaQuantity;
+
+    /** 仓库列表 */
+    private List<OrderProductMatchWarehouseDto> warehouseList;
+
+    /** SN码列表 */
+    private List<OrderProductMatchSnDetailDto> snList;
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchWarehouseDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchWarehouseDto.java
new file mode 100644
index 00000000..9b1b3b9b
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/OrderProductMatchWarehouseDto.java
@@ -0,0 +1,18 @@
+package com.ruoyi.sip.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductMatchWarehouseDto {
+
+    /** 仓库名称 */
+    private String WarehouseName;
+
+    /** 绑定数量 */
+    private Integer bindNum;
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java
index 11a1314f..5ebfbeb7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java
@@ -83,4 +83,8 @@ public interface InventoryInfoMapper
     List<InventoryInfo> selectInventoryInfoByOuterCodeList(List<String> outerCodeList);
 
     List<InventoryInfo> selectInventoryInfoByInnerCodeList(List<String> innerCodeList);
+
+    int clearOrderCodeByOrderCodeAndProductCode(@Param("orderCode") String orderCode, @Param("productCode") String productCode);
+
+    int updateOrderCodeByProductSnList(@Param("productSnList") List<String> productSnList, @Param("orderCode") String orderCode);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java
new file mode 100644
index 00000000..b855f5b2
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java
@@ -0,0 +1,13 @@
+package com.ruoyi.sip.mapper;
+
+import com.ruoyi.sip.domain.OmsPurchaseOrderMap;
+import org.apache.ibatis.annotations.Param;
+
+public interface OmsPurchaseOrderMapMapper {
+
+    OmsPurchaseOrderMap selectByOrderIdAndPurchaseId(@Param("orderId") Long orderId, @Param("purchaseId") Long purchaseId);
+
+    int insertOmsPurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap);
+
+    int updateOmsPurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap);
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java
index 37e7d294..662b4f34 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java
@@ -5,6 +5,9 @@ import java.util.List;
 import com.ruoyi.sip.domain.InventoryDelivery;
 import com.ruoyi.sip.domain.ProjectOrderInfo;
 import com.ruoyi.sip.dto.HomepageQueryDto;
+import com.ruoyi.sip.dto.OrderProductMatchBindDto;
+import com.ruoyi.sip.dto.OrderProductMatchDto;
+import com.ruoyi.sip.dto.OrderProductMatchSnDetailDto;
 import com.ruoyi.sip.dto.StatisticsDetailDto;
 import com.ruoyi.sip.vo.OrderInfoVo;
 import org.apache.ibatis.annotations.Param;
@@ -76,6 +79,9 @@ public interface ProjectOrderInfoMapper
 
     int updateProjectOrderInfoByCode(ProjectOrderInfo projectOrderInfo);
 
+    int updateOrderStockingStatusByCode(@Param("orderCode") String orderCode,
+                                        @Param("orderStockingStatus") String orderStockingStatus);
+
     void bakData(ProjectOrderInfo projectOrderInfo);
 
     List<OrderInfoVo> listOrderInfoVo(ProjectOrderInfo queryParams);
@@ -93,4 +99,16 @@ public interface ProjectOrderInfoMapper
                                @Param("dutyPhone") String dutyPhone,
                                @Param("projectIds") List<Long> projectIds);
 
+    List<OrderProductMatchDto> selectProductMatchList(@Param("orderCode") String orderCode);
+
+    List<OrderProductMatchBindDto> selectProductMatchBindList(@Param("orderCode") String orderCode,
+                                                              @Param("productCode") String productCode);
+
+    int selectProductMatchSnCountlList(@Param("purchaseNo") String purchaseNo);
+
+    int selectPurchaseOrderMapBindNum(@Param("purchaseNo") String purchaseNo,
+                                      @Param("orderCode") String orderCode);
+
+    List<OrderProductMatchSnDetailDto> selectProductMatchSnDetailList(@Param("purchaseNo") String purchaseNo);
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java
index 6e9c8767..8e4ac002 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java
@@ -2,9 +2,13 @@ package com.ruoyi.sip.service;
 
 import java.util.List;
 
+import com.ruoyi.sip.domain.OmsPurchaseOrderMap;
 import com.ruoyi.sip.domain.ProjectOrderFileLog;
 import com.ruoyi.sip.domain.ProjectOrderInfo;
 import com.ruoyi.sip.dto.ApiDataQueryDto;
+import com.ruoyi.sip.dto.OrderProductMatchBindDto;
+import com.ruoyi.sip.dto.OrderProductMatchDto;
+import com.ruoyi.sip.dto.OrderProductMatchSnDto;
 import com.ruoyi.sip.flowable.domain.Todo;
 import com.ruoyi.sip.dto.HomepageQueryDto;
 import com.ruoyi.sip.dto.StatisticsDetailDto;
@@ -107,4 +111,14 @@ public interface IProjectOrderInfoService
 
     void approveOrderBatch(Todo todo);
 
+    List<OrderProductMatchDto> selectProductMatchList(String orderCode);
+
+    List<OrderProductMatchBindDto> selectProductMatchBindList(String orderCode, String productCode);
+
+    int savePurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap);
+
+    OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode);
+
+    int bindOrderSnCodes(String orderCode, String productCode, List<String> productSnList);
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 7da0c734..6c6ddfaa 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -55,13 +55,11 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.sip.domain.*;
-import com.ruoyi.sip.dto.ApiDataQueryDto;
+import com.ruoyi.sip.dto.*;
 import com.ruoyi.sip.flowable.domain.Todo;
-import com.ruoyi.sip.dto.HomepageQueryDto;
-import com.ruoyi.sip.dto.OrderExcelNumStaticsDto;
-import com.ruoyi.sip.dto.StatisticsDetailDto;
 import com.ruoyi.sip.flowable.service.IBuApproveConfigService;
 import com.ruoyi.sip.llm.tools.ProjectOrderInfoToolProvider;
+import com.ruoyi.sip.mapper.OmsPurchaseOrderMapMapper;
 import com.ruoyi.sip.mapper.OmsStockInfoMapper;
 import com.ruoyi.sip.mapper.ProjectInfoMapper;
 import com.ruoyi.sip.service.*;
@@ -110,6 +108,9 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     @Autowired
     private ProjectOrderInfoMapper projectOrderInfoMapper;
 
+    @Autowired
+    private OmsPurchaseOrderMapMapper omsPurchaseOrderMapMapper;
+
     @Autowired
     private IProjectOrderFileLogService fileLogService;
     @Autowired
@@ -146,6 +147,9 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     @Autowired
     private IProjectProductInfoBakService projectProductInfoBakService;
 
+    @Autowired
+    private com.ruoyi.sip.mapper.InventoryInfoMapper inventoryInfoMapper;
+
     private static final List<String> CSS_EMAIL_LIST = Arrays.asList("shiguijuan@pcitech.com",  "huiwang@pcitech.com",  "zhaoqian1@pcitech.com",  "pci-ict@pcitech.com");
     private static final List<String> REJECT_EMAIL_LIST = Arrays.asList("li.junjie@unisinsight.com",  "chen.shenggang@unisinsight.com");
 
@@ -2872,4 +2876,92 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
         XWPFRun run = paragraph.createRun();
         run.setText(text != null ? text : "");
     }
+
+    @Override
+    public List<OrderProductMatchDto> selectProductMatchList(String orderCode) {
+        return projectOrderInfoMapper.selectProductMatchList(orderCode);
+    }
+
+    @Override
+    public List<OrderProductMatchBindDto> selectProductMatchBindList(String orderCode, String productCode) {
+        return projectOrderInfoMapper.selectProductMatchBindList(orderCode, productCode);
+    }
+
+    @Override
+    public int savePurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap) {
+        OmsPurchaseOrderMap exist = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(omsPurchaseOrderMap.getOrderId(), omsPurchaseOrderMap.getPurchaseId());
+        int result;
+        if (exist == null) {
+            result = omsPurchaseOrderMapMapper.insertOmsPurchaseOrderMap(omsPurchaseOrderMap);
+        } else {
+            exist.setBindNum(omsPurchaseOrderMap.getBindNum());
+            result = omsPurchaseOrderMapMapper.updateOmsPurchaseOrderMap(exist);
+        }
+        ProjectOrderInfo projectOrderInfo = projectOrderInfoMapper.selectProjectOrderInfoById(omsPurchaseOrderMap.getOrderId());
+        if (projectOrderInfo != null) {
+            refreshOrderStockingStatus(projectOrderInfo.getOrderCode());
+        }
+        return result;
+    }
+
+    @Override
+    public OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode) {
+        OrderProductMatchSnDto result = new OrderProductMatchSnDto();
+        result.setTotalQuantity(projectOrderInfoMapper.selectProductMatchSnCountlList(purchaseNo));
+        Integer quotaQuantity = projectOrderInfoMapper.selectPurchaseOrderMapBindNum(purchaseNo, orderCode);
+        result.setQuotaQuantity(quotaQuantity == null ? 0 : quotaQuantity);
+        List<OrderProductMatchSnDetailDto> snList = projectOrderInfoMapper.selectProductMatchSnDetailList(purchaseNo);
+        result.setSnList(snList);
+        List<OrderProductMatchWarehouseDto> warehouseList = snList.stream()
+                .collect(Collectors.groupingBy(OrderProductMatchSnDetailDto::getWarehouseName))
+                .entrySet().stream()
+                .map(entry -> new OrderProductMatchWarehouseDto(entry.getKey(), (int) entry.getValue().stream()
+                        .filter(item -> orderCode != null && orderCode.equals(item.getOrderCode()))
+                        .count()))
+                .collect(Collectors.toList());
+        result.setWarehouseList(warehouseList);
+        return result;
+    }
+
+    @Override
+    public int bindOrderSnCodes(String orderCode, String productCode, List<String> productSnList) {
+        if (StringUtils.isEmpty(orderCode) || StringUtils.isEmpty(productCode)) {
+            return 0;
+        }
+        inventoryInfoMapper.clearOrderCodeByOrderCodeAndProductCode(orderCode, productCode);
+        int result = 1;
+        if (CollUtil.isNotEmpty(productSnList)) {
+            result = inventoryInfoMapper.updateOrderCodeByProductSnList(productSnList, orderCode);
+        }
+        refreshOrderStockingStatus(orderCode);
+        return result;
+    }
+
+    private void refreshOrderStockingStatus(String orderCode) {
+        if (StringUtils.isEmpty(orderCode)) {
+            return;
+        }
+        List<OrderProductMatchDto> matchList = projectOrderInfoMapper.selectProductMatchList(orderCode);
+        if (CollUtil.isEmpty(matchList)) {
+            return;
+        }
+        int orderNum = matchList.stream().mapToInt(item -> item.getOrderNum() == null ? 0 : item.getOrderNum()).sum();
+        int phNum = matchList.stream().mapToInt(item -> item.getPhNum() == null ? 0 : item.getPhNum()).sum();
+        int bhNum = matchList.stream().mapToInt(item -> item.getBhNum() == null ? 0 : item.getBhNum()).sum();
+        String stockingStatus = null;
+        if (phNum > 0) {
+            stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.PHZ.getCode();
+        }
+        if (orderNum > 0 && phNum >= orderNum) {
+            stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.YPH.getCode();
+            if (bhNum > 0) {
+                stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.BFBH.getCode();
+            }
+        }
+        if (orderNum > 0 && bhNum >= orderNum) {
+            stockingStatus = ProjectOrderInfo.OrderStockingStatusEnum.BHWC.getCode();
+        }
+        projectOrderInfoMapper.updateOrderStockingStatusByCode(orderCode, stockingStatus);
+    }
+
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
index a6a2513a..563ff59e 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inventoryStatus"    column="inventory_status"    />
         <result property="innerCode"    column="inner_code"    />
         <result property="outerCode"    column="outer_code"    />
+        <result property="orderCode"    column="order_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="innerPrice"    column="inner_price"    />
         <result property="outerPrice"    column="outer_price"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInventoryInfoVo">
-        select t1.id, t1.product_code, t1.product_sn, t1.license_key, t1.inventory_status, t1.inner_code, t1.outer_code, t1.warehouse_id, t1.inner_price,t1.tax_rate,
+        select t1.id, t1.product_code, t1.product_sn, t1.license_key, t1.inventory_status, t1.inner_code, t1.outer_code, t1.order_code, t1.warehouse_id, t1.inner_price,t1.tax_rate,
                t1.outer_price, t1.create_by, t1.create_time, t1.update_by, t1.update_time ,
                t2.warehouse_name,t3.description as 'product_desc',t3.model,t3.type as product_type
         from oms_inventory_info t1
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="innerCode != null  and innerCode != ''">and t1.inner_code = #{innerCode}</if>
             <if test="outerCode != null  and outerCode != ''">and t1.outer_code = #{outerCode}</if>
+            <if test="orderCode != null  and orderCode != ''">and t1.order_code = #{orderCode}</if>
             <if test="warehouseId != null ">and t1.warehouse_id = #{warehouseId}</if>
             <if test="innerPrice != null ">and t1.inner_price = #{innerPrice}</if>
             <if test="outerPrice != null ">and t1.outer_price = #{outerPrice}</if>
@@ -213,6 +215,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </foreach>)
 
     </update>
+    <update id="clearOrderCodeByOrderCodeAndProductCode">
+        update oms_inventory_info
+        set order_code = null,
+            update_time = now()
+        where order_code = #{orderCode}
+          and product_code = #{productCode}
+    </update>
+
+    <update id="updateOrderCodeByProductSnList">
+        update oms_inventory_info
+        set order_code = #{orderCode},
+            update_time = now()
+        where product_sn in
+        <foreach item="productSn" collection="productSnList" separator="," open="(" close=")">
+            #{productSn}
+        </foreach>
+    </update>
 
     <delete id="deleteInventoryInfoById" parameterType="Long">
         delete from oms_inventory_info where id = #{id}
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml
new file mode 100644
index 00000000..d10b5f3a
--- /dev/null
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml
@@ -0,0 +1,33 @@
+<?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.sip.mapper.OmsPurchaseOrderMapMapper">
+
+    <resultMap type="OmsPurchaseOrderMap" id="OmsPurchaseOrderMapResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="purchaseId" column="purchase_id"/>
+        <result property="bindNum" column="bind_num"/>
+    </resultMap>
+
+    <select id="selectByOrderIdAndPurchaseId" resultMap="OmsPurchaseOrderMapResult">
+        select id, order_id, purchase_id, bind_num
+        from oms_purchase_order_map
+        where order_id = #{orderId}
+          and purchase_id = #{purchaseId}
+        limit 1
+    </select>
+
+    <insert id="insertOmsPurchaseOrderMap" parameterType="OmsPurchaseOrderMap" useGeneratedKeys="true" keyProperty="id">
+        insert into oms_purchase_order_map(order_id, purchase_id, bind_num)
+        values (#{orderId}, #{purchaseId}, #{bindNum})
+    </insert>
+
+    <update id="updateOmsPurchaseOrderMap" parameterType="OmsPurchaseOrderMap">
+        update oms_purchase_order_map
+        set bind_num = #{bindNum}
+        where id = #{id}
+    </update>
+
+</mapper>
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 24799d06..0e2b7b24 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -38,13 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="paymentRatio"    column="payment_ratio"    />
         <result property="paymentDescription"    column="payment_description"    />
         <result property="operationVersion"    column="operation_version"    />
+        <result property="orderStockingStatus"    column="order_stocking_status"    />
     </resultMap>
 
     <sql id="selectProjectOrderInfoVo">
         select id, project_id,province, city, business_person, business_email, business_phone, order_code, currencyType,
                shipment_amount, actual_purchase_amount, order_end_time, delivery_time, company_delivery, notifier,finance_status,
                notifier_email, notifier_phone, duty, duty_email, duty_phone, order_channel, partner_code, supplier,notifier_address,
-               remark, order_status, create_by, create_time, update_by, update_time,version_code,process_type,process_template,discount_fold,
+               remark, order_status, create_by, create_time, update_by, update_time,version_code,process_type,process_template,discount_fold,order_stocking_status,
                 delivery_status,sign_status,outer_status,approve_time,payment_method,payment_ratio,payment_description,order_type,operation_version
 
         from project_order_info t1
@@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                t1.notifier_email, t1.notifier_phone, t1.duty, t1.duty_email, t1.duty_phone, t1.order_channel, t1.partner_code, t1.supplier,
                t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time,t1.partner_user_name,t1.partner_email
              ,t1.partner_phone,t1.version_code,t1.process_type,t1.process_template,t1.discount_fold,t1.notifier_address,t1.finance_status,
-            t1.delivery_status,t1.sign_status,t1.outer_status,t1.approve_time,t1.payment_method,t1.payment_ratio,t1.payment_description,t1.operation_version
+            t1.delivery_status,t1.sign_status,t1.outer_status,t1.approve_time,t1.payment_method,t1.payment_ratio,t1.payment_description,t1.operation_version,t1.order_stocking_status
                 ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code,t2.estimated_order_time
              ,t2.customer_phone,t2.customer_user_name,t2.agent_code,t2.customer_code,t2.partner_name project_partner_name
         ,t3.partner_name,t3.level,t3.system_user_id,t3.address partner_address
@@ -122,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="supplier != null  and supplier != ''">and t1.supplier = #{supplier}</if>
         <if test="supplier != null  and supplier != ''">and t1.supplier = #{supplier}</if>
         <if test="orderStatus != null  and orderStatus != ''">and t1.order_status = #{orderStatus}</if>
+        <if test="orderStockingStatus != null  and orderStockingStatus != ''">and t1.order_stocking_status = #{orderStockingStatus}</if>
         <if test="deliveryStatus != null  and deliveryStatus != ''">and t1.delivery_status = #{deliveryStatus}</if>
         <if test="outerStatus != null  and outerStatus != ''">and t1.outer_status = #{outerStatus}</if>
         <if test="signStatus != null  and signStatus != ''">and t1.sign_status = #{signStatus}</if>
@@ -411,7 +413,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t1.notifier_email, t1.notifier_phone, t1.duty, t1.duty_email, t1.duty_phone, t1.order_channel, t1.partner_code, t1.supplier,
         t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time,t1.partner_user_name,t1.partner_email
         ,t1.partner_phone,t1.version_code,t1.process_type,t1.process_template,t1.discount_fold,t1.notifier_address,t1.finance_status,
-        t1.delivery_status,t1.sign_status,t1.outer_status,t1.approve_time,t1.payment_method,t1.payment_ratio,t1.payment_description,t1.operation_version
+        t1.delivery_status,t1.sign_status,t1.outer_status,t1.approve_time,t1.payment_method,t1.payment_ratio,t1.payment_description,t1.operation_version,t1.order_stocking_status
         ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code,t2.estimated_order_time
         ,t2.customer_phone,t2.customer_user_name,t2.agent_code,t2.customer_code,t2.partner_name project_partner_name
         ,t3.partner_name,t3.level,t3.system_user_id,t3.address partner_address
@@ -479,6 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="supplier != null  and supplier != ''">and t1.supplier = #{supplier}</if>
         <if test="supplier != null  and supplier != ''">and t1.supplier = #{supplier}</if>
         <if test="orderStatus != null  and orderStatus != ''">and t1.order_status = #{orderStatus}</if>
+        <if test="orderStockingStatus != null  and orderStockingStatus != ''">and t1.order_stocking_status = #{orderStockingStatus}</if>
         <if test="deliveryStatus != null  and deliveryStatus != ''">and t1.delivery_status = #{deliveryStatus}</if>
         <if test="outerStatus != null  and outerStatus != ''">and t1.outer_status = #{outerStatus}</if>
         <if test="signStatus != null  and signStatus != ''">and t1.sign_status = #{signStatus}</if>
@@ -623,6 +626,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplier != null">supplier,</if>
             <if test="remark != null">remark,</if>
             <if test="orderStatus != null">order_status,</if>
+            <if test="orderStockingStatus != null and orderStockingStatus != ''">order_stocking_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -666,6 +670,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplier != null">#{supplier},</if>
             <if test="remark != null">#{remark},</if>
             <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="orderStockingStatus != null and orderStockingStatus != ''">#{orderStockingStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -806,6 +811,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplier != null">supplier = #{supplier},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="orderStockingStatus != null and orderStockingStatus != ''">order_stocking_status = #{orderStockingStatus},</if>
             <if test="outerStatus != null">outer_status = #{outerStatus},</if>
             <if test="deliveryStatus != null">delivery_status = #{deliveryStatus},</if>
             <if test="signStatus != null">sign_status = #{signStatus},</if>
@@ -867,6 +873,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplier != null">supplier = #{supplier},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="orderStockingStatus != null and orderStockingStatus != ''">order_stocking_status = #{orderStockingStatus},</if>
             <if test="outerStatus != null">outer_status = #{outerStatus},</if>
             <if test="deliveryStatus != null">delivery_status = #{deliveryStatus},</if>
             <if test="signStatus != null">sign_status = #{signStatus},</if>
@@ -880,6 +887,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePartnerCodeByCode">
         update project_order_info set partner_code = #{newValue} where partner_code = #{oldValue}
     </update>
+    <update id="updateOrderStockingStatusByCode">
+        update project_order_info
+        set order_stocking_status = #{orderStockingStatus},
+            update_time = now()
+        where order_code = #{orderCode}
+    </update>
 
     <update id="updateDutyByProjectIds">
         update project_order_info
@@ -914,4 +927,100 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.id = #{id}
     </select>
 
+    <select id="selectProductMatchList" resultType="com.ruoyi.sip.dto.OrderProductMatchDto">
+        select
+            t3.product_code as product_code,
+            t3.model,
+            t1.quantity as order_num,
+            sum(ifnull(t5.bind_num, 0)) as ph_num,
+            (select count(1) from oms_inventory_info as tt where t2.order_code = tt.order_code and t3.product_code = tt.product_code) as bh_num,
+            ifnull((select sum(inner_price) from oms_inventory_info as tt where t2.order_code = tt.order_code and t3.product_code = tt.product_code),0) as sum_cost
+        from project_product_info as t1
+        inner join project_order_info as t2
+            on t1.project_id = t2.project_id
+        inner join product_info as t3
+            on t1.product_bom_code = t3.product_code
+        left join oms_purchase_order_item as t4
+            on t3.product_code = t4.product_code
+        left join oms_purchase_order_map as t5
+            on t2.id = t5.order_id and t4.purchase_id = t5.purchase_id
+        where t2.order_code = #{orderCode}
+        and t3.type in (1, 2)
+        group by t3.product_code, t3.model, t1.quantity
+    </select>
+
+    <select id="selectProductMatchBindList" resultType="com.ruoyi.sip.dto.OrderProductMatchBindDto">
+        select
+            t3.product_code,
+            t3.model,
+            t6.id as purchase_id,
+            t6.purchase_no,
+            (select vendor_address from oms_vendor_info as tt where tt.vendor_id = t6.vendor_id) as vendor_address,
+            t4.quantity as cg_num,
+            t4.quantity - ifnull((select sum(bind_num) from oms_purchase_order_map as tt where tt.purchase_id = t5.purchase_id), 0) as ky_num,
+            t5.bind_num as ph_num,
+            t6.status,
+            (
+                select count(1) from oms_inventory_info as tt1
+                inner join oms_inventory_inner as tt2
+                on tt1.inner_code = tt2.inner_code
+                where t2.order_code = tt1.order_code
+                and t3.product_code = tt1.product_code
+                and tt2.purchase_no = t6.purchase_no
+            ) as bh_num
+        from project_product_info as t1
+        inner join project_order_info as t2
+            on t1.project_id = t2.project_id
+        inner join product_info as t3
+            on t1.product_bom_code = t3.product_code
+        inner join oms_purchase_order_item as t4
+            on t3.product_code = t4.product_code
+        left join oms_purchase_order_map as t5
+            on t2.id = t5.order_id and t4.purchase_id = t5.purchase_id
+        inner join oms_purchase_order as t6
+            on t6.id = t4.purchase_id
+        where t2.order_code = #{orderCode}
+        and t3.product_code = #{productCode}
+        and t6.approve_status = 2 and t6.confirm_status = 1
+        group by t6.purchase_no
+    </select>
+
+    <select id="selectProductMatchSnCountlList" resultType="java.lang.Integer">
+        select
+            count(1)
+        from oms_inventory_info as t1
+        inner join oms_inventory_inner as t2
+            on t1.inner_code = t2.inner_code
+        left join oms_warehouse_info as t3
+            on t2.warehouse_id = t3.id
+        where t2.purchase_no = #{purchaseNo}
+    </select>
+
+    <select id="selectPurchaseOrderMapBindNum" resultType="java.lang.Integer">
+        select
+            ifnull(t3.bind_num, 0)
+        from oms_purchase_order as t1
+        inner join project_order_info as t2
+            on t2.order_code = #{orderCode}
+        left join oms_purchase_order_map as t3
+            on t2.id = t3.order_id and t1.id = t3.purchase_id
+        where t1.purchase_no = #{purchaseNo}
+        limit 1
+    </select>
+
+    <select id="selectProductMatchSnDetailList" resultType="com.ruoyi.sip.dto.OrderProductMatchSnDetailDto">
+        select
+            t1.product_sn,
+            t3.warehouse_name,
+            t1.order_code,
+            t1.outer_code
+        from oms_inventory_info as t1
+        inner join oms_inventory_inner as t2
+            on t1.inner_code = t2.inner_code
+        left join oms_warehouse_info as t3
+            on t2.warehouse_id = t3.id
+        where t2.purchase_no = #{purchaseNo}
+        order by t1.product_sn
+    </select>
+
 </mapper>