lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库确认

Browse Source
This commit is contained in:
liuhanqing
2025-06-16 17:34:04 +08:00
parent d66bd51cfb
commit ecb691ed36
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
View File

@@ -48,6 +48,7 @@ public class InMydoJobController extends BaseController
{ {
startPage(); startPage();
List<MydoJob> list = null; List<MydoJob> list = null;
mydoJob.setInOut("1");
if(Integer.parseInt(mydoJob.getStatus())<4) { if(Integer.parseInt(mydoJob.getStatus())<4) {
list = mydoJobService.selectMydoJobList(mydoJob); list = mydoJobService.selectMydoJobList(mydoJob);
}else{ }else{

1
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
View File

@@ -132,7 +132,6 @@ public class OutStockoutController extends BaseController {
@PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')") @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
@Log(title = "出库单自动分配", businessType = BusinessType.OTHER) @Log(title = "出库单自动分配", businessType = BusinessType.OTHER)
@GetMapping("/autoAllot") @GetMapping("/autoAllot")
@ResponseBody
public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) { public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
return outStockoutService.autoAllot(stockoutId); return outStockoutService.autoAllot(stockoutId);
} }

2
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
View File

@@ -170,6 +170,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
if (stringBuilder.length()>0){ if (stringBuilder.length()>0){
return AjaxResult.warn(stringBuilder.toString()); return AjaxResult.warn(stringBuilder.toString());
} }
return AjaxResult.success(); return AjaxResult.success("自动分配成功");
} }
} }

3
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -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="classId != null and classId != ''"> and mj.class_id = #{classId}</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</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="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> </where>
</select> </select>

2
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE"> <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_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=VARCHAR}, #{v_result,mode=OUT,jdbcType=VARCHAR},
#{v_resultString,mode=OUT,jdbcType=VARCHAR} #{v_resultString,mode=OUT,jdbcType=VARCHAR}

8
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -325,10 +325,14 @@ export default {
const stockoutIds = this.selectedRows.map(row => row.stockoutId) const stockoutIds = this.selectedRows.map(row => row.stockoutId)
console.log("自动分配：", stockoutIds) console.log("自动分配：", stockoutIds)
let data = { let data = {
stockoutId: stockoutIds stockoutId: stockoutIds[0]
} }
autoAllot(data).then(response => { 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() this.getList()
}) })
}, },