| pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/ToWmsDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/CarryParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -200,7 +200,7 @@ </dependencies> <build> <finalName>ryzhwcs</finalName> <finalName>wxwcs</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,6 +8,7 @@ import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CarryParam; import com.zy.asrs.entity.param.TaskOverParam; import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam; import com.zy.asrs.entity.param.TaskCreateParam; @@ -234,23 +235,20 @@ @PostMapping("/outboundTaskSend") @Transactional public R outboundTaskSend(@RequestHeader String appkey, @RequestBody List<WMSAndAGVInterfaceParam> params, @RequestBody List<CarryParam> params, HttpServletRequest request) { auth(appkey, params, request); //auth(appkey, params, request); List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>(); for (WMSAndAGVInterfaceParam param:params){ for (CarryParam param:params){ if (Cools.isEmpty(param)){ return R.error("参数为空！"); } else if (Cools.isEmpty(param.getTaskNo())){ return R.error("任务号为空！"); } else if (Cools.isEmpty(param.getTaskType())){ } else if (Cools.isEmpty(param.getIoType())){ return R.error("任务类型为空！"); } if (Cools.isEmpty(param.getTaskPriority())){ param.setTaskPriority(1); } if (Cools.isEmpty(param.getSourceLocationCode()) || Cools.isEmpty(param.getTargetLocationCode())){ if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){ return R.error("初始目标或者目标位为空"); } // if (Cools.isEmpty(param.getContainerCode())){ @@ -265,50 +263,27 @@ // } // } LocMast locMast = locMastService.selectByLocNo(param.getSourceLocationCode()); LocMast locMast = locMastService.selectByLocNo(param.getStartPoint()); if(Cools.isEmpty(locMast)){ return R.error("初始库位无法找到"); } Integer ioType = TaskCreateParam.convertParamIoType(param.getTaskType()); if(ioType == 2){ R r = null; if(param.getIoType() == 2){ //出库任务创建 StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("type_no",2) .eq("crn_no",locMast.getCrnNo()) .eq("stn_no",param.getTargetLocationCode())); .eq("stn_no",param.getTargetPoint())); if(Cools.isEmpty(staDesc)){ return R.error("出库路劲不存在"); } param.setTargetLocationCode(staDesc.getStnNo().toString()); R r = openService.taskCreate(new TaskCreateParam(param)); }else if (ioType == 3){ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo())); }else if (param.getIoType() == 3){ //移库任务创建 r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo())); } // if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){ // staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() // .eq("crn_no",param.getTaskTunnel()) // .eq("type_no",2) // .lt("stn_no",200)); // }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){ // staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() // .eq("crn_no",param.getTaskTunnel()) // .eq("type_no",2) // .lt("stn_no",400) // .gt("stn_no",200)); // }else { // staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() // .eq("crn_no",param.getTaskTunnel()) // .eq("type_no",2) // .lt("stn_no",500) // .ge("stn_no",400)); // } //param.setTargetLocationCode(staDesc.getStnNo().toString()); R r = openService.taskCreate(new TaskCreateParam(param)); apiLogService.save("Wms任务下发接口" ,request.getRemoteAddr()+request.getRequestURI() src/main/java/com/zy/asrs/entity/ToWmsDTO.java
@@ -22,11 +22,12 @@ //入库站编号 private Integer stationCode; //库位类型 private String locType; private Integer locType; public ToWmsDTO(String barcode, Integer stationCode){ public ToWmsDTO(String barcode, Integer stationCode, Integer locType){ this.barcode = barcode; this.stationCode = stationCode; this.locType = locType; } public ToWmsDTO(){ src/main/java/com/zy/asrs/entity/param/CarryParam.java
New file @@ -0,0 +1,25 @@ package com.zy.asrs.entity.param; import lombok.Data; @Data public class CarryParam { //工作号 private String taskNo; //入出库类型 private Integer ioType; //容器编码 private String barcode; //起点 private String startPoint; //目标点 private String targetPoint; //备注 private String meno; } src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -1,5 +1,6 @@ package com.zy.asrs.entity.param; import io.swagger.models.auth.In; import lombok.Data; @Data @@ -44,6 +45,17 @@ this.crn = param.getTaskTunnel(); }; public TaskCreateParam(CarryParam param, Integer crn){ this.taskNo = param.getTaskNo(); this.ioType = param.getIoType(); this.barcode = param.getBarcode(); this.taskPriority = 300; this.startPoint = param.getStartPoint(); this.targetPoint = param.getTargetPoint(); this.emptyContainer = "N"; this.crn = crn; }; public static Integer convertParamIoType(String paramIoType){ switch (paramIoType){ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -111,8 +111,6 @@ Short workNo = staProtocol.getWorkNo(); Short stano = staProtocol.getStaNo(); // 尺寸检测异常 boolean back = false; String errMsg = ""; @@ -180,7 +178,7 @@ String barcode = barcodeThread.getBarcode(); if(!Cools.isEmpty(barcode)) { // 请求wms接口，获取工作号和目标库位 ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId()); ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1); String response; response = new HttpHandler.Builder() .setHeaders(null) @@ -592,25 +590,6 @@ String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint()); TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo); if (!Cools.isEmpty(hallowLocNoTask)){ // if (!Cools.isEmpty(hallowLocNoTask.getTargetPoint())){ // continue; // } //// new PostMesDataUtils().postMesData("移库任务分配库位",wmsUrl,movePath,hallowLocNoTask); // try { // String response = new HttpHandler.Builder() // .setUri(wmsUrl) // .setPath(movePath) // .setJson(JSON.toJSONString(hallowLocNoTask)) // .build() // .doPost(); // System.out.println("response:"+response); // JSONObject jsonObject = JSON.parseObject(response); // if (jsonObject.getInteger("code").equals(200)) { // //解析 // } // }catch (Exception e){ // log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/"+movePath, JSON.toJSONString(hallowLocNoTask), "请求移库任务分配库位"); // } continue; } }
