Merge remote-tracking branch 'origin/master'

op-modules/op-job/src/main/resources/bootstrap.yml

@@ -13,15 +13,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: lanju-op
+        namespace: lanju-op-test
-        group: zxl
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
       config:
-        namespace: lanju-op
+        namespace: lanju-op-test
-        group: zxl
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

op-modules/op-sap/pom.xml

@@ -100,14 +100,15 @@
             <groupId>com.sap.conn</groupId>
             <artifactId>sapjco</artifactId>
             <version>3.0.8</version>
-            <!--            <scope>system</scope>-->
+<!--                         <scope>system</scope>-->
-            <!--            <systemPath>${project.basedir}/src/main/lib/sapjco3.jar</systemPath>-->
+<!--                         <systemPath>${project.basedir}/src/main/lib/sapjco3.jar</systemPath>-->
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
 
+
     </dependencies>
 
     <build>

op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java

@@ -495,6 +495,17 @@ public class SapController extends BaseController {
         return sapItemSyncService.FPinventory(mapList);
     }
 
+    /**
+     * 来料暂收接口
+     * @param mapList
+     * @return
+     */
+    @PostMapping("/temporarilyCollected")
+    @Log(title = "来料暂收接口", businessType = BusinessType.SAP)
+    public R temporarilyCollected(@RequestBody(required = false) List<Map> mapList) {
+        return sapItemSyncService.temporarilyCollected(mapList);
+    }
+
     /**
      * 智慧工厂105移动类型(来料库存转换)
      */
@@ -518,4 +529,6 @@ public class SapController extends BaseController {
         dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName());
         return R.ok();
     }
+
+
 }

op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java

@@ -36,4 +36,6 @@ public interface SapItemSyncService {
     R FPinventory(Map<String, Object> mapList);
 
     R incomingConversion(Map<String, Object> mapList);
+
+    R temporarilyCollected(List<Map> mapList);
 }

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java

@@ -594,5 +594,61 @@ public class SapItemSyncImpl implements SapItemSyncService {
         }
     }
 
+    /**
+     * ZMES_103_MIGO函数取值说明：智慧工厂MIGO-103移动类型收货
+     *  字段	类型	长度	小数位	描述
+     * EBELN	CHAR	10	0	采购凭证号
+     * EBELP	NUMC	5	0	采购凭证的项目编号
+     * MATNR	CHAR	18	0	物料号
+     * WERKS	CHAR	4	0	工厂
+     * QUANTITY	QUAN	13	3	数量
+     * @param mapList
+     * @return
+     */
+    @Override
+    public R temporarilyCollected(List<Map> mapList) {
+        try {
+            JCoRepository repository = dest.getRepository();
+            JCoFunction func = repository.getFunction("ZMES_103_MIGO");
+            if (func == null) {
+                throw new RuntimeException("Function does not exist in SAP");
+            }
+            log.info("来料暂收参数-------" + mapList.toString());
+            JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM");
+            System.out.println(L_ITEM);
+            for (Map map : mapList) {
+                L_ITEM.appendRow();
+                L_ITEM.setValue("EBELN", map.get("EBELN"));
+                L_ITEM.setValue("EBELP", map.get("EBELP"));
+                L_ITEM.setValue("MATNR", map.get("MATNR"));
+                L_ITEM.setValue("WERKS", map.get("WERKS"));
+                L_ITEM.setValue("QUANTITY", map.get("QUANTITY"));
+            }
+            System.out.println(L_ITEM);
+            func.execute(dest);//执行调用函数
+            /**
+             * RETCODE	CHAR3		返回值：200-没有错误，500-有错误
+             * L_MSG	CHAR220		返回消息文本
+             * MATERIALDOCUMENT	CHAR10		物料凭证编号
+             * MATDOCUMENTYEAR	NUMC4		物料凭证年度
+             */
+            String RETCODE = func.getExportParameterList().getString("RETCODE");
+            String MESSAGE = func.getExportParameterList().getString("L_MSG");
+            String MATERIALDOCUMENT = func.getExportParameterList().getString("MATERIALDOCUMENT");
+            String MATDOCUMENTYEAR = func.getExportParameterList().getString("MATDOCUMENTYEAR");
+            log.info("暂收结果结果-----" + RETCODE+"/" +MESSAGE+"/" +MATERIALDOCUMENT+"/" +MATDOCUMENTYEAR);
+            if((Constants.FAIL).equals(Integer.parseInt(RETCODE))){
+                return R.fail(MESSAGE);
+            }
+            Map Resmap = new HashMap();
+            Resmap.put("MATERIALDOCUMENT", MATERIALDOCUMENT);
+            Resmap.put("MATDOCUMENTYEAR", MATDOCUMENTYEAR);
+            return R.ok(Resmap, MESSAGE);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return R.fail(e.getMessage());
+        }
+    }
+
 
 }