diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java index 8d3aa2d7..0931e078 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/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, "参数错误"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java index 53500703..9e9ff229 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java +++ b/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); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java index c968c26e..8beca3d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/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; diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 4e972fe2..34811dc8 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/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= diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index cb3acd23..e487e916 100644 --- a/api-admin/src/main/resources/application.properties +++ b/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 diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index 8967d150..4556815a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -49,6 +49,7 @@ AND inv_warehouse_sub.parentId = #{parentId} + limit 1