From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index 7bbf6dd..1405bdb 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -104,7 +104,7 @@
}
#endregion
- #region 鏉ユ枡妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇℃伅-婧愬崟涓虹敓浜ц鍗�(1102)
+ #region 鏉ユ枡妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇℃伅-婧愬崟涓洪噰璐鍗�(1102)
/// <summary>
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -971,6 +971,15 @@
string OperationType = sArray[2].ToString().Trim();
string user = sArray[3].ToString();
string Value = sArray[4].ToString();
+ string BadReason = null;
+ if (sArray.Length > 4)
+ {
+ BadReason = sArray[5].ToString();
+ }
+ if (String.IsNullOrWhiteSpace(BadReason) == true)
+ {
+ BadReason = "[]";
+ }
bool bResult;
try
{
@@ -1003,6 +1012,18 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+ DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_POStockInCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_POStockInCheckBillMain");
+ if(ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
//鍥哄畾璧嬪��=================================
@@ -1036,14 +1057,16 @@
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
List<Model.ClsQC_POStockInCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub>>(msg3);
+ List<Model.ClsQC_POStockInCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_BadReason>>(BadReason);
BillNew.DetailColl = new List<Model.ClsQC_POStockInCheckBillSub>();
+
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (i >= 0)//HQty
{
- LogService.Write(subList[i]);
Model.ClsQC_POStockInCheckBillSub oSub = new Model.ClsQC_POStockInCheckBillSub();
oSub.HEntryID = i + 1;
oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
@@ -1088,6 +1111,8 @@
oSub.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -1100,9 +1125,28 @@
}
}
+ for (int i = 0; i < badReasonList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_POStockInCheckBillSub_BadReason oSub = new Model.ClsQC_POStockInCheckBillSub_BadReason();
+ oSub.HInterID = mainList[0].HInterID;
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(badReasonList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(badReasonList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(badReasonList[i].HCloseType);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HQty = badReasonList[i].HQty;
+ oSub.HBadReasonID = badReasonList[i].HBadReasonID;
+
+ BillNew.DetailCol1_BadReason.Add(oSub);
+ }
+ }
-
+
+
//淇濆瓨瀹屾瘯鍚庡鐞�
if (OperationType.Equals("1") || OperationType.Equals("2"))
@@ -1160,6 +1204,58 @@
}
#endregion
+ #region [妫�楠屽崟鑾峰彇 涓嶈壇鍘熷洜]
+ [Route("QC_POStockInCheckBill_BadReason/getBadReasonList")]
+ [HttpGet]
+ public object getBadReasonList(Int64 HInterID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from QC_POStockInCheckBillSub_BadReason where HInterID=" + HInterID, "QC_POStockInCheckBillSub_BadReason");
+
+ //娣诲姞鍒楀悕
+ 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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱笉鑹師鍥犳暟鎹紒";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍涓嶈壇鍘熷洜璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region [鏉ユ枡鍏ュ簱妫�楠屽崟]
/// <summary>
/// 杩斿洖鍒楄〃
--
Gitblit v1.9.1