wms / wms4_jiangxijisheng · Commits

Commit 6c9c3b0723bdb10c7f8db396b4e6f519b67a596d

Authored by 谭毅彬
1 parent 8d4ca62c

更新双升位移库任务BUG 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
  View file @6c9c3b0
... ... @@ -336,18 +336,18 @@ public class WcsServiceImpl implements WcsService {
336 336 if (destinationLocation == null) {
337 337 return Result.error("移库没有剩余库位");
338 338 }
339   - Result result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
340   - preTaskNo = (Integer)result.getResult();
  339 + Result<TaskHeader> result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
341 340 if (!result.isSuccess()) {
342 341 return Result.error("创建移库任务失败");
343 342 }
  343 + preTaskNo = result.getResult().getId();
344 344 // 移库任务
345 345 taskHeader.setPreTaskNo(preTaskNo);
346 346 boolean success = taskHeaderService.updateById(taskHeader);
347 347 if (!success) {
348 348 return Result.error("更新任务状态失败");
349 349 }
350   - return Result.error("先执行移库任务");
  350 +// return Result.error("先执行移库任务");
351 351 }
352 352 } else {
353 353 // 如果是有任务，从这个库位入托盘，那么不能生成新的出库任务。必须等这个任务完成以后，重新生成新的移库后，这个任务才能执行。
... ... @@ -369,6 +369,7 @@ public class WcsServiceImpl implements WcsService {
369 369 }
370 370 }
371 371  
  372 + // 下发移库任务
372 373 WcsTask wcsTask = new WcsTask();
373 374 wcsTask.setTaskNo(taskHeader.getId().toString());
374 375 wcsTask.setWarehouseCode(warehouseCode);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
  View file @6c9c3b0
... ... @@ -134,7 +134,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
134 134 * @param warehouseCode
135 135 * @return
136 136 */
137   - Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
  137 + Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
138 138  
139 139 /**
140 140 * 创建出库查看任务
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @6c9c3b0
... ... @@ -181,7 +181,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
181 181  
182 182 @Override
183 183 @Transactional(rollbackFor = Exception.class)
184   - public Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
  184 + public Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
185 185 log.info("开始创建移库任务,起始库位" + fromLocationCode + ",目标库位" + toLocationCode);
186 186 if (StringUtils.isEmpty(fromLocationCode)) {
187 187 return Result.error("创建移库任务时，起始库位为空");
... ... @@ -295,7 +295,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
295 295 if (!success) {
296 296 throw new JeecgBootException("创建移库任务时，容器" + fromLocation.getContainerCode() + "更新失败");
297 297 }
298   - return Result.OK("创建移库任务成功");
  298 + return Result.OK("创建移库任务成功", taskHeader);
299 299 }
300 300  
301 301 @Override
... ...