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

手持机

Browse Source
This commit is contained in:
张怡蓉
2025-12-12 11:01:48 +08:00
parent e86a914422
commit 40d4c3e4b6
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
View File

@@ -18,4 +18,6 @@ public class RequestEnter {
private String floor; private String floor;
private String type; private String type;
private String flag;
} }

5
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -188,7 +188,8 @@ public class ToWmsServiceImpl implements IToWmsService {
mydoJob.setStatus("1"); mydoJob.setStatus("1");
mydoJob.setInOrOut(inOrOutType); mydoJob.setInOrOut(inOrOutType);
mydoJob.setExecutionPhase("1"); mydoJob.setExecutionPhase("1");
mydoJob.setTrayCode(basJobIdService.getJobId("TP")); mydoJob.setWorkshopId(requestEnter.getFlag());
mydoJob.setTrayCode(serial);
mydoJob.setWarehouseId("01"); mydoJob.setWarehouseId("01");
mydoJob.setRoadwayId(getRoadway(size)); mydoJob.setRoadwayId(getRoadway(size));
mydoJob.setLineId(erpBill); mydoJob.setLineId(erpBill);
@@ -263,6 +264,8 @@ public class ToWmsServiceImpl implements IToWmsService {
result.put("jobId", mydoJob.getJobId()); result.put("jobId", mydoJob.getJobId());
result.put("taskNo", mydoJob.getTaskNo()); result.put("taskNo", mydoJob.getTaskNo());
result.put("cargoSpaceId", mydoJob.getCargoSpaceId()); result.put("cargoSpaceId", mydoJob.getCargoSpaceId());
result.put("trayCode", mydoJob.getTrayCode());
result.put("flag",requestEnter.getFlag());
result.put("roadwayId", mydoJob.getRoadwayId()); result.put("roadwayId", mydoJob.getRoadwayId());
result.put("entranceId", mydoJob.getEntranceId()); result.put("entranceId", mydoJob.getEntranceId());
result.put("inOrOut", mydoJob.getInOrOut()); result.put("inOrOut", mydoJob.getInOrOut());

1
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -64,6 +64,7 @@ public class PdaServiceImp implements PdaService {
}else{ }else{
return AjaxResult.error("请选择出口"); return AjaxResult.error("请选择出口");
} }
requestEnter.setFlag("1");
AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter); AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter);
return ajaxResult; return ajaxResult;

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

@@ -233,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where in_or_out<20 and mj.entrance_id = #{entranceId} where in_or_out<20 and mj.entrance_id = #{entranceId}
and mj.status = #{status} and mj.status = #{status}
<if test="lineId != null and lineId != ''"> and mj.line_id = #{lineId}</if> <if test="lineId != null and lineId != ''"> and mj.line_id = #{lineId}</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
order by mj.create_time order by mj.create_time
</select> </select>
</mapper> </mapper>