Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解析组合明细

Browse Source
This commit is contained in:
余宇波 2025-11-26 11:56:51 +08:00
parent f4c90b94e5
commit 7865e924dd
3 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
View File

@ -64,7 +64,7 @@ namespace MyCode.Project.Infrastructure.JackYun
/// </summary>
public string outerId { get; set; }
/// <summary>
///
/// 组合装标记
/// </summary>
public decimal isFit { get; set; }
/// <summary>
@ -143,10 +143,15 @@ namespace MyCode.Project.Infrastructure.JackYun
///
/// </summary>
public string mainPostid { get; set; }
///// <summary>
///// 组合装子件列表
///// </summary>
//public List<object> tradeOrderAssemblyGoodsDtoList { get; set; }
/// <summary>
/// 组合装标记
/// </summary>
public decimal isFit { get; set; }
/// <summary>
/// 组合装子件列表
/// </summary>
public List<ComboItem> tradeOrderAssemblyGoodsDtoList { get; set; }
/// <summary>
/// 珠海市臻美服饰有限公司
/// </summary>
@ -247,6 +252,9 @@ namespace MyCode.Project.Infrastructure.JackYun
/// </summary>
public List<TradesItem> trades { get; set; }
/// <summary>
/// 游标id。用于下次请求入参
/// </summary>
@ -281,6 +289,38 @@ namespace MyCode.Project.Infrastructure.JackYun
public string pageInfo { get; set; }
}
public class ComboItem
{
// 货品基础信息
public string GoodsNo { get; set; }
public string GoodsName { get; set; }
public string GoodsId { get; set; }
// 规格信息
public string SpecId { get; set; }
public string SpecName { get; set; }
/// <summary>
/// 条码
/// </summary>
public string Barcode { get; set; }
/// <summary>
/// 销售数量
/// </summary>
public decimal SellCount { get; set; }
public string Unit { get; set; }
public decimal BaseUnitSellCount { get; set; }
// 交易信息
public decimal TradeId { get; set; }
public decimal SubTradeId { get; set; }
}
//public class TradeFullinfogetResp
//{
// /// <summary>

22
Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
View File

@ -100,12 +100,30 @@ namespace MyCode.Project.Services.Implementation
jackOrders.CreateTime = DateTime.Now;
if (t.goodsDetail != null)
{
var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, GoodsDetailItem>(t.goodsDetail);
var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, GoodsDetailItem>(t.goodsDetail);
items = items.Where(h => h.IsFit == 0).ToList();
items.ForEach(k =>
{
k.Id = Guid.NewGuid();
k.JackOrdersId = jackOrders.Id;
});
ordersItemList.AddRange(items);
jackOrdersList.Add(jackOrders);
}
if(t.tradeOrderAssemblyGoodsDtoList!=null &&t.tradeOrderAssemblyGoodsDtoList.Count>0)
{
var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, ComboItem>(t.tradeOrderAssemblyGoodsDtoList);
items.ForEach(k =>
{
k.Id = Guid.NewGuid();
k.JackOrdersId = jackOrders.Id;
});
jackOrdersList.Add(jackOrders);
ordersItemList.AddRange(items);
}
}

2
Reportapi/MyCode.Project.Services/Implementation/PurchaseStockInService.cs
View File

@ -108,7 +108,7 @@ namespace MyCode.Project.Services.Implementation
// 从BusiOrderGoodsDocIn表获取明细数据
var detailList = _busiOrderGoodsDocInRepository
.Queryable()
.Where(t => t.InOutDate2.Value.ToString("yyyy-MM-dd") == goodsDocIn.InOutDate2.Value.ToString("yyyy-MM-dd") && t.VendCode==goodsDocIn.VendCode )
.Where(t => t.InOutDate2.Value.ToString("yyyy-MM-dd") == goodsDocIn.InOutDate2.Value.ToString("yyyy-MM-dd") && t.VendCode==goodsDocIn.VendCode && t.Status==1 )
.ToList();
if (detailList == null || detailList.Count == 0)