单据上传修复

llj

2026-02-09 3472db9338911b13eacb30bebb5862b35a9a630a

单据上传修复

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

@@ -1011,8 +1011,8 @@

                for (int i = 0; i <= provisional.Rows.Count - 1; i++)
                {
                    string HBillNo= DBUtility.ClsPub.CreateBillCode("1802", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    provisional.Rows[i]["单据号"] = HBillNo;
                    //string HBillNo= DBUtility.ClsPub.CreateBillCode("1802", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    //provisional.Rows[i]["单据号"] = HBillNo;
                    string HDepNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门代码"].ToString());
                    string HDepName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门"].ToString());

@@ -1024,7 +1024,7 @@
                    string HCostItemNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["成本项目代码"].ToString());
                    string HCostItemName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["成本项目"].ToString());

                    string HEntryID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子表内码"].ToString());
                    //string HEntryID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子表内码"].ToString());

                    string HDepNumber_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门代码"].ToString());
                    string HDepName_sub = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["子部门"].ToString());
@@ -1036,8 +1036,8 @@
                    string HPrice = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["单价"].ToString());
                    string HMoney = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["金额"].ToString());
                    string HWaster = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["损耗量"].ToString());
                    string HRelationQty = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["关联数量"].ToString());
                    string HRelationMoney = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["关联金额"].ToString());
                    //string HRelationQty = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["关联数量"].ToString());
                    //string HRelationMoney = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["关联金额"].ToString());
                    string remark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());

                    //获取真实行数
@@ -1070,8 +1070,8 @@
            var error = "";

            //查询没有的列
            if (!provisional.Columns.Contains("子表内码"))
                error += "没有找到【子表内码】的标题,";
            //if (!provisional.Columns.Contains("子表内码"))
            //    error += "没有找到【子表内码】的标题,";

            if (!provisional.Columns.Contains("物料编码"))
                error += "没有找到【物料编码】的标题,";
@@ -1084,7 +1084,6 @@
        [HttpPost]
        public object Excel_btnSave([FromBody] JObject sMainSub)
        {
            
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1121,7 +1120,16 @@
                var EmpNames = list.Select(x => x["职员"].ToString()).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("'", "''")}'"))})";
                DataSet icmoData = oCN.RunProcReturn(ICMOQuery, "Sc_ICMOBillMain");
                Dictionary<string, int> ICMODict = new Dictionary<string, int>();
                foreach (DataRow row in icmoData.Tables[0].Rows)
                {
                    ICMODict[row["HBillNo"].ToString()] = (int)row["HInterID"];
                }

                // 2. æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                string supplierQuery = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames.Select(s => $"'{s.Replace("'", "''")}'"))})";
@@ -1134,7 +1142,7 @@

                // 2.1 æ‰¹é‡æŸ¥è¯¢ä¸»å­è¡¨éƒ¨é—¨ä¿¡æ¯
                string supplierQuery_sub = $"SELECT HItemID, HName FROM Gy_Department WHERE HName IN ({string.Join(",", HDeptNames_sub.Select(s => $"'{s.Replace("'", "''")}'"))})";
                DataSet supData_sub = oCN.RunProcReturn(supplierQuery, "Gy_Department");
                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)
                {
@@ -1173,7 +1181,6 @@
                    CostDict[key] = (int)row["HItemID"];
                }
               

                // 4. æŸ¥è¯¢ç”¨æˆ·ä¿¡æ¯
                DataSet emp = oCN.RunProcReturn($"SELECT Czybm FROM Gy_Czygl WHERE Czymc = '{user.Replace("'", "''")}'", "Gy_Czygl");
                if (emp.Tables[0].Rows.Count == 0)
@@ -1196,6 +1203,7 @@
                    var item = list[i];
                    int lineNumber = i + 1; // è¡Œå·ä»Ž1开始

                    string ICMOcheck = item["生产订单号"];
                    string supplier = item["部门"];
                    string materialNumber = item["物料编码"];
                    string materialName = item["物料名称"];
@@ -1211,6 +1219,11 @@
                    if (!materialDict.ContainsKey(materialKey))
                    {
                        missingMaterialMessages.Add($"第{lineNumber}行的物料【{materialName}(编码:{materialNumber})】");
                    }
                    // æ£€æŸ¥ç”Ÿäº§è®¢å•
                    if (!string.IsNullOrEmpty(ICMOcheck) && !ICMODict.ContainsKey(ICMOcheck))
                    {
                        missingMaterialMessages.Add($"第{lineNumber}行的生产订单【{ICMOcheck}】");
                    }
                }

