From 4b2f13dac7d4c6ab5e5ee8893ca0dc360599e275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 25 Jul 2025 09:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/job/MydoJobFinishMapper.xml    | 7 +++----
 .../src/main/resources/mapper/stock/BasStockMapper.xml   | 2 ++
 ruoyi-ui/src/views/out/outStockoutManage.vue             | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index 6e9588f..a18cc5d 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="departmentName"    column="dept_name"    />
     </resultMap>
 
+
     <sql id="selectMydoJobFinishVo">
         select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
                mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
@@ -129,8 +130,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
-            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(25,26)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
             <if test = "inOutIds !=null and inOutIds.size() > 0">
@@ -139,8 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-
-
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index aa0f389..75b0d88 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null  and spare4 != ''"> and bs.spare4 = #{spare4}</if>
             <if test="spare5 != null  and spare5 != ''"> and bs.spare5 = #{spare5}</if>
             <if test="spare6 != null  and spare6 != ''"> and bs.spare6 = #{spare6}</if>
+            <if test="productId != null  and productId != ''"> and bs.product_id = #{productId}</if>
             <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
             <if test="typeData != null and typeData.size()>0">
                 and bw.warehouse_type in
@@ -197,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
         </trim>
         where stock_id = #{stockId}
     </update>
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index 99d59ae..398ed8e 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -370,10 +370,11 @@ export default {
         this.$modal.msgError(this.selectedRows[i].stockoutId+"单据已审核，请勿重复审核")
         return
       }
-       if (this.selectedRows[i].status < 3 && status == "4") {
-        this.$modal.msgError(this.selectedRows[i].stockoutId+"单据未开始，无法确认")
-        return
-      }
+
+      //  if (this.selectedRows[i].status < 3 && status == "4") {
+      //   this.$modal.msgError(this.selectedRows[i].stockoutId+"单据未开始，无法确认")
+      //   return
+      // }
        if (this.selectedRows[i].status != "1" && status == "5"){
          this.$modal.msgError(this.selectedRows[i].stockoutId+"单据已审核，无法作废")
          return;