修改接口实体类

修改仓位分配接口

修改接口实体类
修改仓位分配接口
mahuandong
1 parent 97e2adbb
Showing 5 changed files with 71 additions and 15 deletions
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
src/main/java/com/huaheng/api/wcs/domain/TaskDetails.java
src/main/java/com/huaheng/api/wcs/domain/TaskFinishDomain.java
src/main/java/com/huaheng/api/wcs/domain/WcsTask.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
@@ -21,7 +21,7 @@ import javax.annotation.Resource;
  */
  
 @RestController
-@RequestMapping("/WCS/v1")
+@RequestMapping("/WCS/v2")
 @Api(tags = {"WarecellAllocation"}, description = "wcs仓位分配接口")
 public class WarecellAllocation extends BaseController {
  
+package com.huaheng.api.wcs.domain;
+
+import lombok.Data;
+
+/**
+ * Created by Enzo Cotter on 2019/10/15.
+ */
+@Data
+public class TaskDetails {
+
+    //关联行号，string (50)，默认0 ",必填
+    private String referLineNo;
+
+    //物料编码，string (50)，默认0 ",必填
+    private String materialCode;
+
+    //物料名称
+    private String materialName;
+
+    //数量，float，默认“0” ,必填"
+    private Float qty;
+
+    //单位，string（20），默认“PCS” ,必填"
+    private String unit;
+}
+package com.huaheng.api.wcs.domain;
+
+import lombok.Data;
+
+/**
+ * 任务完成和重入实体类
+ * Created by Enzo Cotter on 2019/10/15.
+ */
+@Data
+public class TaskFinishDomain {
+
+    //任务号
+    private String taskNo;
+
+    //重入，int，1：重入  0：正常，必填
+    private Integer isDoubleIn;
+
+    //空出，int，1：重入  0：正常，必填
+    private Integer isEmptyOut;
+
+    //重入的库位编码，string (50)，默认0，必填
+    private String redirectionLocationCode;
+
+    //目的位置编码，string (50)，默认0 ",必填
+    private String toLocationCode;
+}
@@ -27,7 +27,13 @@ public class WcsTask implements Serializable {
     private String platform;
  
     //容器编码
-    private String palletNo;
+    private String containerCode;
+
+    //来源口”,一般用于指定入库口，string (50)，默认0，必填
+    private String fromPort;
+
+    //目的口”,出库性质的任务必须填写，string (50)，默认0，必填
+    private String toPort;
  
     //源位置库位编码
     private String fromLocationCode;
@@ -38,8 +44,8 @@ public class WcsTask implements Serializable {
     //重入后再次分配的位置编码
     private String locationCode;
  
-    //取消任务
-    private String reason;
+    //优先级，int，默认100 ，数字越小优先级越高",必填
+    private int priority;
  
     //长
     private String length;
@@ -53,4 +59,8 @@ public class WcsTask implements Serializable {
     //重
     private String weight;
  
+    //备注
+    private String remark;
+
+    private TaskDetails taskDetails;
 }
@@ -86,12 +86,6 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
         if(StringUtils.isEmpty(wcsTask.getTaskNo())){
             return AjaxResult.error("任务号为空");
         }
-        if(StringUtils.isEmpty(wcsTask.getPalletNo())){
-            return AjaxResult.error("托盘编号为空");
-        }
-        if(StringUtils.isEmpty(wcsTask.getStation())){
-            return AjaxResult.error("站台编码为空");
-        }
         if(StringUtils.isNull(wcsTask.getLength())){
             return AjaxResult.error("长为空");
         }
@@ -220,18 +214,19 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
             taskHeader.setToLocation(locationCode);
             if (!taskHeaderService.updateById(taskHeader)){throw new ServiceException("更新任务头表目标库位失败");}
             WcsTask wcsTaskResult = new WcsTask();
-            wcsTaskResult.setTaskNo(wcsTask.getTaskNo());
-            wcsTaskResult.setStation(wcsTask.getStation());
-            wcsTaskResult.setPalletNo(wcsTask.getPalletNo());
-            wcsTaskResult.setFromLocationCode("0");
             wcsTaskResult.setToLocationCode(locationCode);
             return AjaxResult.success(wcsTaskResult);
         }
  
-
         return AjaxResult.error("错误");
     }
  
+    /**
+     * 库位筛选
+     * @param locationList
+     * @param locationTypeList
+     * @return
+     */
     public String filter(List<Location> locationList, List<LocationType> locationTypeList){
         String locationCode = null;
         for (Location location: locationList){