1.过滤加组织 2.职员和生产订单不是必填项 3.导入审查新增：字段信息是否在系统存在要有报错 4.前后导入主表信息相同时，新增：子表信息不同的数据会...

llj

2026-02-28 dcaa18d53b4d31c7d4a16a80e638568fa3069e6b

1.过滤加组织 2.职员和生产订单不是必填项 3.导入审查新增：字段信息是否在系统存在要有报错 4.前后导入主表信息相同时，新增：子表信息不同的数据会导入失败的报错 5.增加子表必填项目：成本项目必填，金额必填，其他不必填

 WebAPI/Controllers/³É±¾¹ÜÀí/CB_ItemMoneyBillController.cs

@@ -1118,14 +1118,22 @@
                var HDeptNumbers_sub = list.Select(x => x["部门代码"].ToString()).Distinct().ToList();
                var materialNumbers = list.Select(x => x["物料编码"].ToString()).Distinct().ToList();
                var materialNames = list.Select(x => x["物料名称"].ToString()).Distinct().ToList();
                var EmpNumbers = list.Select(x => x["职员代码"].ToString()).Distinct().ToList();
                var EmpNames = list.Select(x => x["职员"].ToString()).Distinct().ToList();
                //var EmpNumbers = list.Select(x => x["职员代码"].ToString()).Distinct().ToList();
                //var EmpNames = list.Select(x => x["职员"].ToString()).Distinct().ToList();
                var EmpNumbers = list.Select(x => x["职员代码"]?.ToString())
                     .Where(s => !string.IsNullOrEmpty(s))
                     .Distinct()
                     .ToList();
                var EmpNames = list.Select(x => x["职员"]?.ToString())
                                   .Where(s => !string.IsNullOrEmpty(s))
                                   .Distinct()
                                   .ToList();
                var CostNumbers = list.Select(x => x["成本项目代码"].ToString()).Distinct().ToList();
                var CostNames = list.Select(x => x["成本项目"].ToString()).Distinct().ToList();
                var ICMONumbers = list.Select(x => x["生产订单号"].ToString()).Distinct().ToList();

                // 2. æ‰¹é‡æŸ¥è¯¢ç”Ÿäº§è®¢å•å†…码
                string ICMOQuery = $"SELECT HInterID,HBillNo FROM Sc_ICMOBillMain WHERE HBillNo IN ({string.Join(",", ICMONumbers.Select(s => $"'{s.Replace("'", "''")}'"))})";
                string ICMOQuery = $"SELECT HInterID,HBillNo FROM Sc_ICMOBillMain WHERE HBillNo IN ({string.Join(",", ICMONumbers.Select(s => $"'{s.Replace("'", "''")}'"))}) and HPRDORGID={organ}";
                DataSet icmoData = oCN.RunProcReturn(ICMOQuery, "Sc_ICMOBillMain");
                Dictionary<string, int> ICMODict = new Dictionary<string, int>();
                foreach (DataRow row in icmoData.Tables[0].Rows)
@@ -1143,7 +1151,7 @@
                //}

                // 2.1 æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                string supplierQuery_sub = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames_sub.Select(s => $"'{s.Replace("'", "''")}'"))})";
                string supplierQuery_sub = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames_sub.Select(s => $"'{s.Replace("'", "''")}'"))}) and HUSEORGID ={organ}";
                DataSet supData_sub = oCN.RunProcReturn(supplierQuery_sub, "Gy_Department");
                Dictionary<string, int> supplierDict_sub = new Dictionary<string, int>();
                foreach (DataRow row in supData_sub.Tables[0].Rows)
@@ -1153,7 +1161,7 @@

                // 3. æ‰¹é‡æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯
                string materialQuery =
                $"SELECT HItemID, HNumber, HName FROM Gy_Material WHERE HNumber IN ({string.Join(",", materialNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", materialNames.Select(m => $"'{m.Replace("'", "''")}'"))})";
                $"SELECT HItemID, HNumber, HName FROM Gy_Material WHERE HNumber IN ({string.Join(",", materialNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", materialNames.Select(m => $"'{m.Replace("'", "''")}'"))})  and HUSEORGID ={organ}";
                DataSet materData = oCN.RunProcReturn(materialQuery, "Gy_Material");
                Dictionary<string, int> materialDict = new Dictionary<string, int>();
                foreach (DataRow row in materData.Tables[0].Rows)
@@ -1161,10 +1169,18 @@
                    string key = $"{row["HNumber"]}_{row["HName"]}";
                    materialDict[key] = (int)row["HItemID"];
                }
                if (EmpNames.Count == 0 && EmpNumbers.Count == 0)
                {

                }
                // 3. æ‰¹é‡æŸ¥è¯¢èŒå‘˜ä¿¡æ¯
                string EmployeeQuery =
                $"SELECT HItemID, HNumber, HName FROM Gy_Employee WHERE HNumber IN ({string.Join(",", EmpNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", EmpNames.Select(m => $"'{m.Replace("'", "''")}'"))})";
                string empNumbersIn = EmpNumbers.Any()
                    ? string.Join(",", EmpNumbers.Select(m => $"'{m.Replace("'", "''")}'"))
                    : "''";
                string empNamesIn = EmpNames.Any()
                    ? string.Join(",", EmpNames.Select(m => $"'{m.Replace("'", "''")}'"))
                    : "''";
                string EmployeeQuery = $"SELECT HItemID, HNumber, HName FROM Gy_Employee WHERE HNumber IN ({empNumbersIn}) AND HName IN ({empNamesIn})  and HUSEORGID ={organ}";
                DataSet EmpData = oCN.RunProcReturn(EmployeeQuery, "Gy_Employee");
                Dictionary<string, int> EmpDict = new Dictionary<string, int>();
                foreach (DataRow row in EmpData.Tables[0].Rows)
@@ -1174,7 +1190,7 @@
                }

                // 3. æ‰¹é‡æŸ¥è¯¢chengbenxiangmu信息
                string CostQuery = $"SELECT HItemID, HNumber, HName FROM Gy_ItemMoney_1 WHERE HNumber IN ({string.Join(",", CostNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", CostNames.Select(m => $"'{m.Replace("'", "''")}'"))})";
                string CostQuery = $"SELECT HItemID, HNumber, HName FROM Gy_ItemMoney_1 WHERE HNumber IN ({string.Join(",", CostNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", CostNames.Select(m => $"'{m.Replace("'", "''")}'"))}) and HUSEORGID ={organ}";
                DataSet CostData = oCN.RunProcReturn(CostQuery, "Gy_ItemMoney_1");
                Dictionary<string, int> CostDict = new Dictionary<string, int>();
                foreach (DataRow row in CostData.Tables[0].Rows)
@@ -1183,7 +1199,7 @@
                    CostDict[key] = (int)row["HItemID"];
                }
                // 3.1 æ‰¹é‡æŸ¥è¯¢å·¥åºä¿¡æ¯
                string ProcessQuery = $"SELECT HItemID, HNumber, HName FROM Gy_Process WHERE  HName IN ({string.Join(",", HProc.Select(m => $"'{m.Replace("'", "''")}'"))})";
                string ProcessQuery = $"SELECT HItemID, HNumber, HName FROM Gy_Process WHERE  HName IN ({string.Join(",", HProc.Select(m => $"'{m.Replace("'", "''")}'"))}) and HUSEORGID ={organ}";
                DataSet ProcData = oCN.RunProcReturn(ProcessQuery, "Gy_Process");
                Dictionary<string, int> ProcDict = new Dictionary<string, int>();
                foreach (DataRow row in ProcData.Tables[0].Rows)
