diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java index e52f246f..021efecc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java @@ -22,6 +22,9 @@ public class PlatformLinkResponse { private String platformName; //自助平台ID private String platformId; + + private String socurceName; + //本地单据类型 private String sourceAction; //目标单据类型 diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 0d346e3c..c8c36362 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,6 +1,6 @@ server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ljy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph3?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 @@ -11,6 +11,11 @@ logging.level.com.glxp.api.admin.dao=debug file_path=D:/udi/udiwms/udiwmsfile/ #file_path=/home/glxp/udiwms++ UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df + + +UDI_APPID=UDIWMS_PZH +UDI_SECRET=237826ad74114b59afe9ff5f0d69345f + UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs SYSTEM_TYPE=pzh diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 7558e9c2..7c2eaacf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -30,7 +30,12 @@ AND erpId = #{erpId} - + + + AND (corpType =1 || corpType=5) + + + AND corpType = #{corpType} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml index 2ba5814a..74440ad8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml @@ -3,26 +3,30 @@ - delete from io_unit_maintain_platform where id = #{id} + delete + from io_unit_maintain_platform + where id = #{id} \ No newline at end of file