blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ch
2022-10-28 45334377dbbe7f6c0132f4b9c581b1a3fa133861 
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections;


@@ -31,6 +32,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                //编辑权限


                if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))


                {


@@ -51,9 +53,18 @@


                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.list = columnNameList;


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1217,7 +1228,7 @@


                DataSet ds = new DataSet();


                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");


                DataRow dr = ds.Tables[0].Rows[0];


                string Num = dr["HBillNo"].ToString();


                string Num = dr["HBarCode"].ToString();


                string Num1 = Num.Substring(0,(Num.Length)-5);


                oCN.BeginTran();


                for (int i = StarNum1; i <= EndNum1; i++)


@@ -1246,6 +1257,7 @@


                    if (ds1.Tables[0].Rows.Count == 0 || ds1 == null)


                    {


                        long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo);


                        //string HBillNo = DBUtility.ClsPub.CreateBillCode("3899", ref DBUtility.ClsPub.sExeReturnInfo, true);


                        string sql = string.Format(@"Insert Into Gy_MouldFileMain   " +


                        "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +


                        ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" +