禅道bug修改，自助同步到UDI管理

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java

@@ -24,7 +24,7 @@ public class InvProductResponse {
     private String invStorageCode;
     private String invStorageName;
     private String invSubStorageName;
-
+    private String invWarehouseCode;
 
     private String price;
 

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java

@@ -29,4 +29,5 @@ public interface InvSubWarehouseService {
 
     boolean deleteByParentCode(String code);
 
+    public boolean checkDuplicateName(String parentId, String name);
 }

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

@@ -152,7 +152,7 @@ public class DlBasicService {
                         //仓库用户表
                         if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
                             for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
-                                warehouseUserDao.insertOrUpdate(warehouseUserEntity);
+                                warehouseUserDao.insert(warehouseUserEntity);
                             }
                             remark.append("仓库用户：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n");
                         }
@@ -160,7 +160,7 @@ public class DlBasicService {
                         //仓库单据类型表
                         if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) {
                             for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) {
-                                warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity);
+                                warehouseBussinessTypeDao.insert(warehouseUserEntity);
                             }
                             remark.append("仓库单据：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n");
                         }

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

@@ -122,6 +122,7 @@
         ,inv_prein_product.reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName
+        ,inv_product.invWarehouseCode
         FROM inv_prein_product
         inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid

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

@@ -121,6 +121,7 @@
         ,inv_pre_product.reCount,inv_pre_product.customerId,
         basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name
         invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price,inv_warehouse_sub.name invSubStorageName
+        ,inv_product.invWarehouseCode
         FROM inv_pre_product
         inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid

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

@@ -118,6 +118,7 @@
         inv_product.inCount,inv_product.outCount
         ,inv_product.reCount,inv_product.customerId,basic_corp.name companyName,inv_product.unitFk,inv_product.supId
         ,inv_warehouse.name invStorageName,inv_product.invStorageCode,inv_product.price,inv_warehouse_sub.name invSubStorageName
+        ,inv_product.invWarehouseCode
         FROM inv_product
         inner join basic_udirel on inv_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid