| src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/MobileService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/OpenService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/model/DetlDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -124,7 +124,7 @@ @RequestMapping("/pack/comb/auth") @ManagerAuth(memo = "下线组托") public R packComb(@RequestBody CombParam combParam){ mobileService.packComb(combParam, getUserId()); // mobileService.packComb(combParam, getUserId()); return R.ok("组托成功"); }
@@ -46,23 +46,6 @@ return R.ok(); } /****************************************************************************/ /********************************* 打包上线 **********************************/ /****************************************************************************/ // @PostMapping("/order/pakin/new/package/v1") // @AppAuth(memo = "打包上线接口") // public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey, // @RequestBody(required = false) PackParam param, // HttpServletRequest request) { // auth(appkey, param, request); // if (Cools.isEmpty(param)) { // return R.parse(BaseRes.PARAM); // } // openService.packageUp(param); // return R.ok(); // } /** * 添加入库单 */ @@ -87,16 +70,6 @@ return R.ok(); } /** * 入库单回写 */ @PostMapping("/order/pakin/complete/default/v1") public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) OpenOrderCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); return R.ok().add(openService.pakinOrderComplete(param)); } /** * 添加出库单 @@ -109,12 +82,6 @@ auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } if (Cools.isEmpty(param.getLgort())) { return R.error("单据编号[lgort]不能为空"); } if (!param.getLgort().equals("5006")) { return R.ok(); } if (Cools.isEmpty(param.getOrderNo())) { return R.error("单据编号[orderNo]不能为空"); @@ -129,16 +96,6 @@ return R.ok(); } /** * 出库单回写 */ @PostMapping("/order/pakout/complete/default/v1") public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) OpenOrderCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); return R.ok().add(openService.pakoutOrderComplete(param)); } /** src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -23,7 +23,6 @@ private List<DetlDto> orderDetails; private String lgort; public static void main(String[] args) { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); src/main/java/com/zy/asrs/service/MobileService.java
@@ -32,7 +32,7 @@ */ void adjust(MobileAdjustParam param, Long userId); void packComb(CombParam param, Long userId); // void packComb(CombParam param, Long userId); void pakoutByOrder(JSONObject param, Long userId);
@@ -16,7 +16,7 @@ /** * 入库单回写 */ List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param); // List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param); /** * 添加入库单 @@ -26,7 +26,7 @@ /** * 入库单回写 */ List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param); // List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param); /** * 库存统计 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -332,162 +332,162 @@ } @Override @Transactional public void packComb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } Date now = new Date(); boolean packDown = Parameter.get().getPackDown().equals("true"); // 无单组托 if (Cools.isEmpty(param.getOrderNo())) { // 生成入库通知档 List<DetlDto> detlDtos = new ArrayList<>(); param.getCombMats().forEach(elem -> { // 打包上线数据校验 if (packDown) { Pack pack = packService.selectByBarcode(elem.getMatnr()); if (pack == null) { throw new CoolException(elem.getMatnr() + "条码冗余，请检查！"); } if (pack.getSettle() != 1) { throw new CoolException(elem.getMatnr() + "条码已下线，请检查！"); } } Mat analyse = MatUtils.analyseMat(elem.getMatnr()); // 条码、物料代码、序列号、数量 DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme()); // DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; one.setAnfme(one.getAnfme() + detlDto.getAnfme()); } else { detlDtos.add(detlDto); } }); if (packDown) { MesCombParam mesCombParam = new MesCombParam(); mesCombParam.setZpallet(param.getBarcode()); mesCombParam.setPakinTime(DateUtils.convert(now)); mesCombParam.setLgort("5008"); mesCombParam.setPlantCode("5000"); mesCombParam.setFromCode("5012-20"); mesCombParam.setStationCode("JJQ-PFZPDB-XX"); for (DetlDto detlDto : detlDtos) { mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme())); } String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(MesConstant.URL) .setPath(MesConstant.PACK_DOWN_URL) .setJson(JSON.toJSONString(mesCombParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { success = true; } else if (jsonObject.getInteger("code").equals(500)) { log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); throw new CoolException(jsonObject.getString("msg")); } else { log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); throw new CoolException("上报mes系统失败"); } } catch (Exception e) { log.error("fail", e); throw new CoolException(e.getMessage()); } finally { try { // 保存接口日志 apiLogService.save( "打包下线帮托上报", MesConstant.URL + MesConstant.PACK_DOWN_URL, null, "127.0.0.1", JSON.toJSONString(mesCombParam), response, success ); } catch (Exception e) { log.error("", e); } } } // 生成入库单据 String orderNo = "PACK" + snowflakeIdWorker.nextId(); OpenOrderPakinParam openParam = new OpenOrderPakinParam(); openParam.setOrderNo(orderNo); openParam.setOrderTime(DateUtils.convert(now)); openParam.setOrderType("打包入库单"); openParam.setOrderDetails(detlDtos); openService.pakinOrderCreate(openParam); Order order = orderService.selectByNo(orderNo); if (null == order) { throw new CoolException("生成单据失败"); } if (!orderService.updateSettle(order.getId(), 2L, userId)) { throw new CoolException("修改单据状态失败"); } // 生成入库通知档 for (DetlDto detlDto : detlDtos) { // 修改作业数量 ---------------------------------------- // 订单明细数量校验 OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch()); if (detlDto.getAnfme() > orderDetl.getEnableQty()) { throw new CoolException(orderDetl.getMatnr() + "入库数量不合法"); } // 修改订单作业数量 if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { throw new CoolException("修改单据作业数量失败"); } // 保存入库通知档 Mat mat = matService.selectByMatnr(detlDto.getMatnr()); if (Cools.isEmpty(mat)) { throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); waitPakin.setOrderNo(orderNo); waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(detlDto.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } // 修改打包数据状态 Pack pack = packService.selectByBarcode(detlDto.getOrderNo()); pack.setSettle(2L); pack.setUpdateTime(now); pack.setUpdateBy(userId); if (!packService.updateById(pack)) { throw new CoolException("修改打包数据异常"); } } } } // @Override // @Transactional // public void packComb(CombParam param, Long userId) { // if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { // throw new CoolException(BaseRes.PARAM); // } // // 判断是否有相同条码的数据 // if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). // eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { // throw new CoolException(param.getBarcode() + "数据正在进行入库"); // } // Date now = new Date(); // // boolean packDown = Parameter.get().getPackDown().equals("true"); // // // 无单组托 // if (Cools.isEmpty(param.getOrderNo())) { // // // 生成入库通知档 // List<DetlDto> detlDtos = new ArrayList<>(); // param.getCombMats().forEach(elem -> { // // 打包上线数据校验 // if (packDown) { // Pack pack = packService.selectByBarcode(elem.getMatnr()); // if (pack == null) { // throw new CoolException(elem.getMatnr() + "条码冗余，请检查！"); // } // if (pack.getSettle() != 1) { // throw new CoolException(elem.getMatnr() + "条码已下线，请检查！"); // } // } // Mat analyse = MatUtils.analyseMat(elem.getMatnr()); // // 条码、物料代码、序列号、数量 // DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme()); //// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); // if (DetlDto.has(detlDtos, detlDto)) { // DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); // assert one != null; // one.setAnfme(one.getAnfme() + detlDto.getAnfme()); // } else { // detlDtos.add(detlDto); // } // }); // // if (packDown) { // MesCombParam mesCombParam = new MesCombParam(); // mesCombParam.setZpallet(param.getBarcode()); // mesCombParam.setPakinTime(DateUtils.convert(now)); // mesCombParam.setLgort("5008"); // mesCombParam.setPlantCode("5000"); // mesCombParam.setFromCode("5012-20"); // mesCombParam.setStationCode("JJQ-PFZPDB-XX"); // for (DetlDto detlDto : detlDtos) { // mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme())); // } // String response = ""; // boolean success = false; // try { // response = new HttpHandler.Builder() // .setUri(MesConstant.URL) // .setPath(MesConstant.PACK_DOWN_URL) // .setJson(JSON.toJSONString(mesCombParam)) // .build() // .doPost(); // JSONObject jsonObject = JSON.parseObject(response); // if (jsonObject.getInteger("code").equals(200)) { // success = true; // } else if (jsonObject.getInteger("code").equals(500)) { // log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); // throw new CoolException(jsonObject.getString("msg")); // } else { // log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); // throw new CoolException("上报mes系统失败"); // } // } catch (Exception e) { // log.error("fail", e); // throw new CoolException(e.getMessage()); // } finally { // try { // // 保存接口日志 // apiLogService.save( // "打包下线帮托上报", // MesConstant.URL + MesConstant.PACK_DOWN_URL, // null, // "127.0.0.1", // JSON.toJSONString(mesCombParam), // response, // success // ); // } catch (Exception e) { log.error("", e); } // } // // } // // // 生成入库单据 // String orderNo = "PACK" + snowflakeIdWorker.nextId(); // OpenOrderPakinParam openParam = new OpenOrderPakinParam(); // openParam.setOrderNo(orderNo); // openParam.setOrderTime(DateUtils.convert(now)); // openParam.setOrderType("打包入库单"); // openParam.setOrderDetails(detlDtos); // openService.pakinOrderCreate(openParam); // Order order = orderService.selectByNo(orderNo); // if (null == order) { // throw new CoolException("生成单据失败"); // } // if (!orderService.updateSettle(order.getId(), 2L, userId)) { // throw new CoolException("修改单据状态失败"); // } // // // 生成入库通知档 // for (DetlDto detlDto : detlDtos) { // // // 修改作业数量 ---------------------------------------- // // 订单明细数量校验 // OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch()); // if (detlDto.getAnfme() > orderDetl.getEnableQty()) { // throw new CoolException(orderDetl.getMatnr() + "入库数量不合法"); // } // // 修改订单作业数量 // if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { // throw new CoolException("修改单据作业数量失败"); // } // // // 保存入库通知档 // Mat mat = matService.selectByMatnr(detlDto.getMatnr()); // if (Cools.isEmpty(mat)) { // throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); // } // WaitPakin waitPakin = new WaitPakin(); // waitPakin.sync(mat); // waitPakin.setOrderNo(orderNo); // waitPakin.setBatch(detlDto.getBatch()); // waitPakin.setZpallet(param.getBarcode()); // 托盘码 // waitPakin.setIoStatus("N"); // 入出状态 // waitPakin.setAnfme(detlDto.getAnfme()); // 数量 // waitPakin.setStatus("Y"); // 状态 // waitPakin.setAppeUser(userId); // waitPakin.setAppeTime(now); // waitPakin.setModiUser(userId); // waitPakin.setModiTime(now); // if (!waitPakinService.insert(waitPakin)) { // throw new CoolException("保存入库通知档失败"); // } // // 修改打包数据状态 // Pack pack = packService.selectByBarcode(detlDto.getOrderNo()); // pack.setSettle(2L); // pack.setUpdateTime(now); // pack.setUpdateBy(userId); // if (!packService.updateById(pack)) { // throw new CoolException("修改打包数据异常"); // } // } // // } // } @Override @Transactional src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -141,51 +141,51 @@ } } @Override @Transactional public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) { List<OpenOrderCompeteResult> results = new ArrayList<>(); if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { // 指定订单 Order order = orderService.selectByNo(param.getOrderNo()); if (null != order) { OpenOrderCompeteResult result = new OpenOrderCompeteResult(); results.add(result); result.setOrderNo(order.getOrderNo()); result.setOrderTime(order.getOrderTime()); result.setOrderType(order.getDocType$()); List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); for (OrderDetl orderDetl : orderDetls) { result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); } if (order.getSettle() == 4L) { // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), 6L, null)) { throw new CoolException("服务器内部错误，请联系管理员"); } } } } else { // 所有订单 List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); for (Order order : orders) { OpenOrderCompeteResult result = new OpenOrderCompeteResult(); results.add(result); result.setOrderNo(order.getOrderNo()); result.setOrderTime(order.getOrderTime()); result.setOrderType(order.getDocType$()); List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); for (OrderDetl orderDetl : orderDetls) { result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); } // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), 6L, null)) { throw new CoolException("服务器内部错误，请联系管理员"); } } } return results; } // @Override // @Transactional // public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) { // List<OpenOrderCompeteResult> results = new ArrayList<>(); // if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { // // 指定订单 // Order order = orderService.selectByNo(param.getOrderNo()); // if (null != order) { // OpenOrderCompeteResult result = new OpenOrderCompeteResult(); // results.add(result); // result.setOrderNo(order.getOrderNo()); // result.setOrderTime(order.getOrderTime()); // result.setOrderType(order.getDocType$()); // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // for (OrderDetl orderDetl : orderDetls) { // result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); // } // if (order.getSettle() == 4L) { // // 修改订单状态 4.完成 ===>> 6.已上报 // if (!orderService.updateSettle(order.getId(), 6L, null)) { // throw new CoolException("服务器内部错误，请联系管理员"); // } // } // } // } else { // // 所有订单 // List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); // for (Order order : orders) { // OpenOrderCompeteResult result = new OpenOrderCompeteResult(); // results.add(result); // result.setOrderNo(order.getOrderNo()); // result.setOrderTime(order.getOrderTime()); // result.setOrderType(order.getDocType$()); // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // for (OrderDetl orderDetl : orderDetls) { // result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); // } // // 修改订单状态 4.完成 ===>> 6.已上报 // if (!orderService.updateSettle(order.getId(), 6L, null)) { // throw new CoolException("服务器内部错误，请联系管理员"); // } // } // } // return results; // } @Override @Transactional @@ -276,50 +276,50 @@ } } @Override public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) { List<OpenOrderCompeteResult> results = new ArrayList<>(); if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { // 指定订单 Order order = orderService.selectByNo(param.getOrderNo()); if (null != order) { OpenOrderCompeteResult result = new OpenOrderCompeteResult(); results.add(result); result.setOrderNo(order.getOrderNo()); result.setOrderTime(order.getOrderTime()); result.setOrderType(order.getDocType$()); List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); for (OrderDetl orderDetl : orderDetls) { result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); } if (order.getSettle() == 4L) { // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), 6L, null)) { throw new CoolException("服务器内部错误，请联系管理员"); } } } } else { // 所有订单 List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); for (Order order : orders) { OpenOrderCompeteResult result = new OpenOrderCompeteResult(); results.add(result); result.setOrderNo(order.getOrderNo()); result.setOrderTime(order.getOrderTime()); result.setOrderType(order.getDocType$()); List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); for (OrderDetl orderDetl : orderDetls) { result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); } // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), 6L, null)) { throw new CoolException("服务器内部错误，请联系管理员"); } } } return results; } // @Override // public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) { // List<OpenOrderCompeteResult> results = new ArrayList<>(); // if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { // // 指定订单 // Order order = orderService.selectByNo(param.getOrderNo()); // if (null != order) { // OpenOrderCompeteResult result = new OpenOrderCompeteResult(); // results.add(result); // result.setOrderNo(order.getOrderNo()); // result.setOrderTime(order.getOrderTime()); // result.setOrderType(order.getDocType$()); // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // for (OrderDetl orderDetl : orderDetls) { // result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); // } // if (order.getSettle() == 4L) { // // 修改订单状态 4.完成 ===>> 6.已上报 // if (!orderService.updateSettle(order.getId(), 6L, null)) { // throw new CoolException("服务器内部错误，请联系管理员"); // } // } // } // } else { // // 所有订单 // List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); // for (Order order : orders) { // OpenOrderCompeteResult result = new OpenOrderCompeteResult(); // results.add(result); // result.setOrderNo(order.getOrderNo()); // result.setOrderTime(order.getOrderTime()); // result.setOrderType(order.getDocType$()); // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // for (OrderDetl orderDetl : orderDetls) { // result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); // } // // 修改订单状态 4.完成 ===>> 6.已上报 // if (!orderService.updateSettle(order.getId(), 6L, null)) { // throw new CoolException("服务器内部错误，请联系管理员"); // } // } // } // return results; // } @Override @Transactional src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -45,8 +45,7 @@ @Autowired private DocTypeService docTypeService; @Value("${erp.erpUrl}") private String url; @Transactional public ReturnT<String> start(Order order) { src/main/java/com/zy/common/model/DetlDto.java
@@ -13,7 +13,6 @@ @Data public class DetlDto { private String orderNo; private String matnr; @@ -40,12 +39,6 @@ this.anfme = anfme; } public DetlDto(String orderNo, String matnr, String batch, Double anfme) { this.orderNo = orderNo; this.matnr = matnr; this.batch = batch; this.anfme = anfme; } public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) { for (DetlDto dto : detlDtos) {
