Skip to content

M
mall.oytour.com
Commit 55a10f5a authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 01c2e7df
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 21 deletions
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
View file @ 55a10f5a
......@@ -30,6 +30,12 @@ namespace Mall.Model.Extend.Product
/// 单据状态 1已制单 2未制单
/// </summary>
public int? FinanceStatus { get; set; }
/// <summary>
/// 是否出库0-否， 1-是
/// </summary>
public int IsOut { get; set; }
/// <summary>
/// 会员优惠
/// </summary>
......
Mall.Model/Extend/Property/RB_WarehouseOut_Apply_Extend.cs
View file @ 55a10f5a
......@@ -36,5 +36,10 @@ namespace Mall.Model.Extend.Property
public string TenantName { get; set; }
/// <summary>
/// 0-未出库，1-已出库
/// </summary>
public int IsOut { get; set; }
}
}
Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs
View file @ 55a10f5a
......@@ -374,7 +374,15 @@ where {where} order by o.CreateDate desc";
/// <returns></returns>
public List<RB_Goods_OrderDetail_Extend> GetOrderGoodsList(RB_Goods_OrderDetail_Extend dmodel)
{
string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus=2";
string where = "";
if (dmodel.IsOut == 0)
{
where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus =2";
}
else
{
where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus in(2,3,4,5,6)";
}
string childreWhere = "";
if (dmodel.TenantId > 0)
{
......@@ -435,8 +443,10 @@ where {where} order by o.CreateDate desc";
{
where += $@" and od.{nameof(RB_Goods_OrderDetail.ProductCode)} like '%{dmodel.ProductCode}%'";
}
where += $"and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
if (dmodel.IsOut == 0)
{
where += $"and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
}
string sql = $@"SELECT od.*,o.OrderNo FROM rb_goods_orderdetail od
INNER JOIN rb_goods_order o on o.OrderId=od.OrderId
where {where} order by o.CreateDate desc";
......@@ -454,7 +464,16 @@ where {where} order by o.CreateDate desc";
/// <returns></returns>
public List<RB_Goods_OrderDetail_Extend> GetNoOutOrderGoodsList(int pageIndex, int pageSize, out long count, RB_Goods_OrderDetail_Extend dmodel)
{
string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus=2";
string where = "";
if (dmodel.IsOut == 0)
{
where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus =2";
}
else
{
where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus in(2,3,4,5,6)";
}
string childreWhere = "";
string outWhere = "";
if (dmodel.TenantId > 0)
......@@ -519,8 +538,16 @@ where {where} order by o.CreateDate desc";
where += $@" and od.{nameof(RB_Goods_OrderDetail.ProductCode)} like '%{dmodel.ProductCode}%'";
}
where += $" and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
where += @$" AND od.Id NOT IN (SELECT OrderGoodsId FROM {Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} )";
if (dmodel.IsOut == 0)
{
where += $" and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
where += @$" AND od.Id NOT IN (SELECT OrderGoodsId FROM {Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} )";
}
else if (dmodel.IsOut == 1)
{
where += $" and( od.Id in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
where += @$" or od.Id IN (SELECT OrderGoodsId FROM {Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} ))";
}
string sql = $@"SELECT od.*,o.OrderNo FROM rb_goods_orderdetail od
INNER JOIN rb_goods_order o on o.OrderId=od.OrderId
where {where} order by o.CreateDate desc";
......@@ -578,7 +605,8 @@ where {where} order by o.CreateDate desc";
{
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} ='{dmodel.OrderNo}'";
}
if (dmodel.UserId > 0) {
if (dmodel.UserId > 0)
{
where += $@" and o.{nameof(RB_Goods_Order.UserId)} ={dmodel.UserId}";
}
......
Mall.WebApi/Controllers/Property/WarehouseOutController.cs
View file @ 55a10f5a
......@@ -111,7 +111,8 @@ namespace Mall.WebApi.Controllers.Property
//根据订单商品id查询商品信息
var orderGoodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId));
var orderGoodsList = orderModule.GetOrderGoodsList(new Model.Extend.Product.RB_Goods_OrderDetail_Extend { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, IdList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).ToList() });
var orderGoodsList = orderModule.GetOrderGoodsList(new Model.Extend.Product.RB_Goods_OrderDetail_Extend { IsOut=demodel.IsOut,TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, IdList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).ToList() });
if (demodel.WarehouseOutGoodsList.GroupBy(x => x.OrderGoodsId).Count() != orderGoodsList.Count)
{
List<int> chajiList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).Except(orderGoodsList.Select(x => x.Id)).ToList();
......@@ -126,24 +127,27 @@ namespace Mall.WebApi.Controllers.Property
}
return ApiResult.Failed("订单号：" + msg + "的商品已出库/已取消");
}
//判断商品是否出库中
var oldOutGoods = warehouseOutModule.GetWarehouseOutListByIds(new RB_WarehouseOut_Goods_Extend { OrderGoodsIds = String.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId)), TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
if (oldOutGoods != null && oldOutGoods.Any())
if (demodel.IsOut == 0)
{
string msg = "";
foreach (var item in oldOutGoods)
//判断商品是否出库中
var oldOutGoods = warehouseOutModule.GetWarehouseOutListByIds(new RB_WarehouseOut_Goods_Extend { OrderGoodsIds = String.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId)), TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
if (oldOutGoods != null && oldOutGoods.Any())
{
msg += orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault()?.OrderNo + ",";
}
if (!string.IsNullOrWhiteSpace(msg))
{
msg = msg.TrimEnd(',');
string msg = "";
foreach (var item in oldOutGoods)
{
msg += orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault()?.OrderNo + ",";
}
if (!string.IsNullOrWhiteSpace(msg))
{
msg = msg.TrimEnd(',');
}
return ApiResult.Failed("订单号：" + msg + "的商品已申请出库,请勿重复申请");
}
return ApiResult.Failed("订单号：" + msg + "的商品已申请出库,请勿重复申请");
}
//获取商品的出库规格物料信息
var goodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.NewGoodsId));
// var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment