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

王 垚

2022-11-29 b4e78e5b10fd9777e44a9114aad3502edfd43037

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -121,6 +121,8 @@
            string[] sArray = msg4.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            Single msg_HRate = float.Parse(sArray[3]);
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

@@ -262,10 +264,11 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HRate= DBUtility.ClsPub.GetLevel(oItem.HRate.ToString().Trim());//换算比例
                    oItem.HRate= msg_HRate;//换算比例
                    oBill.oModel = oItem;
                }

@@ -373,7 +376,7 @@
                    return objJsonResult;
                }

                oCN.RunProc("update Gy_Unit set HStopflag=1 where HItemID=" + HItemID);
                oCN.RunProc("delete from Gy_Unit where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;