@@ -1251,59 +1264,84 @@
                    existRecords.Add($"{row["HMaterID"]}_{row["HDeptID_sub"]}");
                }

                // 7. æŒ‰ç…§éƒ¨é—¨ä»£ç ã€éƒ¨é—¨ã€èŒå‘˜ä»£ç ã€èŒå‘˜ã€ç”Ÿäº§è®¢å•å·è¿›è¡Œåˆ†ç»„
                var groupedData = list.GroupBy(item => new
                {
                    éƒ¨é—¨ä»£ç  = item["部门代码"],
                    éƒ¨é—¨ = item["部门"],
                    èŒå‘˜ä»£ç  = item["职员代码"],
                    èŒå‘˜ = item["职员"],
                    ç”Ÿäº§è®¢å•å· = item["生产订单号"]
                }).ToList();

                StringBuilder insertSql = new StringBuilder();
                StringBuilder insertSql_sub = new StringBuilder();
                StringBuilder updateSql = new StringBuilder();
                StringBuilder updateSql_sub = new StringBuilder();
                string currentDate = DateTime.Today.ToString("yyyy-MM-dd");
                int HEntryID = 1;
                foreach (Dictionary<string, string> item in list)

                foreach (var group in groupedData)
                {
                    int HSupplierID = supplierDict_sub[item["部门"]];
                    int EmpID = EmpDict[item["职员"]];//
                    int HCostID = CostDict[item["成本项目"]] ;//EmpDict[item["职员"]];
                    var firstItem = group.First();

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

                    // ç”Ÿæˆä¸»è¡¨ID和单据号（每组生成一个）
                    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}";
                    long HInterID = DBUtility.ClsPub.CreateBillID("1802", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (!existRecords.Contains(recordKey))
                        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}', '{item["单据号"]}', '{DateTime.Now}', {DateTime.Now.Year}, {DateTime.Now.Month}, {"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}', '{"0"}','{HMaterID}','{"0"}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{"100038"}');");
                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{DateTime.Now}', {DateTime.Now.Year}, {DateTime.Now.Month}, {"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"}');");

                        // æ’入子表（组内每个物料插入一次）
                        int HEntryID = 1;
                        foreach (var item in group)
                        {
                            int HMaterID = materialDict[$"{item["物料编码"]}_{item["物料名称"]}"];
                            int HCostID = CostDict[item["成本项目"]];

                        insertSql_sub.AppendLine($"INSERT INTO [CB_ItemMoneyBillSub] ([HInterID], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark],[HSourceInterID], [HSourceEntryID], [HSourceBillNo], [HSourceBillType],[HRelationQty], [HRelationMoney], [HBillNo_bak], [HCostItemID],[HDeptID], [HQty], [HPrice], [HMoney],[HMaterID], [HWaster], [HDate], [HBeginBalance], [HEndBalance], [HTimes]) VALUES (");
                        insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel导入"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{item["关联数量"]}', '{item["关联金额"]}', '{""}', '{HCostID}', '{HSupplierID}', '{item["数量"]}', '{item["单价"]}', '{item["金额"]}','{HMaterID}', '{item["损耗量"]}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}');");
                            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"}');");
                        HEntryID++;
                    }
                    else
                    {
                        // æ›´æ–°è¯­å¥
                        updateSql.AppendLine($"UPDATE CB_ItemMoneyBillMain SET HDate = '{currentDate}', HRemark = '{item["备注"]}', HEmpID = '{EmpID}', HMaterID = '{HMaterID}' , HDeptID = '{HSupplierID}' WHERE HBillNo = '{item["单据号"]}'");
                        updateSql_sub.AppendLine($"UPDATE CB_ItemMoneyBillSub SET HDate = '{currentDate}', HQty = '{item["数量"]}', HDeptID = '{HSupplierID}', HPrice = '{item["单价"]}', HRelationQty = '{item["关联数量"]}', HRelationMoney = '{item["关联金额"]}', HMoney = '{item["金额"]}', HWaster = '{item["损耗量"]}', HMaterID = '{HMaterID}' WHERE HInterID = {HInterID};");
                    }
                }

                
                }

                // æ‰§è¡Œæ‰¹é‡æ“ä½œ
                if (insertSql.Length > 0)
                {
                    oCN.RunProc(insertSql.ToString());
                }

                if (insertSql_sub.Length > 0)
                {
                    oCN.RunProc(insertSql_sub.ToString());
                }
                 
                if (updateSql.Length > 0)
                {
                    oCN.RunProc(updateSql.ToString());
                    oCN.RunProc(updateSql_sub.ToString());
                }
                   

                oCN.Commit();

                res.code = "1";
                res.count = 1;
                res.Message = "导入成功!";
                res.count = groupedData.Count;
                res.Message = $"导入成功! å…±å¤„理{groupedData.Count}组数据";
                res.data = null;
                return res;
            }