From a0629cac478919d19dc66eb417e8d5d10cabeb7b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 七月 2021 23:27:34 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 10 ++--
WebAPI/Controllers/WebAPIController.cs | 92 ++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/品质管理/首检检验单/QC_FirstPieceCheckBillController.cs | 7 +++
4 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 2116092..0249ff2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/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>
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index f26c014..8f68b08 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -11,6 +11,8 @@
namespace WebAPI.Controllers
{
//棣栨妫�楠屽崟Controller
+ //鏁版嵁搴撲富琛≦C_FirstPieceCheckBillMain
+ //鏁版嵁搴撳瓙琛≦C_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++)
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index a22039b..55c82d7 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index d085672..74c1632 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.1