@@ -1206,6 +1222,9 @@
                // 5. æ£€æŸ¥ç¼ºå¤±çš„部门和物料，并记录行号
                List<string> missingSupplierMessages = new List<string>();
                List<string> missingMaterialMessages = new List<string>();
                List<string> missingCostMessages = new List<string>();
                List<string> missingmoneyMessages = new List<string>();
                List<string> missingEmployeeMessages = new List<string>();

                // éåŽ†æ¯ä¸€è¡Œæ•°æ®ï¼Œè®°å½•è¡Œå·ï¼ˆä»Ž1开始）
                for (int i = 0; i < list.Count; i++)
@@ -1214,11 +1233,18 @@
                    int lineNumber = i + 1; // è¡Œå·ä»Ž1开始

                    string ICMOcheck = item["生产订单号"];
                    string Costcheck = item["成本项目"];
                    string Procheck = item["工序"];
                    string supplier = item["部门"];
                    string materialNumber = item["物料编码"];
                    string materialName = item["物料名称"];
                    string monetcheck = item["金额"];
                    string materialKey = $"{materialNumber}_{materialName}";

                    string empName = item["职员"];
                    if (!string.IsNullOrEmpty(empName) && !EmpDict.ContainsKey(empName))
                    {
                        missingEmployeeMessages.Add($"第{lineNumber}行的职员【{empName}】");
                    }
                    // æ£€æŸ¥ä¾›åº”商
                    if (!supplierDict_sub.ContainsKey(supplier))
                    {
@@ -1234,6 +1260,20 @@
                    if (!string.IsNullOrEmpty(ICMOcheck) && !ICMODict.ContainsKey(ICMOcheck))
                    {
                        missingMaterialMessages.Add($"第{lineNumber}行的生产订单【{ICMOcheck}】");
                    }
                    // æ£€æŸ¥é¡¹ç›®æˆæœ¬
                    if (CostDict.Count == 0)
                    {
                        missingCostMessages.Add($"第{lineNumber}行的项目成本【{Costcheck}】");
                    }
                    // æ£€æŸ¥å·¥åº
                    if (ProcDict.Count == 0 && Procheck != "")
                    {
                        missingCostMessages.Add($"第{lineNumber}行的工序【{Procheck}】");
                    }
                    if (monetcheck == "" || monetcheck == null)
                    {
                        missingmoneyMessages.Add($"第{lineNumber}行金额【{monetcheck}】");
                    }
                }

