zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -117,26 +117,30 @@ throw new CoolException("当前站点不存在！！"); } List<WaveSeed> waveSeed = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString())); WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>() .eq(WaveSeed::getExceStatus, 1) .eq(WaveSeed::getSiteNo, request.get("tagCode").toString())); if (Objects.isNull(waveSeed)) { throw new CoolException("播种墙地标未绑定！！"); } List<Long> taskIds = waveSeed.stream().map(WaveSeed::getTaskId).collect(Collectors.toList()); // 根据播种站点信息条码，查任务 List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds)); if (tasks.isEmpty()) { Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId())); if (Objects.isNull(task)) { throw new CoolException("当前站点任务不存在！！"); } List<String> taskNos = tasks.stream().map(Task::getTaskNo).collect(Collectors.toList()); Map<String, Object> param = new HashMap<>(); param.put("taskNo", taskNos); param.put("taskNo", task.getTaskNo()); param.put("siteNo", cacheSite.getSiteNo()); param.put("weedId", waveSeed.getId()); param.put("orderNo",cacheSite.getOrderNo()); waveSeed.setExceStatus(0); if (!waveSeedService.updateById(waveSeed)) { throw new CoolException("播种状态修改失败！！"); } return wcsApiService.slapLightLogic(param); }
@@ -114,6 +114,10 @@ if (Objects.isNull(reviewParam.getWaveSeedId())) { return R.error("播种明细标识不能为空！！"); } // if (Objects.isNull(reviewParam.getSiteNo())) { // return R.error("播种站点不能为空！！"); // } return waveManagentService.reviewSeeds(reviewParam); }
@@ -33,6 +33,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; import java.util.stream.DoubleStream; @Slf4j @Service @@ -348,25 +349,23 @@ @Override @Transactional(rollbackFor = Exception.class) public R slapLightLogic(Map<String, Object> request) { List<String> taskNos = (List<String>)request.get("taskNo"); String taskNo = request.get("taskNo").toString(); String orderNo = request.get("orderNo").toString(); String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString(); List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo)); if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) { throw new CoolException("请打印明细，并绑定目标集货区"); } //* 1. 判断当前容器是否还有物料未拣，未拣完闪灯，拣完通知容器流动，并灭灯 SlapLightControlParam slapParam = new SlapLightControlParam(); MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); taskNos.forEach(taskNo -> { //判断当前任务是否还有物料未拣 if (!checked(orderNo, taskNo)) { log.info("未完成闪灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam)); //调用三方接口,闪灯不做操作 // 设置请求参数 throw new CoolException("当前任务未完成，不能执行此操作！！"); // throw new CoolException("当前任务未完成，不能执行此操作！！"); // params.add("params", JSONObject.toJSONString(slapParam)); } else { //调用三方接口,灭灯通知容器流动， 传灭灯参数 @@ -381,6 +380,15 @@ // }).collect(Collectors.toList()); //判断数量是否与订单明细的需求量相同，相同则订单完成 List<WaveSeed> seeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderNo, orderNo)); if (Objects.isNull(seeds)) { throw new CoolException("数据错误：播种数据不存在！！"); } Double tolAnfme = seeds.stream().mapToDouble(WaveSeed::getAnfme).sum(); Double toDouble = seeds.stream().mapToDouble(WaveSeed::getWorkQty).sum(); if (toDouble.compareTo(tolAnfme) >= 0) { //播种完成，释放绑定站点 List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>() .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo) @@ -399,6 +407,7 @@ } } } } params.add("params", JSONObject.toJSONString(slapParam)); log.info("完成灭灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam)); } @@ -413,7 +422,6 @@ log.error("执行异常:UNK", e); throw new CoolException(e.getMessage()); } }); return R.ok(); }
@@ -110,6 +110,9 @@ @ApiModelProperty(value= "工作数量") private Double workQty; @ApiModelProperty("执行状态") private Integer exceStatus; /** * 商品编号 */ zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java
@@ -9,4 +9,6 @@ private Double reviewNum; private String siteNo; } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -60,7 +60,8 @@ throw new CoolException("播种数据不存在"); } List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, waveSeed.getOrderNo())); List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>() .eq(CacheSite::getOrderNo, waveSeed.getOrderNo())); if (sites.isEmpty()) { throw new CoolException("当前订单未绑定播种库位，请使用PDA->地标绑定,功能绑定后再操作！！"); } @@ -69,7 +70,9 @@ if (stock - param.getReviewNum() < 0) { throw new CoolException("播种数量已满"); } waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum()); //设置状态为执行中 waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum()) .setExceStatus(1); TaskDetl taskDetl = taskDetlMapper.getOne(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getId, waveSeed.getTaskDetlId())); if (Objects.isNull(taskDetl)) { @@ -110,17 +113,6 @@ .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val))) { throw new CoolException("原始订单主单拣货状态更新失败！！"); } try { Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId())); if (Objects.isNull(task)) { throw new CoolException("数据错误： 任务单据不存在！！"); } wcsApiService.containerConveryor(task.getBarcode()); } catch (Exception e) { log.error("执行异常:UNK", e); throw new CoolException(e.getMessage()); } } else { if (!orderMapper.update(new LambdaUpdateWrapper<Order>() .eq(Order::getOrderNo, orderDetl.getOrderNo())
