修正調整很多東西

web/App_Code/api/activityController.cs

@@ -1053,6 +1053,105 @@ public class activityController : ApiController
         }
     }
 
+
+    [HttpPost]
+    [Route("api/activity/GetActRelaList1")]
+    public IHttpActionResult GetActRelaList1([FromBody] Model.activity q,string order_no,int actItem_num)
+    {   //if pagesize==-1 get all data
+        int this_act_id = q.num;
+        if (this_act_id > 0)
+        {
+            //檢查
+            var prod = _db.activities.Where(o => o.num == this_act_id).FirstOrDefault();
+            if (prod != null)
+            {
+                int kind = prod.kind ?? 0; //分類
+
+                var qry = _db.activity_relating.AsQueryable();
+                qry = qry.Where(o => o.activity_num == this_act_id);
+                qry = qry.OrderBy(o => o.num);
+                //IEnumerable<Model.activity_relating> qry1=qry.AsEnumerable();
+                IEnumerable<Model.activity_relating> qry1 = null;
+
+                //var retD = qry1;
+                var count = qry.Count(); //pageSize = count;//一次取回??
+                if (count > 0)
+                {
+                    int i = 1;
+
+                    qry1 = qry.ToList();
+
+                    var orderDetails = _db.pro_order_detail
+                        .Where(o => o.pro_order.activity_num == this_act_id&&o.order_no==order_no&&o.actItem_num==actItem_num)
+                        .ToList();
+                    var ret = new
+                    {
+                        //list = qry1.ToPagedList(page, pageSize).Select(x => new
+                        list = qry1.Select(x => new
+                        {
+                            id = i++,
+                            num = x.num,
+
+                            activity_num = x.activity_num,
+                            act_item_selected = new
+                            {
+                                text = x.actItem?.subject,
+                                val = x.actItem_num,
+                                style = x.actItem.defaultStyle
+                            },
+                            price = x.price ?? 0,
+                            qty = x.qty ?? 0,
+                            has_yang_limit = x.has_yang_limit ?? false,
+                            has_chao_limit = x.has_yang_limit ?? false,
+                            yang_limit_count = x.yang_limit_count ?? 0,
+                            chao_limit_count = x.chao_limit_count ?? 0,
+                            files = x.actItem?.actItem_files.Select(f => new
+                            {
+                                num = f.file.num,
+                                subject = f.file.subject,
+                                list = orderDetails
+                                    .Where(o => o.actItem_num == x.actItem_num)
+                                    .OrderBy(o => o.print_id)
+                                    .ThenBy(o => o.num)
+                                    .Select(o => new
+                                    {
+                                        num = o.num,
+                                        print_id = o.print_id,
+                                        order_no = o.order_no,
+                                        from_id = o.follower1?.u_name,
+                                        printed_files = o.printed_files,
+                                        isPrinted = (o.printed_files ?? "").Contains("\"" + f.file.num.ToString() + "\""),
+                                    }),
+                            }),
+                        }),
+                        count = count,
+                    };
+
+
+                    if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
+                    return Ok(ret);
+
+                }
+                else
+                {
+                    return Ok(new {result="N",message="沒有資料"});
+                }
+            }
+            else
+            {
+                //return NotFound();
+                return Ok(new { result = "N", message = $"找不到活動 {q.num}" });
+            }
+
+        }
+        else
+        {
+            return NotFound();
+        }
+
+
+    }
+
     [HttpPost]
     [Route("api/activity/GetActRelaList")]
     public IHttpActionResult GetActRelaList([FromBody] Model.activity q, int page, int pageSize = 100,

web/App_Code/api/orderController.cs

@@ -1299,13 +1299,33 @@ public class orderController : ApiController
         return NotFound();
     }
 
+    [HttpPost]
+    [Route("api/order/printMultiFileLogNew")]
+    public IHttpActionResult printMultiFileLogNew([FromBody] List<int> list, int item, int file)
+    {
+        string _num = "\"" + file.ToString() + "\"";
+
+        var order = _db.pro_order_detail.Where(q => list.Any(a => a == q.num)).ToList();
+        if (order.Count > 0)
+        {
+            foreach (var row in order)
+                row.printed_files = (row.printed_files ?? "") + _num + ",";
+
+            _db.SaveChanges();
+            return Ok();
+        }
+
+        return NotFound();
+    }
+
     [HttpPost]
     [Route("api/order/printMultiFileLog")]
     public IHttpActionResult printMultiFileLog([FromBody] List<int> list, int item, int file)
     {
         string _num = "\"" + file.ToString() + "\"";
 
-        var order = _db.pro_order_detail.Where(q => list.Any(a => a == q.num) && !((q.printed_files ?? "").Contains(_num))).ToList();
+        var order = _db.pro_order_detail.Where(q => list.Any(a => a == q.num) 
+        && !((q.printed_files ?? "").Contains(_num))).ToList();
         if (order.Count > 0)
         {
             foreach (var row in order)