Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2025-10-22 549df1cac1529f4fc9b5d9b64e27de5d5d8b8951

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -480,35 +480,78 @@
            try
            {
                var _value = msg["model"].ToString();
                LogService.Write("1" + _value);
                var entry = msg["model"]["HENTRY"].ToString();
                LogService.Write("1" + _value);
                LogService.Write("12" + entry);
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //反序列化
                _value = "[" + _value.ToString() + "]";
                List<Supplier> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(_value);
                List<Model.ClsGy_SupplierContact_Model> lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SupplierContact_Model>>(entry);
                string sql = string.Empty;
                 LogService.Write("2");
                //保存
                oCN.BeginTran();
                sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
                LogService.Write("3");
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Supplier on";
                oCN.RunProc(sql);
                LogService.Write("供应商同步" + @"Insert Into Gy_Supplier " +
                 "(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark" +
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID,HUseOrgID,HCreateOrgID) " +
                 " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
                 "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
                 ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                 ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                 ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID + ",'" + lsmain[0].HMaterClass + 
                 "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
                  "') ");
                oCN.RunProc("Insert Into Gy_Supplier " +
                 "(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark" +
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID) " +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID,HUseOrgID,HCreateOrgID) " +
                 " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
                 "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
                 ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                 ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                 ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+ 
                 "'," + lsmain[0].HItemID +
                  ") ");
                //修改上级为非末级代码
                 "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
                  "') ");
                sql = "set identity_insert Gy_Supplier off";
                oCN.RunProc(sql);
                ///////////
                foreach (var osub in lssub)
                {
                    sql = " set identity_insert Gy_SupplierContact on";
                    oCN.RunProc(sql);
                    LogService.Write("开始插入供应商联系人");
                    sql = $"delete from Gy_SupplierContact where HItemID = {osub.HItemID}";
                    oCN.RunProc(sql);
                    oCN.RunProc("insert into Gy_SupplierContact" +
                     "(HItemID,HNumber,HName,HShortNumber,HParentID,HLevel" +
                    ", HEndFlag, HStopflag, HRemark, HUseFlag, HIsDefault, HUSEORGID, HCREATEORGID) " +
                     " values('" + osub.HItemID + "','" + osub.HNumber + "','" + osub.HName + "'," + "'" + osub.HShortNumber + "'," + osub.HParentID + "," + osub.HLevel + ",'" + osub.HEndFlag + "','" + osub.HStopflag + "'" +
                     "," + "'" + osub.HRemark + "'" + ",'" + osub.HUseFlag + "','" + osub.HIsDefault + "'," + osub.HUSEORGID + "," + osub.HCREATEORGID +
                      ") ");
                    sql = "set identity_insert Gy_SupplierContact off";
                    oCN.RunProc(sql);
                }
                   
                //修改上级为非末级代码
                

                LogService.Write("插入供应商联系人compelete");
                oCN.Commit();

                objJsonResult.code = "1";
@@ -519,6 +562,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e);
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
@@ -698,6 +742,7 @@
            }
            catch (Exception e)
            {

                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;