wms / wms_mijiangshiye · Commits

Commit 07a2b364d7fdf3f11a10fb3dc4ade099b73c874e

Authored by pengcheng
1 parent 4947e8e7

wcs接口修改，取货错接口添加

Inline Side-by-side
Showing 7 changed files with 97 additions and 25 deletions
src/main/java/com/huaheng/api/wcs/domain/TaskFinishDomain.java
  View file @07a2b36
... ... @@ -18,9 +18,10 @@ public class TaskFinishDomain {
18 18 //空出，int，1：空出 0：正常，必填
19 19 private Integer isEmptyOut;
20 20  
  21 + //取货错，int,1:取货错 0：正常 必填
  22 + private Integer isForkError;
  23 +
21 24 //重入的库位编码，string (50)，默认0，必填
22 25 private String redirectionLocationCode;
23 26  
24   - //目的位置编码，string (50)，默认0 ",必填
25   - private String toLocationCode;
26 27 }
... ...
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
  View file @07a2b36
... ... @@ -63,9 +63,6 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
63 63 if(StringUtils.isEmpty(taskFinishDomain.getTaskNo())){
64 64 return AjaxResult.error("任务号为空");
65 65 }
66   - if(StringUtils.isEmpty(taskFinishDomain.getToLocationCode())){
67   - return AjaxResult.error("目的库位为空");
68   - }
69 66 if(StringUtils.isEmpty(taskFinishDomain.getRedirectionLocationCode())){
70 67 return AjaxResult.error("重入的库位编码为空");
71 68 }
... ...
src/main/java/com/huaheng/api/wcs/service/pickupErrorHandle/PickupErrorHandleService.java 0 → 100644
  View file @07a2b36
  1 +package com.huaheng.api.wcs.service.pickupErrorHandle;
  2 +
  3 +import com.huaheng.framework.web.domain.AjaxResult;
  4 +
  5 +public interface PickupErrorHandleService {
  6 +
  7 + //取货错处理
  8 + AjaxResult PickupErrorHandle(String taskNo);
  9 +}
... ...
src/main/java/com/huaheng/api/wcs/service/pickupErrorHandle/PickupErrorHandleServiceImpl.java 0 → 100644
  View file @07a2b36
  1 +package com.huaheng.api.wcs.service.pickupErrorHandle;
  2 +
  3 +import com.huaheng.common.utils.StringUtils;
  4 +import com.huaheng.framework.web.domain.AjaxResult;
  5 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  6 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +@Service
  12 +public class PickupErrorHandleServiceImpl implements PickupErrorHandleService {
  13 +
  14 +
  15 + @Autowired
  16 + private TaskHeaderService taskHeaderService;
  17 +
  18 +
  19 + /**
  20 + * 取货错处理
  21 + * 1、判断非空字段
  22 + * 2、根据任务号查找任务
  23 + * 3、修改该任务为取货错，过后处理
  24 + * @param taskNo
  25 + * @return
  26 + */
  27 + @Override
  28 + @Transactional
  29 + public AjaxResult PickupErrorHandle(String taskNo) {
  30 + //1、判断非空字段
  31 + if(StringUtils.isEmpty(taskNo)){
  32 + return AjaxResult.error("任务号为空");
  33 + }
  34 +
  35 + //2、根据任务号查找任务
  36 + TaskHeader taskHeader = taskHeaderService.getById(Integer.valueOf(taskNo));
  37 + if(taskHeader == null){
  38 + return AjaxResult.error("任务号错误，没有找到该任务");
  39 + }
  40 + if(taskHeader.getStatus() == 100){
  41 + return AjaxResult.error("任务已完成");
  42 + }
  43 +
  44 + //3、修改该任务为取货错，过后处理
  45 + taskHeader.setExceptionCode("取货错误");
  46 + Boolean flag = taskHeaderService.updateById(taskHeader);
  47 + if(flag == false){
  48 + return AjaxResult.error("修改任务失败，取货错处理失败");
  49 + }
  50 + return AjaxResult.success("取货错处理成功");
  51 + }
  52 +}
... ...
src/main/java/com/huaheng/api/wcs/service/stationInfo/StationInfoServiceImpl.java
  View file @07a2b36
... ... @@ -11,6 +11,11 @@ import com.huaheng.pc.config.address.service.AddressService;
11 11 import org.springframework.beans.factory.annotation.Autowired;
12 12 import org.springframework.stereotype.Service;
13 13  
  14 +import java.util.ArrayList;
  15 +import java.util.HashMap;
  16 +import java.util.List;
  17 +import java.util.Map;
  18 +
