From 1a331d6b42275be8bebd691d0f097353b316f47c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 29 Feb 2024 14:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=B1=82=E8=AE=A2=E5=8D=95=E6=94=B9?= =?UTF-8?q?=E9=80=A02.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteSapService.java | 2 +- .../api/factory/RemoteSapFallbackFactory.java | 2 +- .../java/com/op/plan/domain/ProOrder.java | 10 ++++++- .../impl/ProOrderWorkorderServiceImpl.java | 30 +++++++------------ .../resources/mapper/plan/ProOrderMapper.xml | 3 ++ 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index 97ab0a3c..0a84fae2 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -36,7 +36,7 @@ public interface RemoteSapService { /**回传sap母工单**/ @PostMapping("/sap/sapCreateOrder") - public R>> SapCreateOrder(@RequestBody List sapCreateOrderList); + public R> SapCreateOrder(@RequestBody List sapCreateOrderList); /**关闭订单**/ @PostMapping("/sap/sapCloseOrder") diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index 1cafde65..e9709b2a 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -35,7 +35,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory>> SapCreateOrder(List sapCreateOrderList) { + public R> SapCreateOrder(List sapCreateOrderList) { return R.fail("回传sap工单失败:" + throwable.getMessage()); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index a27e7b58..f42c0aa7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -19,7 +19,7 @@ public class ProOrder extends TreeEntity { /** ID */ private String id; - + private String cegci; /** 计划工厂编码 */ private String planFactoryCode; @@ -357,6 +357,14 @@ public class ProOrder extends TreeEntity { this.sortNo = sortNo; } + public String getCegci() { + return cegci; + } + + public void setCegci(String cegci) { + this.cegci = cegci; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index ed4f774b..cccd8b35 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -355,20 +355,14 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { ordercodes.add(whiteOrder.getOrderCode()); Boolean isNotTop = true; //成品的母工单//查下一级工单 + ProOrderWorkorder queryWorkOrder = whiteOrder; while (isNotTop) { - if(!"0".equals(whiteOrder.getParentOrder())){ - //查上一级工单 - whiteOrder.setWorkorderCode(whiteOrder.getParentOrder()); - ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(whiteOrder); - if (sWorkOrder != null) { - wids.add(sWorkOrder.getWorkorderId()); - wcodes.add(sWorkOrder.getWorkorderCode()); - ordercodes.add(sWorkOrder.getOrderCode()); - } - if ("0".equals(sWorkOrder.getParentOrder())) { - BeanUtils.copyProperties(sWorkOrder, whiteOrder); - isNotTop = false; - } + ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(queryWorkOrder); + if (sWorkOrder != null) { + wids.add(sWorkOrder.getWorkorderId()); + wcodes.add(sWorkOrder.getWorkorderCode()); + ordercodes.add(sWorkOrder.getOrderCode()); + queryWorkOrder.setWorkorderCode(sWorkOrder.getWorkorderCode()); }else{ isNotTop = false; } @@ -390,7 +384,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { sapList.add(sap); logger.info(whiteOrder.getWorkorderCode() + "sap工单回传sap工单号开始：" + JSONObject.toJSONString(sapList)); - R>> r = remoteSapService.SapCreateOrder(sapList); + R> r = remoteSapService.SapCreateOrder(sapList); logger.info("sap工单回传：" + r.getMsg()); if (500 == r.getCode()) { logger.error("工单派发sap工单回传：(sap订单创建失败)" + r.getMsg()); @@ -398,12 +392,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } else { logger.info("工单派发sap工单回传：(sap订单创建成功)" + JSONObject.toJSONString(r)); } - List> returnMaps = r.getData(); - List returnCodes = new ArrayList<>(); - for (Map mapdto : returnMaps) { - returnCodes.add(mapdto.get("LEAD_AUFNR")); - returnCodes.add(mapdto.get("AUFNR")); - } + List returnCodes = r.getData(); + Date updateTime = DateUtils.getNowDate(); if (!CollectionUtils.isEmpty(returnCodes)) { logger.info("sap工单回传sap工单号结束：" + StringUtils.join(returnCodes, ",")); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 06947080..ca2fdd69 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -229,6 +229,7 @@ car_num, sync_user, from_sap_time, + cegci, #{id}, @@ -258,6 +259,7 @@ #{carNum}, #{syncUser}, GETDATE(), + #{cegci}, @@ -294,6 +296,7 @@ prod_type = #{prodType}, prod_spc = #{prodSpc}, from_sap_time = GETDATE(), + cegci = #{cegci}, sync_user = #{syncUser}, where id = #{id}