Merge remote-tracking branch 'origin/wms_pzh' into wms_pzh

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;
     //目标单据类型

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

api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml

@@ -30,7 +30,12 @@
             <if test="erpId != '' and erpId != null">
                 AND erpId = #{erpId}
             </if>
-            <if test="corpType != null">
+
+            <if test="corpType == 1">
+                AND (corpType =1 || corpType=5)
+            </if>
+
+            <if test="corpType != null and corpType !=1">
                 AND corpType = #{corpType}
             </if>
             <if test="outType != null">

api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml

@@ -3,26 +3,30 @@
 <mapper namespace="com.glxp.api.admin.dao.inout.UnitMaintainPlatformDao">
     <select id="getLinkPlatformList" resultType="com.glxp.api.admin.res.info.PlatformLinkResponse">
         select up.id,
-               up.unitId,
-               u.name  corpName,
-               u.corpType,
-               u.spell pinyinCode,
-               ap.name platformName,
-               ap.id   platformId,
-               up.sourceAction,
-               up.targetAction,
-               up.invCode,
-               up.invSubCode
+        up.unitId,
+        u.name corpName,
+        u.corpType,
+        u.spell pinyinCode,
+        ap.name platformName,
+        ap.id platformId,
+        up.sourceAction,
+        up.targetAction,
+        up.invCode,
+        up.invSubCode,
+        bl.name socurceName
         from io_unit_maintain_platform up
-                 left join basic_corp u on up.unitId = u.erpId
-                 left join auth_platform ap on up.platformId = ap.id
+        left join basic_corp u on up.unitId = u.erpId
+        left join auth_platform ap on up.platformId = ap.id
+        left join basic_bustype_local bl on up.sourceAction = bl.action
         where up.customerId = #{customerId}
         <if test="key != null and key != ''">
             AND (u.erpId like concat('%', #{key}, '%')
-                or u.name like concat('%', #{key}, '%')
-                or u.spell like concat('%', #{key}, '%')
-                )
+            or u.name like concat('%', #{key}, '%')
+            or u.spell like concat('%', #{key}, '%')
+            )
         </if>
+
+        order by up.unitId
     </select>
 
     <select id="selectByCustomerId" resultType="com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity">
@@ -128,13 +132,15 @@
     </select>
 
     <delete id="deleteById">
-        delete from io_unit_maintain_platform where id = #{id}
+        delete
+        from io_unit_maintain_platform
+        where id = #{id}
     </delete>
 
     <select id="selectCount" resultType="java.lang.Long">
         select count(*)
         from io_unit_maintain_platform
         where sourceAction = #{action}
-        and unitId = #{unitId}
+          and unitId = #{unitId}
     </select>
 </mapper>