From c6342a8eb6d2c40e9a21deab63b5babb3def3025 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 13 四月 2025 17:14:50 +0800
Subject: [PATCH] 物料扩展表增加字段 上架需要按物料的默认储位进行限制,不允许上架到其他储位 没有默认储位则不限制,需要记录并调用接口反写到U9

---
 Tiger.Business.MES/iERP/U9C_MES.cs |  151 ++++++++++++-------------------------------------
 1 files changed, 38 insertions(+), 113 deletions(-)

diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index cb09fa4..5f517ad 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -65,6 +65,7 @@
                             AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
                             CUST_PROD_CODE = di["CustomerItem"] == null ? "" : di["CustomerItem"].ToString(),
                             RULE_CODE = di["BarRule"] == null ? "" : di["BarRule"].ToString(),
+                            DEFAULT_LOCATION = di["BinCode"] == null ? "" : di["BinCode"].ToString(),
                         };
                         items.Add(basItem);
                         var extInfo = new BAS_ITEM_EXT()
@@ -80,6 +81,7 @@
                             Remark = (di["Remark"] ?? "").ToString(),
                             Packaging = (di["Packaging"] ?? "").ToString(),
                             SapCode = (di["Code1"] ?? "").ToString(),
+                            ReceiptMode = (di["ReceiptMode"] ?? "").ToInt32(),
                         };
                         itemExts.Add(extInfo);
                     }
@@ -91,47 +93,25 @@
             //{
             if (items.Any())
             {
-                if (items.Count > 100)
+                db.Utilities.PageEach(items, 100, pageList =>
                 {
-                    db.Utilities.PageEach(items, 100, pageList =>
-                    {
-                        var y = db.Storageable(pageList, "U9C")
-                               .WhereColumns(t => new { t.ID, t.GHOST_ROW })
-                               .ToStorage();
-                        y.AsInsertable.ExecuteCommand();
-                        y.AsUpdateable.ExecuteCommand();
-                    });
-                }
-                else
-                {
-                    var y = db.Storageable(items, "U9C")
-                                   .WhereColumns(t => new { t.ID, t.GHOST_ROW })
-                                   .ToStorage();
+                    var y = db.Storageable(pageList, "U9C")
+                           .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+                           .ToStorage();
                     y.AsInsertable.ExecuteCommand();
                     y.AsUpdateable.ExecuteCommand();
-                }
+                });
             }
             if (itemExts.Any())
             {
-                if (itemExts.Count > 100)
+                db.Utilities.PageEach(itemExts, 100, pageList =>
                 {
-                    db.Utilities.PageEach(itemExts, 100, pageList =>
-                     {
-                         var y = db.Storageable(pageList, "U9C")
-                                .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
-                                .ToStorage();
-                         y.AsInsertable.ExecuteCommand();
-                         y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                     });
-                }
-                else
-                {
-                    var s = db.Storageable(itemExts, "U9C")
+                    var y = db.Storageable(pageList, "U9C")
                            .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
                            .ToStorage();
-                    s.AsInsertable.ExecuteCommand();
-                    s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                }
+                    y.AsInsertable.ExecuteCommand();
+                    y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+                });
             }
             //});
             //if (!dbTran.IsSuccess)
@@ -210,25 +190,14 @@
                 db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
                 if (items.Any())
                 {
-                    if (items.Count > 100)
+                    db.Utilities.PageEach(items, 100, pageList =>
                     {
-                        db.Utilities.PageEach(items, 100, pageList =>
-                        {
-                            var y = db.Storageable(pageList, "U9C")
-                                   .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
-                                   .ToStorage();
-                            y.AsInsertable.ExecuteCommand();
-                            y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                        });
-                    }
-                    else
-                    {
-                        var s = db.Storageable(items, "U9C")
+                        var y = db.Storageable(pageList, "U9C")
                                .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                                .ToStorage();
-                        s.AsInsertable.ExecuteCommand();
-                        s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                    }
+                        y.AsInsertable.ExecuteCommand();
+                        y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+                    });
                 }
 
             });
@@ -349,25 +318,14 @@
             //    {
             if (items.Any())
             {
-                if (items.Count > 100)
+                db.Utilities.PageEach(items, 100, pageList =>
                 {
-                    db.Utilities.PageEach(items, 100, pageList =>
-                     {
-                         var y = db.Storageable(pageList, "U9C")
-                                .WhereColumns(t => new { t.CUST_CODE, t.GHOST_ROW })
-                                .ToStorage();
-                         y.AsInsertable.ExecuteCommand();
-                         y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                     });
-                }
-                else
-                {
-                    var s = db.Storageable(items, "U9C")
+                    var y = db.Storageable(pageList, "U9C")
                            .WhereColumns(t => new { t.CUST_CODE, t.GHOST_ROW })
                            .ToStorage();
-                    s.AsInsertable.ExecuteCommand();
-                    s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                }
+                    y.AsInsertable.ExecuteCommand();
+                    y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+                });
             }
 
             //    });
