王 垚
2021-11-01 56275613ecb69bc70d213e492bff7287047e1db5
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
1个文件已修改
16 ■■■■ 已修改文件
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -165,6 +165,8 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -172,6 +174,7 @@
                List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
                string hbillno= list[0].HBillNo;
                string HYear = DateTime.Now.Year.ToString();
                DateTime HDate = list[0].HDate;
                long HInterID = list[0].HInterID;
                string HEquipFileNumber = list[0].HEquipFileNumber; 
@@ -197,6 +200,8 @@
                string HLogo = list[0].HLogo;                //√        varchar(50)    //品牌
                int HSellSupID = list[0].HSellSupID;              // √    int        //供应商(Gy_Supplier)
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier) 
                string HMaker = msg4;
                string HMakeDate = DateTime.Now.Date.ToString();
                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -212,11 +217,11 @@
                oCN.RunProc("Insert into Gy_EquipFileBillMain " +
                   " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
                   ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear) " +
                   " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
                   ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
                   "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+
                   "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.Commit();
@@ -252,6 +257,7 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -280,7 +286,9 @@
                string HWorkArea = list[0].HWorkArea;            //√    varchar(50)    //产地
                string HLogo = list[0].HLogo;                //√        varchar(50)    //品牌
                int HSellSupID = list[0].HSellSupID;              // √    int        //供应商(Gy_Supplier)
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier)
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier)
                string HUpDater = msg4;
                string HUpDateDate = DateTime.Now.Date.ToString();
                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -330,6 +338,8 @@
                    ",HLogo=" + HLogo +
                    ",HSellSupID=" + HSellSupID + 
                    ",HMakeSupID= " + HMakeSupID +
                    ",HUpDater= " + HUpDater +
                    ",HUpDateDate= " + HUpDateDate +
                    " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);