中继服务同步问题，排序问题

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

@@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
 import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
@@ -27,6 +28,7 @@ import com.glxp.sale.admin.service.basic.BasicDownloadService;
 import com.glxp.sale.admin.service.basic.BussinessChangeTypeService;
 import com.glxp.sale.admin.service.basic.EntrustReceService;
 import com.glxp.sale.admin.service.inout.OrderService;
+import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
@@ -73,6 +75,8 @@ public class SpsSyncUploadController {
     private BasicDownloadService basicDownloadService;
     @Resource
     private SystemParamConfigService systemParamConfigService;
+    @Resource
+    InvSubWarehouseService invSubWarehouseService;
 
     @PostMapping("sps/sync/basic/upload")
     public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
@@ -132,12 +136,17 @@ public class SpsSyncUploadController {
         //仓库字典导入
         if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) {
 
-            List<InvWarehouseEntity> invWarehouseEntities = syncDataResponse.getInvWarehouseEntities();
-            for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
+            for (InvWarehouseEntity invWarehouseEntity : syncDataResponse.getInvWarehouseEntities()) {
                 invWarehouseEntity.setUpdateTime(null);
-                warehouseUserDao.deleteByCode(invWarehouseEntity.getCode());
-                warehouseBussinessTypeDao.deleteByCode(invWarehouseEntity.getCode());
 
+                List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode());
+                if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
+                    for (InvSubWarehouseEntity invSubWarehouseEntity : invSubWarehouseEntities) {
+                        warehouseUserDao.deleteByCode(invSubWarehouseEntity.getCode());
+                        warehouseBussinessTypeDao.deleteByCode(invSubWarehouseEntity.getCode());
+                    }
+                }
+                invSubWarehouseService.deleteByParentCode(invWarehouseEntity.getCode());
             }
             invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities());
             remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n");

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -223,7 +223,7 @@ public class InvWarehouseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (invWarehouseEntity.getPid() == null) {//仓库
+        if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库
             invWarehouseEntity.setPid(0); // 默认设置
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
             filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java

@@ -26,4 +26,7 @@ public interface InvSubWarehouseDao {
 
     boolean deleteById(String id);
 
+    boolean deleteByParentCode(@Param("code") String code);
+
+
 }

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

@@ -27,5 +27,6 @@ public interface InvSubWarehouseService {
 
     boolean deleteById(String id);
 
+    boolean deleteByParentCode(String code);
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -96,4 +96,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
     public boolean deleteById(String id) {
         return invSubWarehouseDao.deleteById(id);
     }
+
+    @Override
+    public boolean deleteByParentCode(String code) {
+        return invSubWarehouseDao.deleteByParentCode(code);
+    }
 }

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

@@ -14,6 +14,7 @@
                 and `key` = #{key}
             </if>
         </where>
+        order by updateTime desc
     </select>
 
 

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

@@ -88,7 +88,11 @@
         FROM inv_warehouse_sub
         WHERE id = #{id}
     </delete>
-
+    <delete id="deleteByParentCode" parameterType="Map">
+        DELETE
+        FROM inv_warehouse_sub
+        WHERE parentId = #{code}
+    </delete>
     <update id="updateInvSubWarehouse" parameterType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
         UPDATE inv_warehouse_sub
         <trim prefix="set" suffixOverrides=",">