不根据登录人获取仓库id 用前端传的;
This commit is contained in:
+2
-2
@@ -66,8 +66,8 @@ public class PickingOrderApplicationService {
|
|||||||
if (topOrganizationId != null && topOrganizationId != 1){
|
if (topOrganizationId != null && topOrganizationId != 1){
|
||||||
pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
||||||
}
|
}
|
||||||
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
|
//AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
|
||||||
pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
|
//pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
|
||||||
}
|
}
|
||||||
List<PickingOrderPO> pickingOrderPOList = pickingOrderDomainService.queryList(pickingOrderDO);
|
List<PickingOrderPO> pickingOrderPOList = pickingOrderDomainService.queryList(pickingOrderDO);
|
||||||
|
|
||||||
|
|||||||
+4
-1
@@ -332,7 +332,10 @@ public class StockReceiptOrderDomainService {
|
|||||||
public Boolean taskDistribution(StockReceiptOrderDO stockReceiptOrderDO) {
|
public Boolean taskDistribution(StockReceiptOrderDO stockReceiptOrderDO) {
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
StockReceiptOrderDO stockReceiptOrderDOQuery = new StockReceiptOrderDO();
|
StockReceiptOrderDO stockReceiptOrderDOQuery = new StockReceiptOrderDO();
|
||||||
stockReceiptOrderDOQuery.setReceiptOrderIds(stockReceiptOrderDO.getReceiptOrderIds());
|
List<Long> receiptOrderIds = stockReceiptOrderDO.getReceiptOrderIds();
|
||||||
|
if (receiptOrderIds == null || receiptOrderIds.size() == 0) {
|
||||||
|
throw new ServiceException("未选择收货单,或收货单不存在");
|
||||||
|
}
|
||||||
stockReceiptOrderDOQuery.setTaskDistribution(2);
|
stockReceiptOrderDOQuery.setTaskDistribution(2);
|
||||||
List<StockReceiptOrderPO> stockReceiptOrderPOList = stockReceiptOrderService.queryList(stockReceiptOrderDOQuery);
|
List<StockReceiptOrderPO> stockReceiptOrderPOList = stockReceiptOrderService.queryList(stockReceiptOrderDOQuery);
|
||||||
if (CollectionUtils.isEmpty(stockReceiptOrderPOList)) {
|
if (CollectionUtils.isEmpty(stockReceiptOrderPOList)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user