Commit a1076d992b0bec044ccfcfab5a18736062b5aa3b
1 parent
421b84a8
更新前置任务号
Showing
4 changed files
with
21 additions
and
2 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsService.java
| @@ -55,4 +55,5 @@ public interface WcsService { | @@ -55,4 +55,5 @@ public interface WcsService { | ||
| 55 | * 选取空托盘组出库 | 55 | * 选取空托盘组出库 |
| 56 | */ | 56 | */ |
| 57 | Result manyEmptyOut(String zoneCode, String port, String warehouseCode); | 57 | Result manyEmptyOut(String zoneCode, String port, String warehouseCode); |
| 58 | + | ||
| 58 | } | 59 | } |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
| @@ -339,7 +339,7 @@ public class WcsServiceImpl implements WcsService { | @@ -339,7 +339,7 @@ public class WcsServiceImpl implements WcsService { | ||
| 339 | } | 339 | } |
| 340 | preTaskNo = result.getResult().getId(); | 340 | preTaskNo = result.getResult().getId(); |
| 341 | taskHeader.setPreTaskNo(preTaskNo); | 341 | taskHeader.setPreTaskNo(preTaskNo); |
| 342 | - boolean success = taskHeaderService.updateById(taskHeader); | 342 | + boolean success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId()); |
| 343 | if (!success) { | 343 | if (!success) { |
| 344 | throw new JeecgBootException("更新任务状态失败"); | 344 | throw new JeecgBootException("更新任务状态失败"); |
| 345 | } | 345 | } |
| @@ -358,7 +358,7 @@ public class WcsServiceImpl implements WcsService { | @@ -358,7 +358,7 @@ public class WcsServiceImpl implements WcsService { | ||
| 358 | } | 358 | } |
| 359 | } | 359 | } |
| 360 | taskHeader.setPreTaskNo(preTaskNo); | 360 | taskHeader.setPreTaskNo(preTaskNo); |
| 361 | - boolean success = taskHeaderService.updateById(taskHeader); | 361 | + boolean success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId()); |
| 362 | if (!success) { | 362 | if (!success) { |
| 363 | throw new JeecgBootException("更新任务状态失败"); | 363 | throw new JeecgBootException("更新任务状态失败"); |
| 364 | } | 364 | } |
| @@ -420,6 +420,7 @@ public class WcsServiceImpl implements WcsService { | @@ -420,6 +420,7 @@ public class WcsServiceImpl implements WcsService { | ||
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | @Override | 422 | @Override |
| 423 | + @Transactional(rollbackFor = Exception.class) | ||
| 423 | public Result cancelWcsTask(TaskHeader taskHeader) { | 424 | public Result cancelWcsTask(TaskHeader taskHeader) { |
| 424 | WcsTask wcsTask = new WcsTask(); | 425 | WcsTask wcsTask = new WcsTask(); |
| 425 | wcsTask.setTaskNo(String.valueOf(taskHeader.getId())); | 426 | wcsTask.setTaskNo(String.valueOf(taskHeader.getId())); |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
| @@ -305,6 +305,14 @@ public interface ITaskHeaderService extends IService<TaskHeader> { | @@ -305,6 +305,14 @@ public interface ITaskHeaderService extends IService<TaskHeader> { | ||
| 305 | boolean updateStatusById(int status, int id); | 305 | boolean updateStatusById(int status, int id); |
| 306 | 306 | ||
| 307 | /** | 307 | /** |
| 308 | + * 更新状态 | ||
| 309 | + * @param preTaskNo | ||
| 310 | + * @param id | ||
| 311 | + * @return | ||
| 312 | + */ | ||
| 313 | + boolean updatePreTaskNoById(int preTaskNo, int id); | ||
| 314 | + | ||
| 315 | + /** | ||
| 308 | * 合并库存 | 316 | * 合并库存 |
| 309 | * @param taskHeader | 317 | * @param taskHeader |
| 310 | * @return | 318 | * @return |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
| @@ -2318,6 +2318,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2318,6 +2318,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2318 | return success; | 2318 | return success; |
| 2319 | } | 2319 | } |
| 2320 | 2320 | ||
| 2321 | + @Override | ||
| 2322 | + public boolean updatePreTaskNoById(int preTaskNo, int id) { | ||
| 2323 | + TaskHeader taskHeader = new TaskHeader(); | ||
| 2324 | + taskHeader.setId(id); | ||
| 2325 | + taskHeader.setPreTaskNo(preTaskNo); | ||
| 2326 | + boolean success = taskHeaderService.updateById(taskHeader); | ||
| 2327 | + return success; | ||
| 2328 | + } | ||
| 2329 | + | ||
| 2321 | /** | 2330 | /** |
| 2322 | * 取消任务，恢复容器和库位状态 | 2331 | * 取消任务，恢复容器和库位状态 |
| 2323 | * @param taskHeader | 2332 | * @param taskHeader |