diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 6cde1f5..7b8486b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -152,6 +152,13 @@ public class SpsSyncUploadController { remark.append("仓库字典:").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } + if (CollUtil.isNotEmpty(syncDataResponse.getInvSubWarehouseEntities())) { + + for (InvSubWarehouseEntity invSubWarehouseEntity : syncDataResponse.getInvSubWarehouseEntities()) { + invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity); + } + } + //仓库用户表 if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index d2c31c5..efd52bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -16,6 +16,7 @@ import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; @@ -39,6 +40,7 @@ import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvPreInProductDetailService; import com.glxp.sale.admin.service.inventory.InvPreProductDetailService; import com.glxp.sale.admin.service.inventory.InvProductDetailService; +import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.*; @@ -105,6 +107,8 @@ public class WareHouseController { private UdiInfoService udiInfoService; @Resource InvWarehouseDao invWarehouseService; + @Resource + InvSubWarehouseService invSubWarehouseService; @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/list") @@ -1204,8 +1208,10 @@ public class WareHouseController { if (CollUtil.isEmpty(userList)) { return ResultVOUtils.error(500, "用户列表不能为空"); } - warehouseUserService.saveWarehouseUser(code, userList); - invWarehouseService.updateTime(code, new Date()); + warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class)); + InvSubWarehouseEntity invSubWarehouseEntity = + invSubWarehouseService.findByInvSubByCode(code); + invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); return ResultVOUtils.success(); } @@ -1217,7 +1223,9 @@ public class WareHouseController { if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class)); - invWarehouseService.updateTime(code, new Date()); + InvSubWarehouseEntity invSubWarehouseEntity = + invSubWarehouseService.findByInvSubByCode(code); + invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); return ResultVOUtils.success(); } @@ -1237,7 +1245,9 @@ public class WareHouseController { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); - invWarehouseService.updateTime(warehouseUserEntity.getCode(), new Date()); + InvSubWarehouseEntity invSubWarehouseEntity = + invSubWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode()); + invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); warehouseUserService.deleteWarehouseUser(id); return ResultVOUtils.success(); } @@ -1248,7 +1258,10 @@ public class WareHouseController { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id); - invWarehouseService.updateTime(warehouseBussinessTypeEntity.getCode(), new Date()); + + InvSubWarehouseEntity invSubWarehouseEntity = + invSubWarehouseService.findByInvSubByCode(warehouseBussinessTypeEntity.getCode()); + invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); warehouseBussinessTypeService.deleteWarehouseByssuinessType(id); return ResultVOUtils.success(); }