第三方服务更新

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java

@@ -123,11 +123,6 @@ public class BussinessOriginTypeController {
             }
 
             bussinessTypeEntity.setUpdateTime(new Date());
-            BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
-            if (bussinessOriginTypeEntity != null) {
-                return ResultVOUtils.error(500, "单据类型已存在！");
-            }
-
             bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
         } else {
             return ResultVOUtils.error(999, "参数错误");

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java

@@ -59,6 +59,6 @@ public class BasicThirdSysDetailServiceImpl implements BasicThirdSysDetailServic
 
     @Override
     public BaseResponse testThirdService(BasicThirdSysEntity basicThirdSysEntity) {
-       return erpBasicClient.testConnection(basicThirdSysEntity);
+       return erpBasicClient.testThridConnect(basicThirdSysEntity);
     }
 }

api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java

@@ -89,6 +89,7 @@ public class ThrProductsDlService {
                     item -> {
                         ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity();
                         BeanUtils.copyProperties(item, thrProductsImportDetailEntity);
+                        thrProductsImportDetailEntity.setSpec(item.getStandard());
                         thrProductsImportDetailEntity.setThirdSysFk(thirdSys);
                         thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey());
                         return thrProductsImportDetailEntity;
@@ -445,6 +446,7 @@ public class ThrProductsDlService {
                         item -> {
                             ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity();
                             BeanUtils.copyProperties(item, thrProductsImportDetailEntity);
+                            thrProductsImportDetailEntity.setSpec(item.getStandard());
                             thrProductsImportDetailEntity.setThirdSysFk(thirdSys);
                             thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey());
                             return thrProductsImportDetailEntity;

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/udiwms?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?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 server.servlet.context-path=

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test1
+spring.profiles.active=dev
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -49,6 +49,7 @@
                 AND inv_warehouse_sub.parentId = #{parentId}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="filterGroupInvSub" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest"