From ff2bf78d5d8075d273ecb73880c2bd523887bf64 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 14 Dec 2023 10:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E9=A2=86?= =?UTF-8?q?=E6=96=99=E8=BF=87=E8=B4=A6=E3=80=81=E5=8F=8D=E5=86=B2=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=A2=86=E6=96=99=E8=BF=87=E8=B4=A6=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/system/api/RemoteSapService.java | 8 ++++++++ .../op/system/api/domain/sap}/SapBackflushMPQuery.java | 2 +- .../op/system/api/domain/sap}/SapMaterialPosting.java | 2 +- .../op/system/api/factory/RemoteSapFallbackFactory.java | 9 +++++++++ .../main/java/com/op/sap/controller/SapController.java | 4 ---- .../main/java/com/op/sap/service/SapItemSyncService.java | 5 ++--- .../main/java/com/op/sap/service/SapOrderService.java | 1 + .../java/com/op/sap/service/impl/SapItemSyncImpl.java | 6 ++---- .../com/op/sap/service/impl/SapOrderServiceImpl.java | 2 -- 9 files changed, 24 insertions(+), 15 deletions(-) rename {op-modules/op-sap/src/main/java/com/op/sap/domain/vo => op-api/op-api-system/src/main/java/com/op/system/api/domain/sap}/SapBackflushMPQuery.java (98%) rename {op-modules/op-sap/src/main/java/com/op/sap/domain/vo => op-api/op-api-system/src/main/java/com/op/system/api/domain/sap}/SapMaterialPosting.java (98%) 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 7c1c73cf..79dcc7d5 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 @@ -66,4 +66,12 @@ public interface RemoteSapService { @PostMapping("/sap/bomSync") public R sapBomSync(); + /** + * 反冲物料领料过账接口 + */ + @PostMapping("/sap/sapBackflushMP") + public R sapBackflushMP(List sapBackflushMPQueryList); + + /**订单物料领料过账、原材料补料、订单物料退料过账接口（MB1A）**/ + public R sapMaterialPosting(@RequestBody List sapMaterialPostingList); } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBackflushMPQuery.java similarity index 98% rename from op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBackflushMPQuery.java index 7cc1e30b..96bff342 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBackflushMPQuery.java @@ -1,4 +1,4 @@ -package com.op.sap.domain.vo; +package com.op.system.api.domain.sap; /** * 反冲类型的领料过账接口 diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPosting.java similarity index 98% rename from op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPosting.java index bb5c9577..993e1c3f 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapMaterialPosting.java @@ -1,4 +1,4 @@ -package com.op.sap.domain.vo; +package com.op.system.api.domain.sap; //智慧工厂-订单物料领料过账、原材料补料、订单物料退料过账（MB1A） 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 6f90361c..6d6fff03 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 @@ -79,6 +79,15 @@ public class RemoteSapFallbackFactory implements FallbackFactory sapBackflushMPQueryList) { + return R.fail("反冲物料领料过账失败" + throwable.getMessage()); + } + + @Override + public R sapMaterialPosting(List sapMaterialPostingList) { + return R.fail("订单物料领料过账、原材料补料、订单物料退料过账接口（MB1A）失败" + throwable.getMessage()); + } }; } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index fb273afe..22ea9ab7 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -1,6 +1,5 @@ package com.op.sap.controller; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.web.controller.BaseController; @@ -415,7 +414,4 @@ public class SapController extends BaseController { return sapOrderService.sapOrderReceipt(sapOrderReceiptQuery); } - - - } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java index ca620649..3fd0c490 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java @@ -1,10 +1,9 @@ package com.op.sap.service; import com.op.common.core.domain.R; -import com.op.sap.domain.vo.SapBackflushMPQuery; +import com.op.system.api.domain.sap.SapBackflushMPQuery; import com.op.sap.domain.vo.SapItemQuery; -import com.op.sap.domain.vo.SapMaterialPosting; -import com.op.system.api.domain.sap.SapBaseProduct; +import com.op.system.api.domain.sap.SapMaterialPosting; import java.util.List; diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java index b5454ca2..f59d4463 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java @@ -4,6 +4,7 @@ import com.op.common.core.domain.R; import com.op.sap.domain.vo.SapOrderReceiptQuery; import com.op.sap.domain.vo.SapPurchaseOrderQuery; + import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapRFW; diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 4a91b777..5602fa84 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -9,14 +9,12 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.bean.BeanValidators; import com.op.common.security.utils.SecurityUtils; -import com.op.sap.domain.vo.SapBackflushMPQuery; +import com.op.system.api.domain.sap.SapBackflushMPQuery; import com.op.sap.domain.vo.SapItemQuery; -import com.op.sap.domain.vo.SapMaterialPosting; +import com.op.system.api.domain.sap.SapMaterialPosting; import com.op.sap.mapper.SapBaseProductMapper; import com.op.sap.service.SapItemSyncService; -import com.op.sap.util.SAPConnUtils; import com.op.system.api.RemoteUserService; -import com.op.system.api.domain.SysUser; import com.op.system.api.domain.sap.SapBaseProduct; import com.sap.conn.jco.*; import org.slf4j.Logger; diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 846a660b..18d8d533 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -7,12 +7,10 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; -import com.op.sap.domain.vo.SapBackflushMPQuery; import com.op.sap.domain.vo.SapOrderReceiptQuery; import com.op.sap.domain.vo.SapPurchaseOrderQuery; import com.op.sap.service.SapOrderService; -import com.op.sap.util.SAPConnUtils; import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapRFW;