|
|
|
@ -27,6 +27,7 @@ import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inout.*;
|
|
|
|
|
import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
|
|
|
|
|
import com.glxp.sale.admin.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.sale.admin.res.basic.BussinessTypResponse;
|
|
|
|
|
import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
|
|
|
|
@ -305,6 +306,8 @@ public class WareHouseController {
|
|
|
|
|
orderEntity1.setPreCheck(addOrderRequest.isPreCheck());
|
|
|
|
|
orderEntity1.setUpdateTime(new Date());
|
|
|
|
|
orderEntity1.setCodeFillCheck(addOrderRequest.isCodeFillCheck());
|
|
|
|
|
orderEntity1.setInvStorageCode(addOrderRequest.getInvStorageCode());
|
|
|
|
|
orderEntity1.setSubInvCode(addOrderRequest.getSubInvCode());
|
|
|
|
|
orderService.updateOrder(orderEntity1);
|
|
|
|
|
WarehouseEntity warehouseEntity = new WarehouseEntity();
|
|
|
|
|
warehouseEntity.setOrderId(addOrderRequest.getOrderId());
|
|
|
|
@ -1277,36 +1280,29 @@ public class WareHouseController {
|
|
|
|
|
public BaseResponse saveWarehouseUser(@RequestBody Map<String, Object> params) {
|
|
|
|
|
String code = String.valueOf(params.get("code"));
|
|
|
|
|
String userListJson = String.valueOf(params.get("userList"));
|
|
|
|
|
if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson)) {
|
|
|
|
|
if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson))
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
|
List<AuthAdmin> userList = JSONUtil.toList(userListJson, AuthAdmin.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 (AuthAdmin authAdmin : userList) {
|
|
|
|
|
if (authAdmin.getId() == Long.parseLong(invBusUserEntity.getUserId())) {
|
|
|
|
|
isExit = true;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!isExit) {
|
|
|
|
|
filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity);
|
|
|
|
|
//取出选中的userId
|
|
|
|
|
List<Long> list = userList .stream().map(AuthAdmin::getId).distinct().collect(Collectors.toList());
|
|
|
|
|
//查询该仓库下面绑定的用户
|
|
|
|
|
FilterInvUserRequest filterInvUserRequest=new FilterInvUserRequest();
|
|
|
|
|
filterInvUserRequest.setCode(code);
|
|
|
|
|
filterInvUserRequest.setUserList(list);
|
|
|
|
|
List<WarehouseUserEntity> filterList=warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
|
|
|
|
|
list = filterList .stream().map(WarehouseUserEntity::getUserid).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
if(list.size()>0){
|
|
|
|
|
//获取用户关联单据类型信息
|
|
|
|
|
FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
|
|
|
|
|
filterInvBusUserRequest.setSubInvCode(code);
|
|
|
|
|
filterInvBusUserRequest.setUserList(list);
|
|
|
|
|
List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
|
|
|
|
|
if (invBusUserEntities.size() > 0) {
|
|
|
|
|
return ResultVOUtils.error(500, "请先移除用户已关联单据类型!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (filteBusTypes.size() > 0) {
|
|
|
|
|
return ResultVOUtils.error(500, "请先移除用户已关联单据类型!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if (CollUtil.isEmpty(userList)) {
|
|
|
|
|
// return ResultVOUtils.error(500, "用户列表不能为空");
|
|
|
|
|
// }
|
|
|
|
|
warehouseUserService.saveWarehouseUser(code, userList);
|
|
|
|
|
InvSubWarehouseEntity invSubWarehouseEntity =
|
|
|
|
|
invSubWarehouseService.findByInvSubByCode(code);
|
|
|
|
|