@@ -423,25 +381,14 @@
             // {
             if (items.Any())
             {
-                if (items.Count > 100)
+                db.Utilities.PageEach(items, 100, pageList =>
                 {
-                    db.Utilities.PageEach(items, 100, pageList =>
-                    {
-                        var y = db.Storageable(pageList, "U9C")
-                               .WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
-                               .ToStorage();
-                        y.AsInsertable.ExecuteCommand();
-                        y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                    });
-                }
-                else
-                {
-                    var s = db.Storageable(items, "U9C")
+                    var y = db.Storageable(pageList, "U9C")
                            .WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
                            .ToStorage();
-                    s.AsInsertable.ExecuteCommand();
-                    s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                }
+                    y.AsInsertable.ExecuteCommand();
+                    y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+                });
             }
 
             //});
@@ -491,7 +438,7 @@
                                 CREATE_TIME = di["CreatedOn"].ToDateTime(),
                                 UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
                                 AUTH_ORG = _MES_WO?.AUTH_ORG,
-                                CREATE_USER = "U9C"
+                                CREATE_USER = "U9C" //鍚屾椂缁機REATE_USER鍜孋REATE_TIME璧嬪�硷紝鍒欎笉浼氳鏇存柊锛屼繚鐣欐墍璧嬬殑鍊�
                             };
                             items.Add(snItem);
                         }
@@ -504,25 +451,14 @@
             //{
             if (items.Any())
             {
-                if (items.Count > 100)
+                db.Utilities.PageEach(items, 100, pageList =>
                 {
-                    db.Utilities.PageEach(items, 100, pageList =>
-                      {
-                          var y = db.Storageable(pageList, "U9C")
-                                 .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
-                                 .ToStorage();
-                          y.AsInsertable.ExecuteCommand();
-                          y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE, q.WORK_ORDER, q.CUST_SN, q.FLOW_SN, q.ITEM_CODE, q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
-                      });
-                }
-                else
-                {
-                    var s = db.Storageable(items, "U9C")
+                    var y = db.Storageable(pageList, "U9C")
                            .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
                            .ToStorage();
-                    s.AsInsertable.ExecuteCommand();
-                    s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE, q.WORK_ORDER, q.CUST_SN, q.FLOW_SN, q.ITEM_CODE, q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
-                }
+                    y.AsInsertable.ExecuteCommand();
+                    y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE, q.WORK_ORDER, q.CUST_SN, q.FLOW_SN, q.ITEM_CODE, q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
+                });
             }
 
             //});
@@ -595,25 +531,14 @@
             //{
             if (items.Any())
             {
-                if (items.Count > 100)
+                db.Utilities.PageEach(items, 100, pageList =>
                 {
-                    db.Utilities.PageEach(items, 100, pageList =>
-                    {
-                        var y = db.Storageable(pageList, "U9C")
-                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
-                               .ToStorage();
-                        y.AsInsertable.ExecuteCommand();
-                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.ORDER_TYPE, q.PLAN_QTY, q.CUST_CODE, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.PLAN_START_TIME, q.STATUS, q.WS_CODE, q.AUTH_ORG, q.SALES_ORDER, q.SALES_REMARK, q.SERIAL_NO, q.SN_PREFIX, q.CUST_PREFIX, q.SALES_CONTRACT }).ExecuteCommand();
-                    });
-                }
-                else
-                {
-                    var s = db.Storageable(items, "U9C")
+                    var y = db.Storageable(pageList, "U9C")
                            .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                            .ToStorage();
-                    s.AsInsertable.ExecuteCommand();
-                    s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
-                }
+                    y.AsInsertable.ExecuteCommand();
+                    y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.ORDER_TYPE, q.PLAN_QTY, q.CUST_CODE, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.PLAN_START_TIME, q.STATUS, q.WS_CODE, q.AUTH_ORG, q.SALES_ORDER, q.SALES_REMARK, q.SERIAL_NO, q.SN_PREFIX, q.CUST_PREFIX, q.SALES_CONTRACT }).ExecuteCommand();
+                });
             }
 
             //});

--
Gitblit v1.9.3