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-09-28 16:34:36 +08:00
parent 48353a2ab4
commit a1e3180f77
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java
View File

@@ -38,4 +38,6 @@ public interface IToWcsService {
* @return * @return
*/ */
AjaxResult cancelTaskByTaskNo(String taskNo); AjaxResult cancelTaskByTaskNo(String taskNo);
} }

6
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -44,8 +44,6 @@ public class ToWcsServiceImpl implements IToWcsService {
mydoJobParam.setStatus("1"); mydoJobParam.setStatus("1");
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add("21"); list.add("21");
list.add("23");
list.add("25");
mydoJobParam.setInOutIds(list); mydoJobParam.setInOutIds(list);
List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
for (MydoJob outMydoJob : outMydoJobs) { for (MydoJob outMydoJob : outMydoJobs) {
@@ -121,6 +119,8 @@ public class ToWcsServiceImpl implements IToWcsService {
if ("1".equals(requestLog.getIsSuccessful())){ if ("1".equals(requestLog.getIsSuccessful())){
return AjaxResult.success(); return AjaxResult.success();
} }
return AjaxResult.error(MessageUtils.message("error.message17")); return AjaxResult.error(requestLog.getErrorDetails());
} }
} }

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

@@ -344,7 +344,6 @@ public class MydoJobServiceImpl implements IMydoJobService {
} }
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure(); TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(job.getTrayCode()); trayCodeMakeSure.setTrayCode(job.getTrayCode());
iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
pdaService.outMakeSure(trayCodeMakeSure); pdaService.outMakeSure(trayCodeMakeSure);
} }
return AjaxResult.success(); return AjaxResult.success();
@@ -392,12 +391,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
updateMydoJob(job); updateMydoJob(job);
insertHistory(jobId); insertHistory(jobId);
//通知wcs //通知wcs
// AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
// if (ajaxResult.isSuccess()){ if (ajaxResult.isSuccess()){
// return AjaxResult.success(); return AjaxResult.success();
// }else { }else {
// throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
// } }
} }
} catch (Exception e) { } catch (Exception e) {

2
ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
View File

@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roadwayId != null"> <if test="roadwayId != null">
and roadway_id = #{roadwayId} and roadway_id = #{roadwayId}
</if> </if>
ORDER BY the_platoon, the_column, the_floor ORDER BY the_platoon, the_floor,the_column
</select> </select>
<select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult"> <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type, select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type,