From f4e89066f9119fac831b64f388516aeb01c7dd60 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 03 十一月 2021 16:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 140 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 121 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 13c3bde..1d1b015 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -17,6 +17,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
@@ -83,12 +84,21 @@
[Route("Sc_MouldOtherOutBill/GetMouldOtherOutBill")]
[HttpGet]
- public object GetMouldOtherOutBill(string sWhere)
+ public object GetMouldOtherOutBill(string sWhere,string user, string Organization)
{
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- ds = Sc_MouldOtherOutBill(sWhere);
+ ds = Sc_MouldOtherOutBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -105,16 +115,16 @@
}
}
- public static DataSet Sc_MouldOtherOutBill(string sWhere)
+ public static DataSet Sc_MouldOtherOutBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherOutBillList ", "h_v_Sc_MouldOtherOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherOutBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
}
@@ -152,7 +162,7 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -166,7 +176,7 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldOtherOutBillList where 1 = 1 ");
+ 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherOutBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
@@ -202,12 +212,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldOtherOutBill oBill = new DLL.ClsSc_MouldOtherOutBill();
List<Model.ClsSc_MouldOtherOutBillMain> lsmain = new List<Model.ClsSc_MouldOtherOutBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -322,24 +342,24 @@
}
#endregion
- #region [鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟鍒犻櫎鍔熻兘]
+ #region [鍣ㄥ叿鍏朵粬鍑哄簱鍗曞垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sc_MouldOtherOutBill/DeltetMouldOtherOutBill")]
[HttpGet]
- public object DeltetMouldOtherOutBill(string HInterID)
+ public object DeltetMouldOtherOutBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -402,7 +422,89 @@
}
#endregion
+ #region 鍣ㄥ叿鍏朵粬鍑哄簱鍗曞鏍�/鍙嶅鏍�
+ [Route("Sc_MouldOtherOutBill/AuditMouldOtherOutBill")]
+ [HttpGet]
+ public object AuditMouldOtherOutBill(string HInterID, string user, int flag)
+ {
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (flag == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3828' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3828' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1