From 28137093fdd7ab9ddd4edfe1774a6f7024166730 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 03 十二月 2024 21:27:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

---
 Tiger.Business.MES/iERP/U9C_MES.cs |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index ba786d4..48b6654 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -78,12 +78,14 @@
                             Accuracy = (di["Accuracy"] ?? "").ToString(),
                             Remark = (di["Remark"] ?? "").ToString(),
                             Packaging = (di["Packaging"] ?? "").ToString(),
+                            SapCode = (di["Code1"] ?? "").ToString(),
                         };
                         itemExts.Add(extInfo);
                     }
                 }
             }
             Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
             {
                 if (items.Any())
@@ -117,7 +119,7 @@
                                     .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
                                     .ToStorage();
                              y.AsInsertable.ExecuteCommand();
-                             y.AsUpdateable.ExecuteCommand();
+                             y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                          });
                     }
                     else
@@ -136,6 +138,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -205,15 +208,15 @@
                 db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
                 if (items.Any())
                 {
-                    if (items.Count > 150)
+                    if (items.Count > 100)
                     {
-                        db.Utilities.PageEach(items, 1000, pageList =>
+                        db.Utilities.PageEach(items, 100, pageList =>
                         {
                             var y = db.Storageable(pageList, "U9C")
                                    .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                                    .ToStorage();
-                            y.BulkCopy();
-                            y.BulkUpdate();
+                            y.AsInsertable.ExecuteCommand();
+                            y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                         });
                     }
                     else
@@ -282,11 +285,7 @@
                     {
                         if (woList.Any())
                         {
-                            var s = _db.Storageable(woList, "U9C")
-                                   .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
-                                   .ToStorage();
-                            s.AsInsertable.ExecuteCommand();
-                            s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(x => new { x.ROUTE_STATUS}).ExecuteCommand();
+                            _db.Updateable(woList, "U9C").UpdateColumns(x => new { x.ROUTE_STATUS }).ExecuteCommand();
                         }
 
                     });
@@ -340,6 +339,7 @@
                 }
             }
             Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
                 {
                     if (items.Any())
@@ -372,6 +372,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -412,6 +413,7 @@
                 }
             }
             Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
             {
                 if (items.Any())
@@ -444,6 +446,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
+            action.Message = $"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -489,6 +492,7 @@
                 }
             }
             Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
             {
                 if (items.Any())
@@ -521,6 +525,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -564,7 +569,7 @@
                             CUST_PREFIX = di["OutBarHead"] == null ? "" : di["OutBarHead"].ToString(),
                             SALES_CONTRACT = di["Contracts"] == null ? "" : di["Contracts"].ToString(),
                         };
-                        if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && (x.STATUS > BIZ_MES_WO.STATUSs.Init.GetValue() || x.ROUTE_STATUS > BIZ_MES_WO.ROUTE_STATUSs.WaitSet.GetValue())))
+                        if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && x.STATUS > BIZ_MES_WO.STATUSs.Imported.GetValue()))
                         {
                             items.Add(woItem);
                         }

--
Gitblit v1.9.3