wms / wms_henanqingyuan · Commits

Commit dd62ef553b4d62168f761d76d8eea5ae62f37fd8

Authored by pengyongcheng
1 parent f2e75bf4

fix: 修复出库任务完成，容器表未清除库位的bug

Inline Side-by-side
Showing 2 changed files with 4 additions and 22 deletions
src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java
  View file @dd62ef5
... ... @@ -13,11 +13,13 @@ import com.huaheng.pc.config.location.service.LocationService;
13 13 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
14 14 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
15 15 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  16 +import lombok.extern.slf4j.Slf4j;
16 17 import org.springframework.stereotype.Service;
17 18  
18 19 import javax.annotation.Resource;
19 20  
20 21 @Service
  22 +@Slf4j
21 23 public class TaskFinishServiceImpl implements TaskFinishService {
22 24  
23 25 @Resource
... ... @@ -41,24 +43,6 @@ public class TaskFinishServiceImpl implements TaskFinishService {
41 43 return AjaxResult.error("任务号为空");
42 44 }
43 45 TaskHeader taskHeader = taskHeaderService.getById(taskFinishDomain.getTaskNo());
44   - //平库库位处理
45   - /* if(taskFinishDomain.getLocation()!=null){
46   - Location location = locationService.getLocationByCode(taskFinishDomain.getLocation(), QuantityConstant.DEFAULT_WAREHOUSE);
47   - if(location!=null){
48   - taskHeader.setToLocation(location.getCode());
49   - taskHeader.setZoneCode(location.getZoneCode());
50   - taskHeaderService.updateById(taskHeader);
51   - List<TaskDetail> list = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
52   - if(list.size()>0){
53   - for (TaskDetail taskDetail : list) {
54   - taskDetail.setToLocation(location.getCode());
55   - taskDetailService.updateById(taskDetail);
56   - }
57   - }
58   - }else{
59   - return AjaxResult.error(taskFinishDomain.getLocation()+"：库位号不存在");
60   - }
61   - }*/
62 46 String warehouseCode = taskHeader.getWarehouseCode();
63 47 //1、空出处理
64 48 if (taskFinishDomain.getIsEmptyOut() == 1) {
... ... @@ -88,14 +72,12 @@ public class TaskFinishServiceImpl implements TaskFinishService {
88 72 if (StringUtils.isNotEmpty(taskFinishDomain.getWeight())) {
89 73 weight = Convert.toStrArray(taskFinishDomain.getWeight());
90 74 }
91   -
92 75 //任务完成
93 76 try {
94 77 ajaxResult = taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskFinishDomain.getTaskNo()), weight);
95 78 } catch (Exception e) {
96   - e.printStackTrace();
  79 + log.error(e.getMessage());
97 80 }
98   -
99 81 return ajaxResult;
100 82 }
101 83 }
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
  View file @dd62ef5
... ... @@ -197,7 +197,7 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
197 197 LambdaUpdateWrapper<Container> containerUpdateWrapper = Wrappers.lambdaUpdate();
198 198 containerUpdateWrapper.eq(Container::getCode, containerCode)
199 199 .eq(Container::getWarehouseCode, warehouseCode)
200   - .set(StringUtils.isNotEmpty(locationCode), Container::getLocationCode, locationCode)
  200 + .set(Container::getLocationCode, locationCode)
201 201 .set(StringUtils.isNotEmpty(status), Container::getStatus, status);
202 202 boolean success = containerService.update(containerUpdateWrapper);
203 203 if (!success) {
... ...