|
|
@ -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.info.CompanyEntity;
|
|
|
|
import com.glxp.sale.admin.entity.inout.*;
|
|
|
|
import com.glxp.sale.admin.entity.inout.*;
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
|
|
|
|
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.param.SystemParamConfigEntity;
|
|
|
|
import com.glxp.sale.admin.entity.udid.UdiEntity;
|
|
|
|
import com.glxp.sale.admin.entity.udid.UdiEntity;
|
|
|
|
import com.glxp.sale.admin.exception.JsonException;
|
|
|
|
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.InvPreInProductDetailService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvPreProductDetailService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvPreProductDetailService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvProductDetailService;
|
|
|
|
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.service.param.SystemParamConfigService;
|
|
|
|
import com.glxp.sale.admin.thread.IoTransInoutService;
|
|
|
|
import com.glxp.sale.admin.thread.IoTransInoutService;
|
|
|
|
import com.glxp.sale.admin.util.*;
|
|
|
|
import com.glxp.sale.admin.util.*;
|
|
|
@ -105,6 +107,8 @@ public class WareHouseController {
|
|
|
|
private UdiInfoService udiInfoService;
|
|
|
|
private UdiInfoService udiInfoService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
InvWarehouseDao invWarehouseService;
|
|
|
|
InvWarehouseDao invWarehouseService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
InvSubWarehouseService invSubWarehouseService;
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@GetMapping("admin/warehouse/inout/list")
|
|
|
|
@GetMapping("admin/warehouse/inout/list")
|
|
|
@ -1204,8 +1208,10 @@ public class WareHouseController {
|
|
|
|
if (CollUtil.isEmpty(userList)) {
|
|
|
|
if (CollUtil.isEmpty(userList)) {
|
|
|
|
return ResultVOUtils.error(500, "用户列表不能为空");
|
|
|
|
return ResultVOUtils.error(500, "用户列表不能为空");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
warehouseUserService.saveWarehouseUser(code, userList);
|
|
|
|
warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class));
|
|
|
|
invWarehouseService.updateTime(code, new Date());
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity =
|
|
|
|
|
|
|
|
invSubWarehouseService.findByInvSubByCode(code);
|
|
|
|
|
|
|
|
invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date());
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1217,7 +1223,9 @@ public class WareHouseController {
|
|
|
|
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
|
|
|
|
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
|
|
|
|
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();
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1237,7 +1245,9 @@ public class WareHouseController {
|
|
|
|
if (null == id)
|
|
|
|
if (null == id)
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);
|
|
|
|
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);
|
|
|
|
warehouseUserService.deleteWarehouseUser(id);
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1248,7 +1258,10 @@ public class WareHouseController {
|
|
|
|
if (null == id)
|
|
|
|
if (null == id)
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id);
|
|
|
|
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);
|
|
|
|
warehouseBussinessTypeService.deleteWarehouseByssuinessType(id);
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
}
|
|
|
|
}
|
|
|
|