From e951f7760b29bb401e1992d9ce83e01515e6eaac Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 25 十二月 2023 13:13:15 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 8 +++++++- src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java | 1 + src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 12 ++++++++++++ src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 5 ++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java index 1db6f50..0186168 100644 --- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java +++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java @@ -13,6 +13,7 @@ private String orderNo; private String formId; + private Integer id; private String srcBillNo; diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java index db5fffa..26f185b 100644 --- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java +++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java @@ -29,7 +29,13 @@ public OpenOrderPakoutParam(OpenOrderPakinJDParam param1){ this.orderNo=param1.getOrderNo(); - KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId()); + KingDeeUtilType kingDeeUtilType = null; + if (!Cools.isEmpty(param1.getId())){ + kingDeeUtilType = KingDeeUtilType.get(param1.getId()); + } + if (Cools.isEmpty(kingDeeUtilType)){ + kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId()); + } if (Cools.isEmpty(kingDeeUtilType)){ this.orderType=param1.getFormId(); }else { diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java index 35a1a2e..7bc72b9 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java @@ -47,6 +47,9 @@ @Transactional public ReturnT<String> start(Order order) { + String orderNo = order.getOrderNo(); + String[] split = orderNo.split("-"); + String orderNoS = split[0]; //鐧诲綍閲戣澏r ReturnT<String> start = loginAuthenticationHandler.start(); DocType docType = docTypeService.selectById(order.getDocType()); @@ -57,7 +60,7 @@ //鏉′欢鎷兼帴 JSONObject dataJsonObject = new JSONObject(); - dataJsonObject.put("Numbers",order.getOrderNo()); + dataJsonObject.put("Numbers",orderNoS); dataJsonObject.put("EntryIds",""); dataJsonObject.put("RuleId",kingDeeUtilType.ruleId); dataJsonObject.put("TargetFormId",kingDeeUtilType.correspondingFormId); diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java index 4f21d6c..ccf531b 100644 --- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java +++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java @@ -71,6 +71,18 @@ return null; } + public static KingDeeUtilType get(Integer id) { + if (null == id) { + return null; + } + for (KingDeeUtilType type : KingDeeUtilType.values()) { + if (type.id.equals(id)) { + return type; + } + } + return null; + } + public static KingDeeUtilType get(String desc) { if (null == desc) { return null; -- Gitblit v1.9.1