From 742d2d8cc10f2fe886688ac1bf9b7e851c6c449c Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 23 四月 2021 17:04:46 +0800
Subject: [PATCH] 工序出站-合并
---
WebAPI/DLL/ClsSc_ProcessReport.cs | 2
WebAPI/Controllers/Sc_ProcessMangementController.cs | 75 ++++++++++++++++--
WebAPI/Properties/PublishProfiles/API.pubxml.user | 130 ++++++++++++++++----------------
3 files changed, 132 insertions(+), 75 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index b881e7e..719e7aa 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -783,7 +783,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 +794,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 +1166,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 +1197,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 +1219,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 +1268,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 +1290,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 +1297,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 +1344,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index c0eb34a..b27244c 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -140,7 +140,7 @@
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HGroupID.ToString() +
",'" + omodel.HGroupNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'" +
", " + omodel.HPlanQty.ToString() + "," + omodel.HInStockQty.ToString() + "," + omodel.HSumTimes.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HRemark + "'" +
- ",'" + omodel.HInnerBillNo + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HMaker.ToString() + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index bcd7399..768687e 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -20,19 +20,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -50,7 +50,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -59,13 +59,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -131,7 +131,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -164,10 +164,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/23/2021 14:25:28</publishTime>
+ <publishTime>04/22/2021 20:00:19</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/23/2021 14:25:28</publishTime>
+ <publishTime>04/22/2021 20:00:19</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -185,163 +185,163 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Index.html">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/21/2021 13:19:40</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/23/2021 14:25:47</publishTime>
+ <publishTime>04/22/2021 20:00:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1