@@ -1252,6 +1292,24 @@
                    errorMessage.Append(string.Join("、", missingMaterialMessages));
                    errorMessage.Append("；");
                }
                if (missingCostMessages.Any())
                {
                    errorMessage.Append("成本项目未维护或有误：");
                    errorMessage.Append(string.Join("、", missingCostMessages));
                    errorMessage.Append("；");
                }
                if (missingmoneyMessages.Any())
                {
                    errorMessage.Append("金额未维护或有误：");
                    errorMessage.Append(string.Join("、", missingmoneyMessages));
                    errorMessage.Append("；");
                }
                if (missingEmployeeMessages.Any())
                {
                    errorMessage.Append("以下职员未维护：");
                    errorMessage.Append(string.Join("、", missingEmployeeMessages));
                    errorMessage.Append("；");
                }

                if (errorMessage.Length > 0)
                {
@@ -1262,17 +1320,7 @@
                    return res;
                }

                // 6. æ‰¹é‡æŸ¥è¯¢å·²å­˜åœ¨çš„记录
                var materialIds = list.Select(x => materialDict[$"{x["物料编码"]}_{x["物料名称"]}"]).Distinct().ToList();
                var supplierIds = list.Select(x => supplierDict_sub[x["部门"]]).Distinct().ToList();

                string existQuery = $"select * from h_v_CB_ItemMoneyBillMain_Edit_excel WHERE HMaterID IN ({string.Join(",", materialIds)}) AND HDeptID_sub IN ({string.Join(",", supplierIds)})";
                DataSet existData = oCN.RunProcReturn(existQuery, "h_v_CB_ItemMoneyBillMain_Edit_excel");
                HashSet<string> existRecords = new HashSet<string>();
                foreach (DataRow row in existData.Tables[0].Rows)
                {
                    existRecords.Add($"{row["HMaterID"]}_{row["HDeptID_sub"]}");
                }
                

                // 7. æŒ‰ç…§éƒ¨é—¨ä»£ç ã€éƒ¨é—¨ã€èŒå‘˜ä»£ç ã€èŒå‘˜ã€ç”Ÿäº§è®¢å•å·è¿›è¡Œåˆ†ç»„
                var groupedData = list.GroupBy(item => new
@@ -1294,7 +1342,13 @@

                    // èŽ·å–组信息
                    int HSupplierID = supplierDict_sub[firstItem["部门"]];
                    int EmpID = EmpDict[firstItem["职员"]];
                    //int EmpID = EmpDict[firstItem["职员"]];
                    int EmpID;
                    string empName = firstItem["职员"];
                    if (string.IsNullOrEmpty(empName))
                        EmpID = 0;   // æˆ–其他默认值
                    else
                        EmpID = EmpDict[empName];
                    string ICMO = firstItem["生产订单号"];
                    int ICMOInterID = !string.IsNullOrEmpty(ICMO) && ICMODict.ContainsKey(ICMO) ? ICMODict[ICMO] : 0;

@@ -1302,21 +1356,10 @@
                    string HBillNo = DBUtility.ClsPub.CreateBillCode("1802", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    long HInterID = DBUtility.ClsPub.CreateBillID("1802", ref DBUtility.ClsPub.sExeReturnInfo);

                    // æ£€æŸ¥è¯¥ç»„是否已存在（根据部门ID和物料ID组合）
                    bool groupExists = false;
                    foreach (var item in group)
                    {
                        int HMaterID = materialDict[$"{item["物料编码"]}_{item["物料名称"]}"];
                        string recordKey = $"{HMaterID}_{HSupplierID}";
                        if (existRecords.Contains(recordKey))
                        {
                            groupExists = true;
                            break;
                        }
                    }

                    if (!groupExists)
                    {
                    

                    
                        // æ’入主表（每组插入一次）
                        insertSql.AppendLine($"INSERT INTO CB_ItemMoneyBillMain  ([HInterID], [HBillNo], [HDate], [HYear], [HPeriod], [HBillType], [HBillSubType], [HBillStatus], [HCheckItemNowID], [HCheckItemNextID], [HCheckFlowID], [HRemark], [HBacker], [HBackDate], [HBackRemark], [HChecker], [HCheckDate], [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType], [HDeleteMan], [HDeleteDate], [HMainSourceBillType], [HMainSourceInterID], [HMainSourceEntryID], [HMainSourceBillNo], [HPrintQty],  [HEmpID], [HDeptID], [HICMOInterID], [HMaterID], [HICMOBillNo], [HExplanation], [HInnerBillNo], [HBeginDate], [HEndDate], [HOrgID]) VALUES (");
                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{DateTime.Now}', {list[0]["年份"]}, {list[0]["月份"]}, {"1802"}, '{"1802"}', '{"1"}',  '{"0"}', '{"0"}', '{"0"}', '{"excel导入"}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{"0"}', '{""}', '{DateTime.Now}', '{""}', '{"0"}', '{"0"}', '{""}', '{"0"}', '{EmpID}', '{HSupplierID}', '{ICMOInterID}','{0}','{ICMO}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{"100038"}');");
@@ -1333,8 +1376,9 @@
                            insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel导入"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{"0"}', '{"0"}', '{""}', '{HCostID}', '{HSupplierID}', '{item["数量"]}', '{item["单价"]}', '{item["金额"]}','{HMaterID}', '{item["损耗量"] ?? "0"}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}', '{HProcID}');");
                            HEntryID++;
                        }
                    }
                   
                    
                    

                }

                // æ‰§è¡Œæ‰¹é‡æ“ä½œ