調整
This commit is contained in:
@@ -391,6 +391,7 @@ public class orderController : ApiController
|
||||
o_detail.qty = detail.qty;
|
||||
o_detail.printed_files = detail.printed_files;
|
||||
o_detail.style = detail.style;
|
||||
o_detail.print_id = GenerateSequentialId(o_detail, order);
|
||||
Newtonsoft.Json.Linq.JArray mid_items = new Newtonsoft.Json.Linq.JArray();
|
||||
foreach (var data in detail.mid_items)
|
||||
{
|
||||
@@ -514,6 +515,8 @@ public class orderController : ApiController
|
||||
qry = qry.Where(o => o.f_num != null && o.follower != null && encrypt.DecryptAutoKey(o.follower.id_code) == q.f_user.id_code);
|
||||
}
|
||||
|
||||
sortBy = sortBy ?? string.Empty;
|
||||
|
||||
if (sortBy.Equals("order_no"))
|
||||
{
|
||||
if (sortDesc)
|
||||
@@ -580,6 +583,7 @@ public class orderController : ApiController
|
||||
uptime=x.up_time?.ToString("yyyy-MM-dd"),
|
||||
keyin1_txt = Model.pro_order.keyin1_value_to_text(x.keyin1),
|
||||
status = x.activity.activity_check.FirstOrDefault(a => x.activity_num == a.activity_num && x.f_num == a.f_num)?.status ?? 0,
|
||||
amt = _db.pro_order_detail.Where(y => y.order_no == x.order_no).Select(y => new {y.price,y.qty}).Sum(y => y.price*y.qty),
|
||||
}),
|
||||
count = count
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user