Merge remote-tracking branch 'origin/master'

op-api/op-api-system/op-api-system.iml

@@ -7,6 +7,7 @@
     <facet type="web" name="Web">
       <configuration>
         <webroots />
+        <sourceRoots />
       </configuration>
     </facet>
   </component>

op-modules/op-job/op-modules-job.iml

@@ -22,6 +22,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="sapjco33" level="project" />
     <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="sapjco3" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.0.4" level="project" />
@@ -213,12 +214,12 @@
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.abc.sap:sapjco3:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
-    <orderEntry type="library" name="sapjco3" level="project" />
   </component>
 </module>

op-modules/op-job/pom.xml

@@ -83,7 +83,11 @@
             <groupId>com.op</groupId>
             <artifactId>op-common-swagger</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.abc.sap</groupId>
+            <artifactId>sapjco3</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

op-modules/op-job/src/main/java/com/op/job/task/SapTask.java

@@ -1,10 +1,7 @@
 package com.op.job.task;
 
-import com.op.common.core.constant.SecurityConstants;
 import com.op.common.core.utils.uuid.IdUtils;
-import com.op.job.config.SapConnConfig;
 import com.op.job.domain.SapConn;
-import com.op.job.service.ISysJobService;
 import com.op.job.util.SAPConnUtils;
 
 import com.op.system.api.RemoteMesService;
@@ -211,6 +208,7 @@ public class SapTask {
                 proOrder.setId(IdUtils.fastSimpleUUID());
                 proOrder.setPlanFactoryCode(PWERK);
                 proOrder.setOrderCode(AUFNR);
+                proOrder.setOrderType(AUART);
                 proOrder.setProdCode(PLNBEZ);
                 proOrder.setProdDesc(MAKTX);
                 proOrder.setQuantity(Long.parseLong(GAMNG.substring(0,GAMNG.indexOf("."))));

op-modules/op-sap/op-modules-sap.iml

@@ -189,6 +189,7 @@
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.abc.sap:sapjco3:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" />

op-modules/op-sap/pom.xml

@@ -78,6 +78,13 @@
             <artifactId>op-common-swagger</artifactId>
         </dependency>
 
+        <!-- OP Common Log -->
+        <dependency>
+            <groupId>com.abc.sap</groupId>
+            <artifactId>sapjco3</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

op-modules/op-system/op-modules-system.iml

@@ -10,7 +10,6 @@
           <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
         </descriptors>
         <webroots />
-        <sourceRoots />
       </configuration>
     </facet>
   </component>

pom.xml

@@ -283,4 +283,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>