出库确认

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{

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);
     }

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("自动分配成功");
     }
 }

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>
 

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}

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()
       })
     },