From c737780b45a08735555842d044e1b4464284b217 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 05 十一月 2021 16:54:07 +0800
Subject: [PATCH] 完善出厂检验单
---
WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs | 140 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
index c36b285..3c31a73 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
@@ -77,7 +77,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjListDetail where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -110,71 +110,71 @@
/// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/AddNew")]
- [HttpPost]
- public object AddNew([FromBody] JObject oMain)
- {
- try
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_ClassTimePrj/AddNew")]
+ //[HttpPost]
+ //public object AddNew([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
- List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg1);
+ // DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
+ // DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
+ // List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg1);
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- long HParentID = list[0].HParentID; ;
- long HDeptID = list[0].HDeptID; ;
- long HGroupID = list[0].HGroupID;
- bool HStopflag = list[0].HStopflag;
- string HRemark = list[0].HRemark;
+ // long HItemID = list[0].HItemID;
+ // string HNumber = list[0].HNumber;
+ // string HName = list[0].HName;
+ // long hparentid = list[0].hparentid; ;
+ // long HDeptID = list[0].HDeptID; ;
+ // long HGroupID = list[0].HGroupID;
+ // bool HStopflag = list[0].HStopflag;
+ // string HRemark = list[0].HRemark;
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ // if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Insert into Gy_ClassTimePrj" +
- " (HNumber,HName,HParentID" +
- ",HStopflag,HRemark,HDeptID,HGroupID) " +
- " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
- , ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // oCN.RunProc("Insert into Gy_ClassTimePrj" +
+ // " (HNumber,HName,HParentID" +
+ // ",HStopflag,HRemark,HDeptID,HGroupID) " +
+ // " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
+ // "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
+ // , ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ // //objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
/// <summary>
@@ -200,12 +200,12 @@
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg2);//杩欏彞鏈夐棶棰�
+ List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg2);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
- long HParentID = list[0].HParentID; ;
+ long hparentid = list[0].hparentid; ;
long HDeptID = list[0].HDeptID; ;
long HGroupID = list[0].HGroupID;
bool HStopflag = list[0].HStopflag;
@@ -244,23 +244,23 @@
{
oCN.BeginTran();
oCN.RunProc("Insert into Gy_ClassTimePrj" +
- " (HNumber,HName,HParentID" +
+ " (HNumber,HName,hparentid" +
",HStopflag,HRemark,HDeptID,HGroupID) " +
- " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
+ " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
"," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else {
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Update Gy_Warehouse set " +
+ oCN.RunProc("Update Gy_ClassTimePrj set " +
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
- ",HParentID=" + HParentID.ToString() +
+ ",hparentid=" + hparentid.ToString() +
",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
",HDeptID=" + HDeptID.ToString() +
",HGroupID=" + HGroupID.ToString() +
@@ -268,7 +268,7 @@
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
}
--
Gitblit v1.9.1