From 1c90213ebd42e2d00324a71a67a60d07e4c8a7da Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 28 四月 2026 09:08:39 +0800
Subject: [PATCH] 修复接口签名，新增抽样方案
---
DAL/基础资料/公用基础资料/ClsGy_SampleScheme_Ctl.cs | 154 +++++++++
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 2
Model/基础资料/基础资料/ClsGy_SampleScheme_Model.cs | 27 +
Model/基础资料/基础资料/ClsGy_SampleSchemeSub_Model.cs | 31 +
WebAPI/Web.config | 6
DAL/DAL.csproj | 1
WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs | 715 ++++++++++++++++++++++++++++++++++++++++++
Model/Model.csproj | 2
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 58 +++
WebAPI/Controllers/WebAPIController.cs | 13
WebAPI/Service/SignatureVerifyAttribute.cs | 2
WebAPI/App_Start/WebApiConfig.cs | 2
12 files changed, 1,006 insertions(+), 7 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 2b24fa2..77fe731 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -99,6 +99,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_ProductReceiveMaterialBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_SampleScheme_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Ctl.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsGy_SteppedPriceCoefficientBill .cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ItemMoneyBillMain .cs" />
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Ctl.cs"
new file mode 100644
index 0000000..cd61afc
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Ctl.cs"
@@ -0,0 +1,154 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_SampleScheme_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_SampleScheme_Model oModel = new Model.ClsGy_SampleScheme_Model();
+ //public Model.ClsGy_SampleSchemeSub_Model osub = new Model.ClsGy_SampleSchemeSub_Model();
+ public List<Model.ClsGy_SampleSchemeSub_Model> DetailColl = new List<Model.ClsGy_SampleSchemeSub_Model>();
+
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ string sql = $@"INSERT INTO [Gy_SampleScheme] ([HName], [HShortNumber], [HParentID], [HLevel], [HEndFlag], [HStopflag], [HRemark], [HHelpCode], [HUseFlag], [HMakeTime], [HMakeEmp], [HCheckEmp], [HCheckTime], [HModifyEmp], [HModifyTime], [HStopEmp], [HStopTime], [HUSEORGID], [HCREATEORGID], [HInterID], [HSampleTimes], [HSampleType], [HSampleLevel], [HStrictLevel], [HAQL], [HEffectDate], [HExpireDate], [HIsSystemSet], [HERPItemID], [HNumber])
+ VALUES (
+ '{oModel.HName}', '{oModel.HShortNumber}', '{oModel.HParentID}', '{oModel.HLevel}', '{oModel.HEndFlag}', '{oModel.HStopflag}', '{oModel.HRemark}', '{oModel.HHelpCode}', '{oModel.HUseFlag}', '{oModel.HMakeTime}', '{oModel.HMakeEmp}', '{oModel.HCheckEmp}','{oModel.HCheckTime}','{oModel.HModifyEmp}', '{oModel.HModifyTime}', '{oModel.HStopEmp}','{oModel.HStopTime}','{oModel.HUSEORGID}','{oModel.HCREATEORGID}','{oModel.HInterID}','{oModel.HSampleTimes}','{oModel.HSampleType}','{oModel.HSampleLevel}','{oModel.HStrictLevel}','{oModel.HAQL}','{oModel.HEffectDate}','{oModel.HExpireDate}','{oModel.HIsSystemSet}','{0}','{oModel.HNumber}'
+ ); ";
+ oCn.RunProc(sql);
+
+
+ // 鎻掑叆瀛愯〃
+ if (DetailColl != null && DetailColl.Count > 0)
+ {
+ foreach (Model.ClsGy_SampleSchemeSub_Model osub in DetailColl)
+ {
+ if (osub == null)
+ continue;
+ string sql1 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{oModel.HInterID}', '{osub.HEntryID}', '{osub.HBatch}', '{osub.HSampleCode}', '{osub.HSampleRate}', '{osub.HExpression}', '{osub.HRejectQty}', '{osub.HAcceptQty}', '{osub.HSampleQty}', '{osub.HSampleLow}', '{osub.HSampleUp}''
+ ); ";
+ oCn.RunProc(sql1);
+ }
+ }
+
+
+
+ ////淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 lngBillKey)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID +
+ ",HLevel=" + oModel.HLevel +
+ ",HEndFlag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark='" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HUseFlag=" +oModel.HUseFlag +
+ ",HMakeTime='" + oModel.HMakeTime + "'" +
+ ",HMakeEmp='" + oModel.HMakeEmp + "'" +
+ ",HCheckEmp='" + oModel.HCheckEmp + "'" +
+ ",HCheckTime='" + oModel.HCheckTime + "'" +
+ ",HModifyEmp='" + oModel.HModifyEmp + "'" +
+ ",HModifyTime='" + oModel.HModifyTime + "'" +
+ ",HStopEmp='" + oModel.HStopEmp + "'" +
+ ",HStopTime='" + oModel.HStopTime + "'" +
+ ",HUSEORGID=" + oModel.HUSEORGID +
+ ",HCREATEORGID=" + oModel.HCREATEORGID +
+ ",HInterID=" + oModel.HInterID +
+ ",HSampleTimes=" + oModel.HSampleTimes +
+ ",HSampleType=" + oModel.HSampleType +
+ ",HSampleLevel=" + oModel.HSampleLevel +
+ ",HStrictLevel=" + oModel.HStrictLevel +
+ ",HAQL=" + oModel.HAQL +
+ ",HEffectDate='" + oModel.HEffectDate + "'" +
+ ",HExpireDate='" + oModel.HExpireDate + "'" +
+ ",HIsSystemSet=" + Convert.ToString(oModel.HIsSystemSet ? 1 : 0) +
+ ",HERPItemID=" + 0 +
+ ",HNumber='" + oModel.HNumber + "'" +
+ " Where HItemID=" + lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCn.RunProc("delete Gy_SampleSchemeSub where HInterID='" + oModel.HInterID + "'");
+
+
+ // 鎻掑叆瀛愯〃
+ if (DetailColl != null && DetailColl.Count > 0)
+ {
+ foreach (Model.ClsGy_SampleSchemeSub_Model osub in DetailColl)
+ {
+ if (osub == null)
+ continue;
+ string sql1 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{oModel.HInterID}', '{osub.HEntryID}', '{osub.HBatch}', '{osub.HSampleCode}', '{osub.HSampleRate}', '{osub.HExpression}', '{osub.HRejectQty}', '{osub.HAcceptQty}', '{osub.HSampleQty}', '{osub.HSampleLow}', '{osub.HSampleUp}''
+ ); ";
+ oCn.RunProc(sql1);
+ }
+ }
+
+
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_SampleScheme_Ctl()
+ {
+ MvarItemKey = "Gy_SampleScheme";
+ MvarReportTitle = "鎶芥牱鏂规璁剧疆";
+ oModel = new Model.ClsGy_SampleScheme_Model();
+ }
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 215bb0c..5d26898 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -119,6 +119,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_SampleSchemeSub_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_SampleScheme_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_WorkShopICStockBillMain.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleSchemeSub_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleSchemeSub_Model.cs"
new file mode 100644
index 0000000..f6cf7ec
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleSchemeSub_Model.cs"
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsGy_SampleSchemeSub_Model : DBUtility.ClsGy_Base_Model
+ {
+
+ public int HInterID;
+ public int HEntryID;
+ public int HBatch;
+ public string HSampleCode;
+ public string HSampleRate;
+ public string HExpression;
+ public int HRejectQty;
+ public int HAcceptQty;
+ public int HSampleQty;
+ public int HBaHSampleUptch;
+ public int HSampleLow;
+ public int HSampleUp;
+
+
+
+
+
+
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Model.cs"
new file mode 100644
index 0000000..0d7a8b4
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_SampleScheme_Model.cs"
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsGy_SampleScheme_Model : DBUtility.ClsGy_Base_Model
+ {
+ public int HInterID;
+ public int HSampleTimes;
+ public string HSampleType;
+ public string HSampleLevel;
+ public string HStrictLevel;
+ public string HAQL;
+ public string HEffectDate;
+ public bool HIsSystemSet;
+ public string HExpireDate;
+
+
+
+
+
+
+ }
+}
diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index d5bfd3c..79bdce1 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -30,7 +30,7 @@
routeTemplate: "actionapi/{controller}/{action}/{id}",
defaults: new { id = RouteParameter.Optional }
);
- //娉ㄥ唽绛惧悕
+ // 娉ㄥ唽绛惧悕
config.Filters.Add(new SignatureVerifyAttribute());
//// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
//config.Filters.Add(new JwtAuthorizeAttribute());
diff --git a/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs b/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs
index 04778d4..b90fbec 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs
@@ -33,7 +33,7 @@
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Query", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -68,5 +68,718 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ /// </summary>
+ [Route("Gy_SampleScheme/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_SampleScheme_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsGy_SampleScheme_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_SampleScheme_Model>>(msg2);
+ List<ClsGy_SampleSchemeSub_Model> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_SampleSchemeSub_Model>>(msg3);
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ long HParentID = list[0].HParentID;
+ long HLevel = list[0].HLevel;
+ bool HEndFlag = list[0].HEndFlag;
+ bool HStopflag = list[0].HStopflag;
+ string HRemark = list[0].HRemark;
+ string HHelpCode = list[0].HHelpCode;
+ string HUseFlag = list[0].HUseFlag;
+ string HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = msg4;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
+ long HUnitID = list[0].HUnitID;
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ string _sql = "select HItemID from Gy_SampleScheme where HNumber = N'" + HNumber + "'";
+ DataSet _ds = oCN.RunProcReturn(_sql, "Gy_SampleScheme");
+ if (_ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触: 浠ｇ爜閲嶅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ string sql = $@"INSERT INTO [Gy_SampleScheme] ([HName], [HShortNumber], [HParentID], [HLevel], [HEndFlag], [HStopflag], [HRemark], [HHelpCode], [HUseFlag], [HMakeTime], [HMakeEmp], [HCheckEmp], [HCheckTime], [HModifyEmp], [HModifyTime], [HStopEmp], [HStopTime], [HUSEORGID], [HCREATEORGID], [HInterID], [HSampleTimes], [HSampleType], [HSampleLevel], [HStrictLevel], [HAQL], [HEffectDate], [HExpireDate], [HIsSystemSet], [HERPItemID], [HNumber])
+ VALUES (
+ '{list[0].HName}', '{list[0].HShortNumber}', '{list[0].HParentID}', '{list[0].HLevel}', '{list[0].HEndFlag}', '{list[0].HStopflag}', '{list[0].HRemark}', '{list[0].HHelpCode}', '{list[0].HUseFlag}', '{list[0].HMakeTime}', '{HMakeEmp}', '{list[0].HCheckEmp}','{list[0].HCheckTime}','{list[0].HModifyEmp}', '{list[0].HModifyTime}', '{list[0].HStopEmp}','{list[0].HStopTime}','{list[0].HUSEORGID}','{list[0].HCREATEORGID}','{list[0].HInterID}','{list[0].HSampleTimes}','{list[0].HSampleType}','{list[0].HSampleLevel}','{list[0].HStrictLevel}','{list[0].HAQL}','{list[0].HEffectDate}','{list[0].HExpireDate}','{list[0].HIsSystemSet}','{0}','{list[0].HNumber}'
+ ); ";
+ oCN.RunProc(sql);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_SampleScheme set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 鎵ц鏌ヨ鑾峰彇HItemID
+ DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_SampleScheme where HNumber = N'" + HNumber + "'", "Gy_SampleScheme");
+
+ if (temp_ds.Tables[0].Rows.Count < 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氭彃鍏ヤ富琛ㄦ暟鎹け璐�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ ClsGy_SampleSchemeSub_Model listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{itemID}', '{entryID}', '{listOne.HBatch}', '{listOne.HSampleCode}', '{listOne.HSampleRate}', '{listOne.HExpression}', '{listOne.HRejectQty}', '{listOne.HAcceptQty}', '{listOne.HSampleQty}', '{listOne.HSampleLow}', '{listOne.HSampleUp}'
+ ); ";
+ oCN.RunProc(sql3);
+ }
+
+
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氫繚瀛樺悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //涓昏〃
+ oCN.RunProc("Update Gy_SampleScheme" + " set " +
+ " HName='" + list[0].HName + "'" +
+ ",HShortNumber='" + list[0].HShortNumber + "'" +
+ ",HParentID=" + list[0].HParentID +
+ ",HLevel=" + list[0].HLevel +
+ ",HEndFlag=" + Convert.ToString(list[0].HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(list[0].HStopflag ? 1 : 0) +
+ ",HRemark='" + list[0].HRemark + "'" +
+ ",HHelpCode='" + list[0].HHelpCode + "'" +
+ ",HUseFlag='" + list[0].HUseFlag + "'" +
+ ",HMakeTime='" + list[0].HMakeTime + "'" +
+ ",HMakeEmp='" + HMakeEmp + "'" +
+ ",HCheckEmp='" + list[0].HCheckEmp + "'" +
+ ",HCheckTime='" + list[0].HCheckTime + "'" +
+ ",HModifyEmp='" + list[0].HModifyEmp + "'" +
+ ",HModifyTime='" + list[0].HModifyTime + "'" +
+ ",HStopEmp='" + list[0].HStopEmp + "'" +
+ ",HStopTime='" + list[0].HStopTime + "'" +
+ ",HUSEORGID=" + list[0].HUSEORGID +
+ ",HCREATEORGID=" + list[0].HCREATEORGID +
+ ",HInterID=" + list[0].HInterID +
+ ",HSampleTimes='" + list[0].HSampleTimes + "'" +
+ ",HSampleType='" + list[0].HSampleType + "'" +
+ ",HSampleLevel='" + list[0].HSampleLevel + "'" +
+ ",HStrictLevel='" + list[0].HStrictLevel +"'"+
+ ",HAQL=" + list[0].HAQL +
+ ",HEffectDate='" + list[0].HEffectDate + "'" +
+ ",HExpireDate='" + list[0].HExpireDate + "'" +
+ ",HIsSystemSet=" + Convert.ToString(list[0].HIsSystemSet ? 1 : 0) +
+ ",HERPItemID=" + 0 +
+ ",HNumber='" + list[0].HNumber + "'" +
+ " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_SampleScheme set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCN.RunProcReturn("delete from Gy_SampleSchemeSub where HInterID = " + HItemID, "Gy_SampleSchemeSub");
+
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ ClsGy_SampleSchemeSub_Model listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{HItemID}', '{entryID}', '{listOne.HBatch}', '{listOne.HSampleCode}', '{listOne.HSampleRate}', '{listOne.HExpression}', '{listOne.HRejectQty}', '{listOne.HAcceptQty}', '{listOne.HSampleQty}', '{listOne.HSampleLow}', '{listOne.HSampleUp}'
+ ); ";
+ oCN.RunProc(sql3);
+ }
+
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氫繚瀛樺悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鎸夐挳鏂规硶
+ /// </summary>
+ [Route("Gy_SampleScheme/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HInterID, "Gy_SampleScheme");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ瀛愯〃鏂规硶
+ /// </summary>
+ [Route("Gy_SampleScheme/listSub")]
+ [HttpGet]
+ public object listSub(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_SampleSchemeSub where 1 = 1 " + sWhere , "Gy_SampleSchemeSub");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_SampleScheme/deletesam")]
+ [HttpGet]
+ public object deletesam(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HItemID, "Gy_SampleScheme");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸茬粡瀹℃牳涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_SampleScheme Where HParentID='" + HItemID + "'", " Gy_SampleScheme");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("delete from Gy_SampleScheme where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_SampleSchemeSub where HInterID=" + HItemID);
+
+
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜锛氬垹闄ゅ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ #region 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_SampleScheme/AuditGy_SampleScheme")]
+ [HttpGet]
+ public object AuditGy_SampleScheme(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_SampleScheme_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HInterID, "Gy_SampleScheme");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_SampleScheme set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+
+ oCN.RunProc("update Gy_SampleScheme set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index d5cb948..0fdea76 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -11,6 +11,7 @@
using WebAPI.Models;
using SyntacticSugar.constant;
using WebAPI.Utility;
+using WebAPI.Service;
namespace WebAPI.Controllers
{
@@ -105,6 +106,7 @@
#region 鏀舵枡閫氱煡鍗曞垎椤靛垪琛�
[Route("Cg_POInStockBill/page")]
[HttpGet]
+ [RequireSignature]
public object Cg_POInStockBillPage(string sWhere, string user, int page, int size)
{
DataSet ds;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 786424d..361c1bc 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -4550,7 +4550,7 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairWorkBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldRepairWorkBillList_Edit");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairWorkBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldRepairWorkBillList_Edit");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
@@ -5365,12 +5365,66 @@
#region 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽
/// <summary>
- /// 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽 鍒楄〃
+ /// 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽 鍒楄〃 (骞存湀)
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
[Route("Sb_MouldRepairWorkBill/Sb_MouldRepairWorkBill")]
[HttpGet]
+ public object Sb_MouldRepairWorkBill_Expand1(string DateYear,string HType, string user ,string DateMonth = "-1")
+ {
+ if(DateMonth == "-1" || DateMonth == "" || DateMonth == null)
+ {
+ return Sb_MouldRepairWorkBill(DateYear, HType, user);
+ }
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (DateYear == null || DateYear.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_MouldRepairWorkBill_ExpendMonth'" + DateYear + "','" + HType + "'", "h_p_Sb_MouldRepairWorkBill");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽 鍒楄〃 (骞翠唤)
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+
public object Sb_MouldRepairWorkBill(string DateYear, string HType, string user)
{
try
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index bbc9e01..9e1452f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20968,7 +20968,18 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触,鏄庣粏鏌ユ棤鏁版嵁";
+ if(Type == "DJ")
+ {
+ objjson.Message = "鑾峰彇澶辫触,妯″叿鏃犵粦瀹氱殑鐐规瑙勭▼";
+ }
+ else if (Type == "BY")
+ {
+ objjson.Message = "鑾峰彇澶辫触,妯″叿鏃犵粦瀹氱殑淇濆吇瑙勭▼";
+ }
+ else
+ {
+ objjson.Message = "鑾峰彇澶辫触,鏄庣粏鏌ユ棤鏁版嵁";
+ }
objjson.data = null;
return objjson;
}
diff --git a/WebAPI/Service/SignatureVerifyAttribute.cs b/WebAPI/Service/SignatureVerifyAttribute.cs
index 12e8ea2..e610a7a 100644
--- a/WebAPI/Service/SignatureVerifyAttribute.cs
+++ b/WebAPI/Service/SignatureVerifyAttribute.cs
@@ -69,6 +69,7 @@
if (!string.IsNullOrEmpty(query) && query.StartsWith("?"))
{
rawData = query.Substring(1);
+
}
}
else
@@ -84,6 +85,7 @@
actionContext.Request.Content.Headers.ContentType.MediaType);
}
}
+ rawData = rawData.Replace("'", "%27");
var signStr = rawData + "×tamp=" + timestamp + "&nonce=" + nonce + "&key=" + SecretKey;
var serverSign = ComputeHmacSha256(signStr, SecretKey);
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 4440744..e823a54 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -142,13 +142,15 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <!-- <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> -->
+ <endpoint address="http://localhost:81/MESWMS-WEBS/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
+ <!-- <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value> -->
+ <value>http://localhost:81/MESWMS-WEBS/webservice1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1