订单管理： 订单数量默认1 列表 订单类别 显示三级 收货人默认客户资料的收货人 订单批量打印 打印需要批量打印 回访：需要增加 接待人，回访情况，...

username@email.com

2021-07-09 fd865638a82d6691a7904ce1aaccff1e050c7c14

 zhengcaioa/Services/CooperOrderService.cs

@@ -82,6 +82,12 @@
                    updateproject.Modifier = entity.Modifier;
                    updateproject.Modifytime = entity.Modifytime;

                    updateproject.SonghuoGongsi = entity.SonghuoGongsi;
                    updateproject.SonghuoDanhao = entity.SonghuoDanhao;
                    updateproject.SonghuoTime1 = entity.SonghuoTime1;
                    updateproject.HuifangJdr = entity.HuifangJdr;
                    updateproject.HuifangKehuyijian = entity.HuifangKehuyijian;

                }

                _context.SaveChanges();
@@ -205,6 +211,16 @@
                      into ksssss
                         from kkk in ksssss.DefaultIfEmpty()

                         join l in _context.FiBooks 
                    on a.OrderType1 equals l.Id
                    into lsssss
                         from lll in lsssss.DefaultIfEmpty()

                         join m in _context.FiMembers 
                   on a.OrderType1 equals m.Id
                   into msssss
                         from mmm in msssss.DefaultIfEmpty()

                         where a.RecStatus == "A"
                          && (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
                                    && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -288,6 +304,13 @@
                             YouhuiStatus = kkk.Id,
                             OrderType1 = a.OrderType1,
                             OrderType2 = a.OrderType2,
                             OrderType1Name = string.IsNullOrEmpty(lll.BookName)? string.IsNullOrEmpty(mmm.MemberType)? a.OrderType1 : mmm.MemberType : lll.BookName,

                             SonghuoGongsi = a.SonghuoGongsi,
                             SonghuoDanhao = a.SonghuoDanhao,
                             SonghuoTime1 = a.SonghuoTime1,
                             HuifangJdr = a.HuifangJdr,
                             HuifangKehuyijian = a.HuifangKehuyijian,
                         }
                ).OrderByDescending(x => x.OrderNo).ToList();

@@ -416,8 +439,11 @@
                updateproject.SonghuoStatus = dto.SonghuoStatus;
                updateproject.Songhuoer = dto.Songhuoer;
                updateproject.Songhuotime = dto.Songhuotime;
                updateproject.ShouliStatus = dto.ShouliStatus;


                updateproject.SonghuoTime1 = dto.SonghuoTime1;
                updateproject.SonghuoDanhao = dto.SonghuoDanhao;
                updateproject.SonghuoGongsi = dto.SonghuoGongsi;

                _context.SaveChanges();
                resultEntity.ReturnID = dto.Id;
@@ -480,13 +506,13 @@
                var updateproject = _context.CooperOrders.Find(dto.Id);




                updateproject.HuifangKehuyijian = dto.HuifangKehuyijian;
                updateproject.HuifangJdr =    dto.HuifangJdr;
                updateproject.Huifanger = dto.Huifanger;
                updateproject.Huifangtime = dto.Huifangtime;
                updateproject.HuifangStatus = dto.HuifangStatus;
                updateproject.Huifangremark = dto.Huifangremark;

                updateproject.PingjiaStatus = dto.PingjiaStatus;

                _context.SaveChanges();
                resultEntity.ReturnID = dto.Id;