|
|
|
@ -1313,29 +1313,29 @@ public class WareHouseController {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
|
|
|
|
|
List<BussinessTypResponse> bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
|
|
|
|
|
FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
|
|
|
|
|
filterInvBusUserRequest.setSubInvCode(code);
|
|
|
|
|
List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
|
|
|
|
|
Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
|
|
|
|
|
for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
|
|
|
|
|
boolean isExit = false;
|
|
|
|
|
for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
|
|
|
|
|
if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
|
|
|
|
|
isExit = true;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!isExit) {
|
|
|
|
|
filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (filteBusTypes.size() > 0) {
|
|
|
|
|
String data = "";
|
|
|
|
|
for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
|
|
|
|
|
data = data + invBusUserResponse.getBillTypeName() + ",";
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.error(500, "单据类型:" + data + "已被用户关联,请先移除后修改!");
|
|
|
|
|
}
|
|
|
|
|
// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
|
|
|
|
|
// filterInvBusUserRequest.setSubInvCode(code);
|
|
|
|
|
// List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
|
|
|
|
|
// Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
|
|
|
|
|
// for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
|
|
|
|
|
// boolean isExit = false;
|
|
|
|
|
// for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
|
|
|
|
|
// if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
|
|
|
|
|
// isExit = true;
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (!isExit) {
|
|
|
|
|
// filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (filteBusTypes.size() > 0) {
|
|
|
|
|
// String data = "";
|
|
|
|
|
// for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
|
|
|
|
|
// data = data + invBusUserResponse.getBillTypeName() + ",";
|
|
|
|
|
// }
|
|
|
|
|
// return ResultVOUtils.error(500, "单据类型:" + data + "已被用户关联,请先移除后修改!");
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity =
|
|
|
|
|