14 19 @Service
15 20 public class StationInfoServiceImpl implements StationInfoService {
16 21  
... ... @@ -34,13 +39,15 @@ public class StationInfoServiceImpl implements StationInfoService {
34 39 }
35 40  
36 41 //2、实体转换
37   - WcsTask wcsTask =new WcsTask();
38   - wcsTask.setStation(station);
  42 + Map<String , List> map =new HashMap<>();
  43 + List list = new ArrayList();
  44 + list.add(station);
  45 + map.put("port",list);
39 46  
40 47 //3、发送数据
41 48 String param="wcs";
42 49 String url=addressService.selectAddress(param)+"StationInfo";
43   - String JsonParam = JSON.toJSONString(wcsTask);
  50 + String JsonParam = JSON.toJSONString(map);
44 51 String result = HttpUtils.bodypost(url, JsonParam);
45 52 if(StringUtils.isEmpty(result)){
46 53 throw new ServiceException("接口地址错误");
... ...
src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java
  View file @07a2b36
... ... @@ -34,13 +34,13 @@ public class TaskCancelServiceImpl implements TaskCancelService {
34 34  
35 35  
36 36 //2、转换实体
37   - WcsTask wcsTask = new WcsTask();
38   - wcsTask.setTaskNo(id.toString());
  37 +// WcsTask wcsTask = new WcsTask();
  38 +// wcsTask.setTaskNo(id.toString());
39 39  
40 40 //3、发送数据
41 41 String param="wcs";
42 42 String url=addressService.selectAddress(param)+"TaskCancel";
43   - String JsonParam = JSON.toJSONString(wcsTask);
  43 + String JsonParam = JSON.toJSONString(id.toString());
44 44 String result = HttpUtils.bodypost(url, JsonParam);
45 45 if(StringUtils.isEmpty(result)){
46 46 throw new ServiceException("接口地址错误");
... ...
src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java
  View file @07a2b36
... ... @@ -3,6 +3,8 @@ package com.huaheng.api.wcs.service.taskFinish;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.huaheng.api.wcs.domain.TaskFinishDomain;
  6 +import com.huaheng.api.wcs.service.emptyOutHandle.EmptyOutHandleService;
  7 +import com.huaheng.api.wcs.service.overrideHandle.OverrideHandleService;
6 8 import com.huaheng.common.support.Convert;
7 9 import com.huaheng.common.utils.StringUtils;
8 10 import com.huaheng.framework.web.domain.AjaxResult;
... ... @@ -16,6 +18,10 @@ public class TaskFinishServiceImpl implements TaskFinishService {
16 18  
17 19 @Autowired
18 20 private TaskHeaderService taskHeaderService;
  21 + @Autowired
  22 + private EmptyOutHandleService emptyOutHandleService;
  23 + @Autowired
  24 + private OverrideHandleService overrideHandleService;
19 25  
20 26 //任务完成
21 27 @Override
... ... @@ -25,22 +31,22 @@ public class TaskFinishServiceImpl implements TaskFinishService {
25 31 return AjaxResult.error("任务号为空");
26 32 }
27 33  
  34 + //1、空出处理
28 35 if(taskFinishDomain.getIsEmptyOut() == 1){
29   - LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery();
30   - lam.eq(TaskHeader::getId,Integer.valueOf(taskFinishDomain.getTaskNo()));
31   - TaskHeader taskHeader = taskHeaderService.getOne(lam);
32   - if(taskHeader == null){
33   - return AjaxResult.error("wms系统没有此任务号");
34   - }
35   - if(StringUtils.isEmpty(taskHeader.getExceptionCode())) {
36   - taskHeader.setExceptionCode("空托出库");
37   - Boolean flag = taskHeaderService.updateById(taskHeader);
38   - if (flag == false) {
39   - return AjaxResult.error("修改任务失败，空出处理失败");
40   - }
41   - }
42   - return AjaxResult.success("成功");
  36 + ajaxResult = emptyOutHandleService.EmptyOutHandle(taskFinishDomain.getTaskNo());
  37 + }
  38 +
  39 + //2、重入处理
  40 + if(taskFinishDomain.getIsDoubleIn() == 1){
  41 + ajaxResult = overrideHandleService.OverrideHandle(taskFinishDomain);
43 42 }
  43 +
  44 + //3、取货错
  45 + if(taskFinishDomain.getIsForkError() == 1){
  46 +
  47 + }
  48 +
  49 + //任务完成
44 50 try{
45 51 ajaxResult=taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskFinishDomain.getTaskNo()));
46 52 } catch (Exception e) {
... ...