Merge remote-tracking branch 'origin/master'

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

@@ -114,6 +114,9 @@ public class DlBasicService {
 
                             for (InvWarehouseEntity invWarehouseEntity : syncDataResponse.getInvWarehouseEntities()) {
                                 invWarehouseEntity.setUpdateTime(null);
+                                warehouseUserDao.deleteByCode(invWarehouseEntity.getCode());
+                                warehouseBussinessTypeDao.deleteByCode(invWarehouseEntity.getCode());
+
                             }
 
                             invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities());

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

@@ -90,21 +90,27 @@ public class UpBasicService {
             BeanUtils.copyProperties(spsSyncDataRequest, filterInvWarehouseRequest);
             List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
             syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
-
             if (CollUtil.isNotEmpty(invWarehouseEntities)) {
+
+                List<WarehouseBussinessTypeEntity> mWarehouseBussinessTypeEntities = new ArrayList<>();
+                List<WarehouseUserEntity> mWarehouseUserEntities = new ArrayList<>();
+                for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
                     //仓库关联单据类型
                     FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
-                BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
+                    filterInvBusTypeRequest.setCode(invWarehouseEntity.getCode());
                     List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
-                syncDataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities);
-
+                    mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities);
                     //仓库关联用户
                     FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
-                BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
+                    filterInvUserRequest.setCode(invWarehouseEntity.getCode());
                     List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
-                syncDataResponse.setWarehouseUserEntities(warehouseUserEntities);
+                    mWarehouseUserEntities.addAll(warehouseUserEntities);
+
                 }
+                syncDataResponse.setWarehouseUserEntities(mWarehouseUserEntities);
+                syncDataResponse.setWarehouseBussinessTypeEntities(mWarehouseBussinessTypeEntities);
 
+            }
 
         }