~yxj/MES-WEB-API.git

parent: 06461bc3 | 补丁 | 提交 | ignore whitespace

zgq

2021-07-20 a0629cac478919d19dc66eb417e8d5d10cabeb7b

4个文件已修改

	WebAPI/Controllers/WebAPIController.cs	92 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/品质管理/首检检验单/QC_FirstPieceCheckBillController.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/DLL/DAL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/WebAPIController.cs

@@ -1987,6 +1987,98 @@
        }

        /// <summary>
        /// è·åæ£éªæ¹æ¡åè¡¨
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetGy_QCCheckProject")]
        [HttpGet]
        public object GetGy_QCCheckProject(string CheckProject, int OrganizationID)
        {
            if (CheckProject != "")
            {
                sWhere = " and ( HBillNo like '%" + CheckProject + "%' or HName like '%" + CheckProject + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "Select HinterID HItemID,HBillNo æ£éªæ¹æ¡ä»£ç ,HName æ¹æ¡åç§° from Gy_QCCheckProjectMain where 1 = 1 " + sWhere + "Order by HinterID ";
                ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "è·åæå!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "è·åå¤±è´¥" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// æ ¹æ®æ£éªæ¹æ¡ä¸»åç è·åæ£éªé¡¹ç®
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetCheckItemByCheckProjectID")]
        [HttpGet]
        public object GetCheckItemByCheckProjectID(int CheckProjectID)
        {
            if (CheckProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "æ£éªæ¹æ¡æªéæ©";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "select c.HItemID HQCCheckItemID,c.HName æ£éªé¡¹ç®,b.HQCStd,b.HQCUnit HUnit from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID;
                ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "è·åæå!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "è·åå¤±è´¥" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// è·åç»´ä¿®é¡¹ç®åè¡¨
        /// </summary>
        /// <returns></returns>

 WebAPI/Controllers/Æ·ÖÊ¹ÜÀí/Ê×¼ì¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs

@@ -11,6 +11,8 @@
namespace WebAPI.Controllers
{
    //é¦æ£æ£éªåController
    //æ°æ®åºä¸»è¡¨QC_FirstPieceCheckBillMain
    //æ°æ®åºåè¡¨QC_FirstPieceCheckBillSub
    public class QC_FirstPieceCheckBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -78,7 +80,10 @@
                BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
                BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
                BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);

                BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
                BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
                BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
                BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
                List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
                BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
                for (int i = 0; i < subList.ToArray().Length; i++)

 WebAPI/DLL/DAL.dll

Binary files differ

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -21,7 +21,7 @@
      <publishTime>01/13/2021 21:47:30</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/30/2021 16:33:18</publishTime>
      <publishTime>07/20/2021 23:06:07</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
@@ -162,10 +162,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/19/2021 19:27:47</publishTime>
      <publishTime>07/20/2021 23:19:13</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/19/2021 19:27:47</publishTime>
      <publishTime>07/20/2021 23:19:13</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -189,7 +189,7 @@
      <publishTime>01/13/2021 21:47:30</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>06/30/2021 16:33:18</publishTime>
      <publishTime>07/20/2021 23:06:07</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
@@ -336,7 +336,7 @@
      <publishTime>07/16/2021 17:42:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/19/2021 19:28:13</publishTime>
      <publishTime>07/20/2021 23:19:20</publishTime>
    </File>
  </ItemGroup>
</Project>

			@@ -1987,6 +1987,98 @@
			}

			/// <summary>
			/// è·åæ£éªæ¹æ¡åè¡¨
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetGy_QCCheckProject")]
			[HttpGet]
			public object GetGy_QCCheckProject(string CheckProject, int OrganizationID)
			{
			if (CheckProject != "")
			{
			sWhere = " and ( HBillNo like '%" + CheckProject + "%' or HName like '%" + CheckProject + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select HinterID HItemID,HBillNo æ£éªæ¹æ¡ä»£ç ,HName æ¹æ¡åç§° from Gy_QCCheckProjectMain where 1 = 1 " + sWhere + "Order by HinterID ";
			ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "è·åæå!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "è·åå¤±è´¥" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// æ ¹æ®æ£éªæ¹æ¡ä¸»åç è·åæ£éªé¡¹ç®
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetCheckItemByCheckProjectID")]
			[HttpGet]
			public object GetCheckItemByCheckProjectID(int CheckProjectID)
			{
			if (CheckProjectID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "æ£éªæ¹æ¡æªéæ©";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "select c.HItemID HQCCheckItemID,c.HName æ£éªé¡¹ç®,b.HQCStd,b.HQCUnit HUnit from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID;
			ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "è·åæå!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "è·åå¤±è´¥" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// è·åç»´ä¿®é¡¹ç®åè¡¨
			/// </summary>
			/// <returns></returns>

			@@ -11,6 +11,8 @@
			namespace WebAPI.Controllers
			{
			//é¦æ£æ£éªåController
			//æ°æ®åºä¸»è¡¨QC_FirstPieceCheckBillMain
			//æ°æ®åºåè¡¨QC_FirstPieceCheckBillSub
			public class QC_FirstPieceCheckBillController : ApiController
			{
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			@@ -78,7 +80,10 @@
			BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
			BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
			BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);

			BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
			BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
			BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
			BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
			List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
			BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
			for (int i = 0; i < subList.ToArray().Length; i++)

			@@ -21,7 +21,7 @@
			<publishTime>01/13/2021 21:47:30</publishTime>
			</File>
			<File Include="bin/DAL.dll">
			<publishTime>06/30/2021 16:33:18</publishTime>
			<publishTime>07/20/2021 23:06:07</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 14:52:40</publishTime>
			@@ -162,10 +162,10 @@
			<publishTime>11/24/2014 11:18:48</publishTime>
			</File>
			<File Include="bin/WebAPI.dll">
			<publishTime>07/19/2021 19:27:47</publishTime>
			<publishTime>07/20/2021 23:19:13</publishTime>
			</File>
			<File Include="bin/WebAPI.pdb">
			<publishTime>07/19/2021 19:27:47</publishTime>
			<publishTime>07/20/2021 23:19:13</publishTime>
			</File>
			<File Include="bin/WebGrease.dll">
			<publishTime>07/17/2013 17:03:52</publishTime>
			@@ -189,7 +189,7 @@
			<publishTime>01/13/2021 21:47:30</publishTime>
			</File>
			<File Include="DLL/DAL.dll">
			<publishTime>06/30/2021 16:33:18</publishTime>
			<publishTime>07/20/2021 23:06:07</publishTime>
			</File>
			<File Include="DLL/DBUtility.dll">
			<publishTime>01/13/2021 21:47:30</publishTime>
			@@ -336,7 +336,7 @@
			<publishTime>07/16/2021 17:42:03</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>07/19/2021 19:28:13</publishTime>
			<publishTime>07/20/2021 23:19:20</publishTime>
			</File>
			</ItemGroup>
			</Project>