| src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -563,16 +563,13 @@ if (Objects.isNull(params) || params.isEmpty()) { throw new CoolException("参数不能为空!!"); } Set<String> collect = params.stream().map(PageRequestParams::getPro_id).collect(Collectors.toSet()); Set<String> komccodes = params.stream().map(PageRequestParams::getPro_komcode).collect(Collectors.toSet()); EntityWrapper<LocDetl> wrapper = new EntityWrapper<>(); wrapper.in(collect.isEmpty(), "pro_id", collect); wrapper.in(komccodes.isEmpty(), "komccode", komccodes); List<LocDetl> detls = locDetlService.selectList(wrapper); List<LocDetl> detls = new ArrayList<>(); params.forEach(param -> { List<LocDetl> selectList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("supp_code", param.getPro_id()).eq("matnr", param.getPro_komcode())); if (selectList != null && !selectList.isEmpty()) { detls.addAll(selectList); } }); if (detls == null || detls.isEmpty()) { return XSR.ok(); src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -458,6 +458,14 @@ if (Objects.isNull(material)) { throw new CoolException("物料不存在"); } TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>() .eq("matnr", detl.getMatnr()) .eq("supp_code", detl.getStandby1()) .eq("order_no", detl.getOrderNo())); if (Objects.isNull(detlLog)) { throw new CoolException("数据错误 ,请检查AGV任务档是否已完成!!"); } OrderItemsParam itemParam = new OrderItemsParam(); // 上报时,默认产品类型是null itemParam.setPro_type(material.getProType()); @@ -466,9 +474,10 @@ // 上报时,默认产品id是供应商编码 itemParam.setPro_id(detl.getSuppCode()); //todo 台车编码 itemParam.setTruck_no("TC310080014"); itemParam.setTruck_no(detlLog.getZpallet()); // 上报时,默认上报时间是更新时间 itemParam.setPick_qty(detl.getQty().intValue()); reportOrderParams.add(itemParam); }); pubOrderParams.setPartList(reportOrderParams);