Skip to content

M
mall.oytour.com
Commit 9b395c9d authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 7c18de02
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
Mall.Module.Product/OrderModule.cs
View file @ 9b395c9d
......@@ -7219,6 +7219,13 @@ namespace Mall.Module.Product
if (financeConfigurineList != null && financeConfigurineList.Any())
{
var item = financeConfigurineList.FirstOrDefault();
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = dmodel.OrderId ?? 0 });
string Remark1 = "";
if (dlist.Any()) {
foreach (var qqitem in dlist) {
Remark1 += qqitem.GoodsName + " " + qqitem.Specification + " ";
}
}
var detailList = new List<object>() {
new
{
......@@ -7226,11 +7233,10 @@ namespace Mall.Module.Product
Number = 1,
OriginalMoney = Money,
UnitPrice = Money,
Remark = "订单号：" + omodel.OrderNo + "售后单号：" + (dmodel.ReOrderNo ?? "暂无") + " " + dstr
Remark = Remark1 + "单号：" + omodel.OrderNo + "售后单号：" + (dmodel.ReOrderNo ?? "暂无") + " " + dstr
}
};
List<RB_ECFinanceId_Relation> ECList = new List<RB_ECFinanceId_Relation>();
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = dmodel.OrderId ?? 0 });
foreach (var qitem in dlist)
{
ECList.Add(new RB_ECFinanceId_Relation()
......@@ -8303,6 +8309,13 @@ namespace Mall.Module.Product
if (financeConfigurineList != null && financeConfigurineList.Any())
{
var item = financeConfigurineList.FirstOrDefault();
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = omodel.OrderId });
string Remark1 = "";
if (dlist.Any()) {
foreach (var qqitem in dlist) {
Remark1 += qqitem.GoodsName + " " + qqitem.Specification + " ";
}
}
var detailList = new List<object>() {
new
{
......@@ -8310,7 +8323,7 @@ namespace Mall.Module.Product
Number = 1,
OriginalMoney = Money,
UnitPrice = Money,
Remark = "订单号：" + omodel.OrderNo + " " + dstr
Remark = Remark1 + "单号：" + omodel.OrderNo + " " + dstr
}
};
......@@ -8321,7 +8334,6 @@ namespace Mall.Module.Product
Remark = "后台强制取消该订单，用户名称:" + umodel.Name + "(" + umodel.Id + ")" + " " + System.DateTime.Now.ToString("yyyy年MM月dd日") + " 自动生成财务单据（ERP下单）";
}
List<RB_ECFinanceId_Relation> ECList = new List<RB_ECFinanceId_Relation>();
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = omodel.OrderId });
foreach (var qitem in dlist)
{
ECList.Add(new RB_ECFinanceId_Relation()
......
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