From f2151cc0b3efc817617a28a55415c42b40580d5c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 23 Aug 2023 15:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=90=8C=E6=AD=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteSapService.java | 2 + .../src/main/java/com/op/job/task/RyTask.java | 2 +- .../op/sap/domain/SapMaterialPreparation.java | 125 ------------------ .../controller/ProRouteController.java | 20 ++- 4 files changed, 22 insertions(+), 127 deletions(-) delete mode 100644 op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java 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 069e0729b..501d88782 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 @@ -25,8 +25,10 @@ public interface RemoteSapService { @PostMapping("/bomSync") public R bomSync(); + @PostMapping("/sap/sapProRouteProcess") public R sapProRouteProcess(); + @PostMapping("/sap/materialPreparation") public R>materialPreparation(@RequestParam("shopOrder") String shopOrder); diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index b6f841f3a..7b9eeae72 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -55,7 +55,7 @@ public class RyTask { */ public void getRouteTask(){ System.out.println("++同步工艺+开始++getRouteTask+++++"); - //remoteSapService.getRouteTask(); + remoteSapService.sapProRouteProcess(); } } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java deleted file mode 100644 index 2981cdd7e..000000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.op.sap.domain; - - -public class SapMaterialPreparation { - //订单号 - private String AUFNR; - //预留/相关需求的项目编号 - private String RSPOS; - //物料号 - private String MATNR; - //物料描述（短文本） - private String MAKTX; - //工厂 - private String WERKS; - //库存地点 - private String LGORT; - //组件的需求日期 - private String BDTER; - //需求量 - private String BDMNG; - //欠料数量 - private String ZQLSL; - //基本计量单位 - private String MEINS; - //标识：反冲 - private String RGEKZ; - //直接采购标识 - private String DBSKZ; - - public String getAUFNR() { - return AUFNR; - } - - public void setAUFNR(String AUFNR) { - this.AUFNR = AUFNR; - } - - public String getRSPOS() { - return RSPOS; - } - - public void setRSPOS(String RSPOS) { - this.RSPOS = RSPOS; - } - - public String getMATNR() { - return MATNR; - } - - public void setMATNR(String MATNR) { - this.MATNR = MATNR; - } - - public String getMAKTX() { - return MAKTX; - } - - public void setMAKTX(String MAKTX) { - this.MAKTX = MAKTX; - } - - public String getWERKS() { - return WERKS; - } - - public void setWERKS(String WERKS) { - this.WERKS = WERKS; - } - - public String getLGORT() { - return LGORT; - } - - public void setLGORT(String LGORT) { - this.LGORT = LGORT; - } - - public String getBDTER() { - return BDTER; - } - - public void setBDTER(String BDTER) { - this.BDTER = BDTER; - } - - public String getBDMNG() { - return BDMNG; - } - - public void setBDMNG(String BDMNG) { - this.BDMNG = BDMNG; - } - - public String getZQLSL() { - return ZQLSL; - } - - public void setZQLSL(String ZQLSL) { - this.ZQLSL = ZQLSL; - } - - public String getMEINS() { - return MEINS; - } - - public void setMEINS(String MEINS) { - this.MEINS = MEINS; - } - - public String getRGEKZ() { - return RGEKZ; - } - - public void setRGEKZ(String RGEKZ) { - this.RGEKZ = RGEKZ; - } - - public String getDBSKZ() { - return DBSKZ; - } - - public void setDBSKZ(String DBSKZ) { - this.DBSKZ = DBSKZ; - } -} diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java index cc48f8e26..d65a3d2cb 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java @@ -3,6 +3,7 @@ package com.op.technology.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.common.core.domain.R; import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; @@ -11,6 +12,7 @@ import com.op.common.core.web.controller.BaseController; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; +import com.op.system.api.RemoteSapService; import com.op.technology.domain.ProRoute; import com.op.technology.service.IProRouteProcessService; import com.op.technology.service.IProRouteService; @@ -40,7 +42,8 @@ public class ProRouteController extends BaseController { @Autowired private IProRouteProcessService proRouteProcessService; - + @Autowired + private RemoteSapService remoteSapService; /** * 查询工艺路线列表 */ @@ -126,4 +129,19 @@ public class ProRouteController extends BaseController { } return toAjax(proRouteService.deleteProRouteByRouteIds(routeIds)); } + + /** + * 同步SAP订单 + * @param + * @return + */ + @Log(title = "手动执行同步SAP工艺路线", businessType = BusinessType.INSERT) + @PostMapping("/sapProRouteProcess") + public AjaxResult sapProRouteProcess() { + R r = remoteSapService.sapProRouteProcess(); + if((Boolean) r.getData()){ + return AjaxResult.success(); + } + return AjaxResult.error("手动同步失败"); + } }