From b16de8f75ddf2134aa95c95788a8d575431fb395 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Tue, 3 Jun 2025 12:49:57 +0000
Subject: [PATCH] SVN r661

SVN-Revision: r661
---
 插件库/Lskj.PubBill/BillModule.cs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 91b20bd..c72431f 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2788,6 +2788,13 @@ namespace Lskj.PubBill
                                 MessageUtil.Show($"物料编码必填");
                                 return;
                             }
+                            ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault();
+                            string addMode = ControlObj.GetControlValue(modeControlModel);
+                            if (impRtnModel.ShowType.Equals("1"))
+                            {
+                                MessageUtil.Show($"上传模式必填");
+                                return;
+                            }
                             DataTable sourceTable = gcMain.gridControl.DataSourceTable();
                             if (sourceTable != null && impRtnModel.FileNames != null)
                             {
@@ -2804,11 +2811,16 @@ namespace Lskj.PubBill
                                 {
                                     sourceTable.Columns.Add("BomMxAddState");
                                 }
+                                if (!sourceTable.Columns.Contains("qms_laddf_mode"))
+                                {
+                                    sourceTable.Columns.Add("qms_laddf_mode");
+                                }
                                 DataTable dataTable = new DataTable();
                                 dataTable.Columns.Add(afterBomFieldName);
                                 dataTable.Columns.Add("BomFieldNameDir");
                                 dataTable.Columns.Add("BomMxMainProduct");
                                 dataTable.Columns.Add("BomMxAddState");
+                                dataTable.Columns.Add("qms_laddf_mode");
                                 IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
                                 var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
                                 DataRow mxRow = mxRows.FirstOrDefault();
@@ -2837,6 +2849,7 @@ namespace Lskj.PubBill
                                     addRow[afterBomFieldName] = fileNameWithoutExtension;
                                     addRow["BomFieldNameDir"] = fileName;
                                     addRow["BomMxMainProduct"] = mxProductId;
+                                    addRow["qms_laddf_mode"] = addMode;
                                     if (fileNameWithoutExtension.StartsWith("MX"))
                                     {
                                         addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
@@ -2849,6 +2862,7 @@ namespace Lskj.PubBill
                                     sourceRow["BomFieldNameDir"] = item["BomFieldNameDir"] + "";
                                     sourceRow["BomMxMainProduct"] = item["BomMxMainProduct"] + "";
                                     sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
+                                    sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
                                 }
                             }
                         }
@@ -4709,6 +4723,16 @@ namespace Lskj.PubBill
                     DataRow menuRow = BaseModuleImpl.GetBaseGridRightMenuById(BillModel.BeforeBillSaveExec);
                     if (menuRow != null)
                     {
+                        ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault();
+                        string addMode = ControlObj.GetControlValue(modeControlModel);
+                        DataTable table = gcMain.gridControl.DataSourceTable();
+                        if (modeControlModel != null && table.Columns.Contains("qms_laddf_mode"))
+                        {
+                            foreach (DataRow item in table.Rows)
+                            {
+                                item["qms_laddf_mode"] = addMode;
+                            }
+                        }
                         CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
                         menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
                         menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);