From ecb691ed364937d44edcd920c4cb9a7bcf1faf06 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 16 Jun 2025 17:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/job/mydojob/controller/InMydoJobController.java | 1 +
 .../out/outStockout/controller/OutStockoutController.java | 1 -
 .../outStockout/service/impl/OutStockoutServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/job/MydoJobMapper.xml       | 3 ++-
 .../src/main/resources/mapper/out/OutStockoutMapper.xml   | 2 +-
 ruoyi-ui/src/views/out/outStockoutManage.vue              | 8 ++++++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
index ec907af..943db53 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
@@ -48,6 +48,7 @@ public class InMydoJobController extends BaseController
     {
         startPage();
         List<MydoJob> list = null;
+        mydoJob.setInOut("1");
         if(Integer.parseInt(mydoJob.getStatus())<4) {
             list = mydoJobService.selectMydoJobList(mydoJob);
         }else{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
index 351390e..e846af7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
@@ -132,7 +132,6 @@ public class OutStockoutController extends BaseController {
     @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
     @Log(title = "出库单自动分配", businessType = BusinessType.OTHER)
     @GetMapping("/autoAllot")
-    @ResponseBody
     public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
         return outStockoutService.autoAllot(stockoutId);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
index c4e6adf..051880f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
@@ -170,6 +170,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         if (stringBuilder.length()>0){
             return AjaxResult.warn(stringBuilder.toString());
         }
-        return AjaxResult.success();
+        return AjaxResult.success("自动分配成功");
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 5098ec1..2d0b836 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -84,7 +84,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' "> and mj.in_or_out >=20</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>
         </where>
     </select>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index de45087..52cd80b 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
         {
-            call proc_update_outbill_status(
+            call proc_auto_allocation(
                 #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=VARCHAR},
                 #{v_resultString,mode=OUT,jdbcType=VARCHAR}
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index b3465d4..fe3804d 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -325,10 +325,14 @@ export default {
       const stockoutIds = this.selectedRows.map(row => row.stockoutId)
       console.log("自动分配：", stockoutIds)
       let data = {
-        stockoutId: stockoutIds
+        stockoutId: stockoutIds[0]
       }
       autoAllot(data).then(response => {
-        this.$modal.msgSuccess(response)
+        if (response.code !== 200){
+          this.$modal.msgError(response.msg)
+        }else {
+          this.$modal.msgSuccess(response.msg)
+        }
         this.getList()
       })
     },