MES-WEB-API.git

parent: 0d9ec09f | 补丁 | 提交 | ignore whitespace

wtt

2024-09-10 b90d33de5d38611bd11bdb4407d0419a4a259905

销售订单查询

6个文件已修改

	WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs	104 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/bin/Debug/TopSdk.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -3365,5 +3365,109 @@
            }
        }
        #endregion

        #region 销售订单查询列表
        [Route("Xs_SeOrderBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_SeOrderBillQuery where 1 = 1 ";

                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SeOrderBillQuery  order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
                }



                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 销售订单查询子列表
        [Route("Xs_SeOrderBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid =  " + hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");


                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>09/10/2024 15:26:17</publishTime>
      <publishTime>09/10/2024 19:04:51</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>09/10/2024 15:26:17</publishTime>
      <publishTime>09/10/2024 19:04:51</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>09/10/2024 15:26:15</publishTime>
      <publishTime>09/10/2024 19:04:48</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>09/10/2024 15:26:15</publishTime>
      <publishTime>09/10/2024 19:04:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>09/10/2024 15:26:08</publishTime>
      <publishTime>09/10/2024 19:04:41</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>09/10/2024 15:26:08</publishTime>
      <publishTime>09/10/2024 19:04:41</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>09/10/2024 15:26:10</publishTime>
      <publishTime>09/10/2024 19:04:43</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>09/10/2024 15:26:10</publishTime>
      <publishTime>09/10/2024 19:04:43</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>09/10/2024 15:26:06</publishTime>
      <publishTime>09/10/2024 19:04:39</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>09/10/2024 15:26:06</publishTime>
      <publishTime>09/10/2024 19:04:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>09/10/2024 15:26:07</publishTime>
      <publishTime>09/10/2024 19:04:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>09/10/2024 15:26:07</publishTime>
      <publishTime>09/10/2024 19:04:40</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>09/10/2024 15:26:07</publishTime>
      <publishTime>09/10/2024 19:04:41</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>09/10/2024 15:26:07</publishTime>
      <publishTime>09/10/2024 19:04:41</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>09/10/2024 15:16:54</publishTime>
      <publishTime>09/10/2024 19:02:30</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>09/10/2024 15:16:54</publishTime>
      <publishTime>09/10/2024 19:02:30</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>09/10/2024 15:17:02</publishTime>
      <publishTime>09/10/2024 19:02:37</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>09/10/2024 15:17:02</publishTime>
      <publishTime>09/10/2024 19:02:37</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>09/10/2024 15:26:46</publishTime>
      <publishTime>09/10/2024 19:05:26</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>09/10/2024 15:26:46</publishTime>
      <publishTime>09/10/2024 19:05:26</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

			@@ -3365,5 +3365,109 @@
			}
			}
			#endregion

			#region 销售订单查询列表
			[Route("Xs_SeOrderBill/QueryList")]
			[HttpGet]
			public object QueryList(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限

			if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无权限查看!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql = "select * from h_v_Xs_SeOrderBillQuery where 1 = 1 ";

			if (sWhere == "" \|\| sWhere == null)
			{
			ds = oCN.RunProcReturn("select * from h_v_Xs_SeOrderBillQuery order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
			}
			else
			{
			ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
			}



			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 = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 销售订单查询子列表
			[Route("Xs_SeOrderBill/QuerySubList")]
			[HttpGet]
			public object QuerySubList(string hmainid, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限

			if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "无权限查看!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid = " + hmainid;

			ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");


			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 = CodeConstant.SUCCEED;
			objJsonResult.count = CountConstant.SUCCEED;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = CodeConstant.FAIL;
			objJsonResult.count = CountConstant.FAIL;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}

			@@ -45,28 +45,28 @@
			<publishTime>02/22/2013 16:43:40</publishTime>
			</File>
			<File Include="bin/BLL.dll">
			<publishTime>09/10/2024 15:26:17</publishTime>
			<publishTime>09/10/2024 19:04:51</publishTime>
			</File>
			<File Include="bin/BLL.pdb">
			<publishTime>09/10/2024 15:26:17</publishTime>
			<publishTime>09/10/2024 19:04:51</publishTime>
			</File>
			<File Include="bin/BouncyCastle.Crypto.dll">
			<publishTime>12/18/2020 05:32:28</publishTime>
			</File>
			<File Include="bin/DAL.dll">
			<publishTime>09/10/2024 15:26:15</publishTime>
			<publishTime>09/10/2024 19:04:48</publishTime>
			</File>
			<File Include="bin/DAL.pdb">
			<publishTime>09/10/2024 15:26:15</publishTime>
			<publishTime>09/10/2024 19:04:48</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 22:52:40</publishTime>
			</File>
			<File Include="bin/DBUtility.dll">
			<publishTime>09/10/2024 15:26:08</publishTime>
			<publishTime>09/10/2024 19:04:41</publishTime>
			</File>
			<File Include="bin/DBUtility.pdb">
			<publishTime>09/10/2024 15:26:08</publishTime>
			<publishTime>09/10/2024 19:04:41</publishTime>
			</File>
			<File Include="bin/Grpc.Core.Api.dll">
			<publishTime>03/22/2022 13:17:26</publishTime>
			@@ -111,10 +111,10 @@
			<publishTime>07/25/2012 19:48:56</publishTime>
			</File>
			<File Include="bin/Model.dll">
			<publishTime>09/10/2024 15:26:10</publishTime>
			<publishTime>09/10/2024 19:04:43</publishTime>
			</File>
			<File Include="bin/Model.pdb">
			<publishTime>09/10/2024 15:26:10</publishTime>
			<publishTime>09/10/2024 19:04:43</publishTime>
			</File>
			<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
			<publishTime>04/15/2024 12:55:45</publishTime>
			@@ -147,34 +147,34 @@
			<publishTime>10/23/2021 17:07:54</publishTime>
			</File>
			<File Include="bin/Pub_Class.dll">
			<publishTime>09/10/2024 15:26:06</publishTime>
			<publishTime>09/10/2024 19:04:39</publishTime>
			</File>
			<File Include="bin/Pub_Class.pdb">
			<publishTime>09/10/2024 15:26:06</publishTime>
			<publishTime>09/10/2024 19:04:39</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>09/10/2024 15:26:07</publishTime>
			<publishTime>09/10/2024 19:04:40</publishTime>
			</File>
			<File Include="bin/Pub_Control.pdb">
			<publishTime>09/10/2024 15:26:07</publishTime>
			<publishTime>09/10/2024 19:04:40</publishTime>
			</File>
			<File Include="bin/RestSharp.dll">
			<publishTime>08/31/2012 06:22:50</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>09/10/2024 15:26:07</publishTime>
			<publishTime>09/10/2024 19:04:41</publishTime>
			</File>
			<File Include="bin/SQLHelper.pdb">
			<publishTime>09/10/2024 15:26:07</publishTime>
			<publishTime>09/10/2024 19:04:41</publishTime>
			</File>
			<File Include="bin/Swashbuckle.Core.dll">
			<publishTime>02/16/2015 01:57:08</publishTime>
			</File>
			<File Include="bin/SyntacticSugar.dll">
			<publishTime>09/10/2024 15:16:54</publishTime>
			<publishTime>09/10/2024 19:02:30</publishTime>
			</File>
			<File Include="bin/SyntacticSugar.pdb">
			<publishTime>09/10/2024 15:16:54</publishTime>
			<publishTime>09/10/2024 19:02:30</publishTime>
			</File>
			<File Include="bin/System.Buffers.dll">
			<publishTime>07/19/2017 18:01:28</publishTime>
			@@ -285,19 +285,19 @@
			<publishTime>05/09/2023 10:43:40</publishTime>
			</File>
			<File Include="bin/TopSdk.dll">
			<publishTime>09/10/2024 15:17:02</publishTime>
			<publishTime>09/10/2024 19:02:37</publishTime>
			</File>
			<File Include="bin/TopSdk.pdb">
			<publishTime>09/10/2024 15:17:02</publishTime>
			<publishTime>09/10/2024 19:02:37</publishTime>
			</File>
			<File Include="bin/WebActivatorEx.dll">
			<publishTime>11/24/2014 19:18:48</publishTime>
			</File>
			<File Include="bin/WebAPI.dll">
			<publishTime>09/10/2024 15:26:46</publishTime>
			<publishTime>09/10/2024 19:05:26</publishTime>
			</File>
			<File Include="bin/WebAPI.pdb">
			<publishTime>09/10/2024 15:26:46</publishTime>
			<publishTime>09/10/2024 19:05:26</publishTime>
			</File>
			<File Include="bin/WebAPI.XmlSerializers.dll">
			<publishTime>08/16/2024 16:55:28</publishTime>