From a3e5cc92825d82a202c36264ca67a01569814b82 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Tue, 3 Feb 2026 09:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteSapService.java | 7 +++ .../api/factory/RemoteSapFallbackFactory.java | 10 +++ .../wms/controller/BaseProductController.java | 15 +++++ .../op/wms/service/IBaseProductService.java | 3 + .../service/impl/BaseProductServiceImpl.java | 14 +++++ .../mapper/wms/OdsProcureOutOrderMapper.xml | 62 ------------------- 6 files changed, 49 insertions(+), 62 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 0a7eba004..299e73034 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 @@ -164,6 +164,13 @@ public interface RemoteSapService { @PostMapping("/sap/sapTransferPosting") R sapTransferPosting(@RequestBody List> list); + + /** + * 手动同步物料 + * **/ + @PostMapping("/sap/syncBaseProduct") + R syncBaseProduct(@RequestBody Map params); + } 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 8cdabb5bc..245e75338 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 @@ -208,6 +208,16 @@ public class RemoteSapFallbackFactory implements FallbackFactory params) { + return R.fail("手动同步物料失败" + throwable.getMessage()); + } + }; } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java index 99e63541d..e8c95f84c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java @@ -2,6 +2,7 @@ package com.op.wms.controller; import java.io.IOException; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -111,4 +112,18 @@ public class BaseProductController extends BaseController { public AjaxResult remove(@PathVariable String[] productIds) { return toAjax(baseProductService.deleteBaseProductByProductIds(productIds)); } + + + /** + * 手动同步物料 + */ + @Log(title = "手动同步物料", businessType = BusinessType.SAP) + @PostMapping("/sync") + public AjaxResult sync(@RequestBody Map params) { + baseProductService.syncBaseProduct(params); + return success(); + } + + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java index b48a0b482..ff5201363 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java @@ -1,6 +1,7 @@ package com.op.wms.service; import java.util.List; +import java.util.Map; import com.op.wms.domain.BaseProduct; @@ -64,4 +65,6 @@ public interface IBaseProductService { boolean checkNameUnique(BaseProduct baseProduct); public BaseProduct selectBaseProductByProductCode(String productCode); + + void syncBaseProduct( Map params); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java index b266846b3..63cd157c6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java @@ -1,10 +1,13 @@ package com.op.wms.service.impl; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.RemoteSapService; import com.op.wms.domain.BaseTeamT; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +26,9 @@ public class BaseProductServiceImpl implements IBaseProductService { @Autowired private BaseProductMapper baseProductMapper; + @Autowired + private RemoteSapService remoteSapService; + /** * 查询物料信息 * @@ -138,4 +144,12 @@ public class BaseProductServiceImpl implements IBaseProductService { public BaseProduct selectBaseProductByProductCode(String productCode) { return baseProductMapper.selectBaseProductByProductCode(productCode); } + + @Override + public void syncBaseProduct( Map params) { + R result = remoteSapService.syncBaseProduct(params); + if (result.getCode() != 200){ + throw new RuntimeException("同步失败:"+result.getMsg()); + } + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 082841756..59a03e150 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -2254,67 +2254,5 @@ - - - - - - - - INSERT INTO wms_material_entry ( - work_order_code, - material_code, - batch_code, - factory_code, - location, - area_code, - status, - create_time, - create_by - ) - VALUES - - ( - #{item.workOrderCode}, - #{item.materialCode}, - #{item.batchCode}, - #{item.factoryCode}, - #{item.location}, - #{item.areaCode}, - #{item.status}, - GETDATE(), - #{item.createBy} - ) - - -