SVN r558

SVN-Revision: r558
2025-05-08 09:49:06 +00:00
parent 17889d7e90
commit d24d318f26
1 changed files with 3 additions and 1 deletions
@@ -509,7 +509,8 @@ namespace Lskj.PubBomImport
        {
            try
            {
-                string namepattern = @"^(.+?)\s+(.+)$";
+                string namepattern = @"^([A-Z]+(?:-[A-Z]+)*(?:-\d+)+-[A-Z]+\d*)\s*(.+)";
+                //string namepattern = @"^(.+?)\s+(.+)$";
                string pattern = @"^(.*?)(\d+)?$";
                string primaryValue = StaticControl.RightMenuMyControl.PrimaryValue;
                ControlModel controlModel = StaticControl.RightMenuMyControl.ControlModels.Where(n => n.LabelText.Equals("物料编码")).FirstOrDefault();
@@ -676,6 +677,7 @@ namespace Lskj.PubBomImport
                                            int.TryParse(detailRow["amount"] + "", out int lastAmount);
                                            detailRow["tamount"] = 1;
                                            detailRow["amount"] = lastAmount;
+                                            detailRow["bak"] = sourceCode;
                                        }
                                        SetProcessBar(20, allCount);
                                        string billMasterSql = $"select (select top 1 billdocument_id from bom_BillTab where productid='{productCode}') as billdocument_id,'0' affirmer,'0' rtagid,'{productCode}' as productid";