From 3af26b3f5d9297a4d99b570631c8d049cc50f3a1 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 四月 2021 16:23:59 +0800
Subject: [PATCH] 工艺路线模块-合并
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 221 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 172 insertions(+), 49 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index b881e7e..ccf0739 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -479,13 +479,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustWorkOrderBillList ", "h_v_WW_EntrustWorkOrderBillList");
}
else
{
- string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql1 = "select * from h_v_WW_EntrustWorkOrderBillList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustWorkOrderBillList");
}
}
catch (Exception e)
@@ -498,43 +498,6 @@
}
return GetObjectJson(ds);
}
-
-
- /// <summary>
- /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")]
- [HttpGet]
- public object MES_Sc_StationOutBillMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
- }
- else
- {
- string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
/// <summary>
/// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛�
@@ -783,7 +746,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string UserName;
ListModels oListModels = new ListModels();
try
{
@@ -794,8 +757,8 @@
lsmain = oListModels.getObjectByJson_Reportlist(msg2);
foreach (Model.ClsSc_ProcessReportMain oItem in lsmain)
{
- //oItem.HMaker = "";
- //UserName = oItem.HMaker;
+ UserName = oItem.HMaker;
+ oItem.HMaker = UserName;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -1166,8 +1129,18 @@
public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
{
DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
{
@@ -1187,9 +1160,19 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
+ var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
+
if (IsClose == 0)
{
-
+ if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿叧闂紒锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1199,6 +1182,14 @@
}
else if(IsClose==1)
{
+ if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佹湭鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁告挙閿�鍏抽棴锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
objJsonResult.code = "0";
@@ -1240,8 +1231,19 @@
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ var a = DBUtility.ClsPub.CurUserName;
try
{
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
{
@@ -1251,7 +1253,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1259,27 +1260,46 @@
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉
+ var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
+ var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
if (IsAudit == 0)
{
+ if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笉鍏佽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
else if (IsAudit == 1)
{
+ if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿弽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
else
{
@@ -1287,7 +1307,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
@@ -1302,7 +1322,110 @@
}
}
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessReportBillList ", "h_v_WW_EntrustProcessReportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessReportBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessReportBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
}
--
Gitblit v1.9.1