Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Module.Product/OrderModule.cs

@@ -8139,6 +8139,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
                         {
@@ -8146,11 +8153,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()
@@ -8174,7 +8180,7 @@ namespace Mall.Module.Product
                         TemplateId = item.WorkFlowId,
                         OrderSource = 16,
                         OtherType = 23,
-                        ReFinanceId = dmodel.ReOrderId,
+                        ReFinanceId = dmodel.OrderId ?? 0,
                         Remark = "名称:" + umodel.Name + "(" + umodel.Id + ")" + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据(erp订单)",
                         detailList,
                         RB_Depart_Id = Config.ExpendDepartment,
@@ -9359,6 +9365,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
                         {
@@ -9366,7 +9379,7 @@ namespace Mall.Module.Product
                             Number = 1,
                             OriginalMoney = Money,
                             UnitPrice = Money,
-                            Remark = "订单号：" + omodel.OrderNo  + "   " + dstr
+                            Remark = Remark1 + "单号：" + omodel.OrderNo  + "   " + dstr
                         }
                     };
 
@@ -9377,7 +9390,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()