zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.2优化

Browse Source
This commit is contained in:
ysj09
2026-02-02 09:34:51 +08:00
parent dfbe04cedb
commit 6d2d0f3068
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -499,11 +499,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
String msg = ""; String msg = "";
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (String stockId : stockIds) { for (String stockId : stockIds) {
map.put("v_stock_id", stockId); BasStock basStock = basStockService.selectBasStockByStockId(stockId);
map.put("v_tray_code", basStock.getTrayCode());
map.put("v_exit_id", exitId); map.put("v_exit_id", exitId);
mydoJobMapper.pointOut(map); mydoJobMapper.pointOut(map);
msg = map.get("v_resultmsg").toString(); msg = map.get("v_resultmsg").toString();
builder.append("库存编号：" + stockId + "，分配结果：" + msg + "<br/>"); builder.append("托盘：" + basStock.getTrayCode() + "，分配结果：" + msg + "<br/>");
} }
iToWcsService.pushOutMydoJob(); iToWcsService.pushOutMydoJob();
if (!StrUtil.isEmpty(builder)) { if (!StrUtil.isEmpty(builder)) {

4
ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
View File

@@ -145,10 +145,10 @@ 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'.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 =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(28)</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 =='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 =='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="inOut != null and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
<if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if> <if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if>
order by mj.create_time desc order by mj.create_time desc
</where> </where>

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

@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
left join mydo_job_detail mjd on mj.job_id = mjd.job_id left join mydo_job_detail mjd on mj.job_id = mjd.job_id
<where> <where>
<if test="jobId != null and jobId != ''"> and mj.job_id = #{jobId}</if> <if test="jobId != null and jobId != ''"> and mj.job_id = #{jobId}</if>
<if test="status != null and status != ''"> and mj.status = #{status}</if> <if test="status != null and status != ''"> and mj.status = #{status}</if>
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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 =='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 =='1'.toString "> and mj.in_or_out &lt; 20 </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 =='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="inOut != null and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
<if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if> <if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if>
</where> </where>
order by mj.create_time desc order by mj.create_time desc
@@ -223,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE"> <select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_point_out( {call proc_point_out(
#{v_stock_id,jdbcType=VARCHAR,mode=IN}, #{v_tray_code,jdbcType=VARCHAR,mode=IN},
#{v_exit_id,jdbcType=VARCHAR,mode=IN}, #{v_exit_id,jdbcType=VARCHAR,mode=IN},
#{v_result,mode=OUT,jdbcType=INTEGER}, #{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR} #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}

2
ruoyi-ui/src/utils/request.js
View File

@@ -17,7 +17,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分 // axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API, baseURL: process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 10000 timeout: 30000
}) })
// request拦截器 // request拦截器