From 9fe5cb3330957523a84ab920d9e75eb2572268dc Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 01 十二月 2024 16:37:27 +0800
Subject: [PATCH] 入库单打印更新

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

diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index ba786d4..783b3f0 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())
@@ -136,6 +138,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -340,6 +343,7 @@
                 }
             }
             Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
                 {
                     if (items.Any())
@@ -372,6 +376,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -412,6 +417,7 @@
                 }
             }
             Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
             {
                 if (items.Any())
@@ -444,6 +450,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
+            action.Message = $"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -489,6 +496,7 @@
                 }
             }
             Logger.Scheduler.Info($"瀹㈡埛鏉$爜淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+            db = Biz.Db;
             var dbTran = db.UseTran(() =>
             {
                 if (items.Any())
@@ -521,6 +529,7 @@
                 Logger.Scheduler.Error(action.Message);
             }
             Logger.Scheduler.Info($"瀹㈡埛鏉$爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+            action.Message = $"瀹㈡埛鏉$爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
             return action;
         }
 
@@ -564,7 +573,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