工艺同步接口

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<Boolean> bomSync();
+
     @PostMapping("/sap/sapProRouteProcess")
     public R<Boolean> sapProRouteProcess();
+
     @PostMapping("/sap/materialPreparation")
     public R<List<SapMaterialPreparation>>materialPreparation(@RequestParam("shopOrder") String shopOrder);
 

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();
 	}
 
 }

op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java

@@ -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;
-    }
-}

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("手动同步失败");
+    }
 }