Merge remote-tracking branch 'origin/master'

highway
wws 1 year ago
commit c5e0d0e785

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

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

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

@ -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("."))));

@ -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" />

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

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

Loading…
Cancel
Save