UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据验收，单据不显示问题

Browse Source
fencang
anthonyywj2 3 years ago
parent 664b4c47e3
commit 4fecb249ce
4 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File

50
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -22,6 +22,7 @@ import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest;
import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inout.OrderEditRequest; import com.glxp.sale.admin.res.inout.OrderEditRequest;
import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthAdminService;
@ -202,19 +203,19 @@ public class OrderController {
Integer userId = customerService.getUserId(); Integer userId = customerService.getUserId();
orderFilterRequest.setFromCorpId(null); orderFilterRequest.setFromCorpId(null);
orderFilterRequest.setUserId(userId); orderFilterRequest.setUserId(userId);
if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { // if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); // InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode());
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); // FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
filterInvUserRequest.setCode(invWarehouseEntity.getCode()); // filterInvUserRequest.setCode(invWarehouseEntity.getCode());
filterInvUserRequest.setUserid(userId.longValue()); // filterInvUserRequest.setUserid(userId.longValue());
filterInvUserRequest.setIsDirector(true); // filterInvUserRequest.setIsDirector(true);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); // List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
if (CollUtil.isEmpty(warehouseUserEntities)) { // if (CollUtil.isEmpty(warehouseUserEntities)) {
orderFilterRequest.setUnionUser(userId); // orderFilterRequest.setUnionUser(userId);
} // }
} else { // } else {
return ResultVOUtils.error(500, "请先选择当前仓库"); // return ResultVOUtils.error(500, "请先选择当前仓库");
} // }
} else { } else {
orderFilterRequest.setCustomerId(null); orderFilterRequest.setCustomerId(null);
@ -266,11 +267,20 @@ public class OrderController {
return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！"); return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！");
} else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { } else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) {
if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) { if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode()); List<WarehouseUserEntity> warehouseUserEntities = new ArrayList<>();
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); List<InvWarehouseEntity> invWarehouseEntities = new ArrayList<>();
filterInvUserRequest.setCode(invWarehouseEntity.getCode()); if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) {
filterInvUserRequest.setUserid(userId.longValue()); FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode());
filterInvUserRequest.setUserid(userId.longValue());
warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
} else {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode());
filterInvWarehouseRequest.setUserId(userId + "");
invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
}
List<EntrustReceEntity> entrustReceEntities = null; List<EntrustReceEntity> entrustReceEntities = null;
if (!stockOrderEntity.isEntrustEnd()) { if (!stockOrderEntity.isEntrustEnd()) {
BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest();
@ -281,7 +291,7 @@ public class OrderController {
} else { } else {
return ResultVOUtils.error(500, "单据已委托验收完成！"); return ResultVOUtils.error(500, "单据已委托验收完成！");
} }
if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities)) { if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities) && CollUtil.isEmpty(invWarehouseEntities)) {
return ResultVOUtils.error(500, "权限不足，无法验收！"); return ResultVOUtils.error(500, "权限不足，无法验收！");
} }
} }
@ -384,6 +394,7 @@ public class OrderController {
//修改往来单位及当前库存号 //修改往来单位及当前库存号
supplementOrder.setFromCorpId(orderEntity.getLocStorageCode()); supplementOrder.setFromCorpId(orderEntity.getLocStorageCode());
supplementOrder.setLocStorageCode(entrustReceEntity.getEntrustInv()); supplementOrder.setLocStorageCode(entrustReceEntity.getEntrustInv());
supplementOrder.setInvWarehouseCode(entrustReceEntity.getInvWarehouseCode());
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
supplementOrder.setFromCorp(name); supplementOrder.setFromCorp(name);
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
@ -400,6 +411,7 @@ public class OrderController {
supplementCode.setFromCorpId(supplementOrder.getFromCorpId()); supplementCode.setFromCorpId(supplementOrder.getFromCorpId());
supplementCode.setFromCorp(supplementOrder.getFromCorp()); supplementCode.setFromCorp(supplementOrder.getFromCorp());
supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode()); supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode());
supplementCode.setInvWarehouseCode(supplementOrder.getInvWarehouseCode());
supplementCode.setOrderId(supplementOrderNo); supplementCode.setOrderId(supplementOrderNo);
//查询补单设置 //查询补单设置
supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());

52
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
Unescape Escape View File

@ -268,19 +268,19 @@ public class StockOrderController {
Integer userId = customerService.getUserId(); Integer userId = customerService.getUserId();
stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUnitIdFk(null);
stockOrderFilterRequest.setUserId(customerService.getUserId()); stockOrderFilterRequest.setUserId(customerService.getUserId());
if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { // if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); // InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode());
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); // FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
filterInvUserRequest.setCode(invWarehouseEntity.getCode()); // filterInvUserRequest.setCode(invWarehouseEntity.getCode());
filterInvUserRequest.setUserid(userId.longValue()); // filterInvUserRequest.setUserid(userId.longValue());
filterInvUserRequest.setIsDirector(true); // filterInvUserRequest.setIsDirector(true);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); // List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
if (CollUtil.isEmpty(warehouseUserEntities)) { // if (CollUtil.isEmpty(warehouseUserEntities)) {
stockOrderFilterRequest.setUnionUser(userId); // stockOrderFilterRequest.setUnionUser(userId);
} // }
} else { // } else {
return ResultVOUtils.error(500, "请先选择当前仓库"); // return ResultVOUtils.error(500, "请先选择当前仓库");
} // }
} else } else
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
stockOrderFilterRequest.setCorpId(null); stockOrderFilterRequest.setCorpId(null);
@ -316,19 +316,19 @@ public class StockOrderController {
Integer userId = customerService.getUserId(); Integer userId = customerService.getUserId();
stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUnitIdFk(null);
stockOrderFilterRequest.setUserId(userId); stockOrderFilterRequest.setUserId(userId);
if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { // if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); // InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode());
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); // FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
filterInvUserRequest.setCode(invWarehouseEntity.getCode()); // filterInvUserRequest.setCode(invWarehouseEntity.getCode());
filterInvUserRequest.setUserid(userId.longValue()); // filterInvUserRequest.setUserid(userId.longValue());
filterInvUserRequest.setIsDirector(true); // filterInvUserRequest.setIsDirector(true);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); // List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
if (CollUtil.isEmpty(warehouseUserEntities)) { // if (CollUtil.isEmpty(warehouseUserEntities)) {
stockOrderFilterRequest.setUnionUser(userId); // stockOrderFilterRequest.setUnionUser(userId);
} // }
} else { // } else {
return ResultVOUtils.error(500, "请先选择当前仓库"); // return ResultVOUtils.error(500, "请先选择当前仓库");
} // }
} else { } else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId));
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());

2
api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java
Unescape Escape View File

@ -9,9 +9,7 @@ public class FilterInvUserRequest extends ListPageRequest {
private Integer id; private Integer id;
private String code; private String code;
private Long userid; private Long userid;
private String username; private String username;
private Boolean isDirector; private Boolean isDirector;

1
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -192,6 +192,7 @@ public class IoTransInoutService {
orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); orderSaveRequest.setCreateUser(postOrderRequest.getUserId());
} }
orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode());
orderSaveRequest.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode());
orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction());
orderSaveRequest.setReceiveStatus(0); orderSaveRequest.setReceiveStatus(0);
orderSaveRequest.setPreCheck(postOrder.isPreCheck()); orderSaveRequest.setPreCheck(postOrder.isPreCheck());

Write Preview
Loading…
Cancel
Save