From b6df49659b63e7e9dd0b7469c932feccfaaa0328 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期二, 09 十一月 2021 21:36:47 +0800
Subject: [PATCH] 不良数量修改
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 156 ++++++++++++++++++++++++++++++---------------------
1 files changed, 91 insertions(+), 65 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 05fabe2..f7ab835 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -27,36 +27,26 @@
/// </summary>
[Route("Gy_Material/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere, string Organization)
{
try
{
+ string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList " + sWhere, "h_v_Gy_MaterialList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
}
else
{
- string sql1 = "select * from h_v_Gy_MaterialList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -231,7 +221,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HEndFlag = true;//鏈骇鏍囧織
oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
@@ -359,18 +349,26 @@
/// </summary>
[Route("Gy_Mould/list1")]
[HttpGet]
- public object list1(string sWhere)
+ public object list1(string sWhere, string ModRightNameSelect, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
}
else
{
string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -417,12 +415,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_CheckToolsFileMainList");
}
else
{
string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -465,12 +463,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere, "h_v_IF_BarCodeBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList");
}
else
{
string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -509,13 +507,26 @@
/// </summary>
[Route("Gy_Mould_Edit/AddBill")]
[HttpPost]
- public object AddBill([FromBody] JObject sMainSub)
+ public object AddBill([FromBody] JObject oMain)
{
- var _value = sMainSub["oMain"].ToString();
+ 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();//褰撳墠浜�
+
oCN.BeginTran();
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨涓昏〃
- objJsonResult = AddBillMain(msg1);
+ objJsonResult = AddBillMain(msg2);
if (objJsonResult.code == "0")
{
oCN.RollBack();
@@ -532,10 +543,8 @@
return objJsonResult;
}
- public json AddBillMain(string msg1)
+ public json AddBillMain(string msg2)
{
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
try
{
msg2 = "[" + msg2.ToString() + "]";
@@ -598,9 +607,9 @@
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
- "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
- "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "'" +
") ");
@@ -614,7 +623,7 @@
" values('" + HInterID + "',0,''" +
",0,0,'','',0,0 " +
") ");
-
+
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -650,21 +659,30 @@
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
-
+ 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();//褰撳墠浜�
try
{
+ if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DAL.ClsGy_MouldFile oMould = new DAL.ClsGy_MouldFile();
DAL.ClsGy_MouldFileMain_View oDeptHlp = new DAL.ClsGy_MouldFileMain_View();
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
-
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
@@ -705,7 +723,7 @@
long HPrintQty = mainList[0].HPrintQty;
-
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -752,7 +770,7 @@
",HProdQty=" + HProdQty.ToString() +
",HProdWeight=" + HProdWeight.ToString() +
" where HInterID=" + HInterID.ToString());
-
+
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
@@ -814,30 +832,38 @@
/// </summary>
[Route("Gy_Mould_Edit/Delete_Json")]
[HttpGet]
- public object Delete_Json(long hmainid)
+ public object Delete_Json(long hmainid, string ModRightNameDelete, string user)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- //鍐欏叆鏃ュ織
- ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
- //鏇存柊涓婄骇涓� 鏈骇
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
}
--
Gitblit v1.9.1