From 7c7845a68a0e5c7a544eeedfae2cb038362cefd8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 20 八月 2021 14:30:26 +0800
Subject: [PATCH] 工序进站接收增加编辑前判断及审核方法
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 150 +++++++++++++++---------------
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 101 ++++++++++++++++++-
2 files changed, 168 insertions(+), 83 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index e86a26d..a82414a 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -403,6 +403,52 @@
}
}
+
+ /// <summary>
+ /// 缂栬緫鍓嶅垽鏂�
+ /// </summary>
+ [Route("Cj_StationInBill/set_ShowBillJudge")]
+ [HttpGet]
+ public object set_ShowBillJudge(string HBillNo)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_DelCtrl '" + HBillNo + "'", "h_p_MES_StationInBill_DelCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if(ds.Tables[0].Rows.Count > 0 && Pub_Class.ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
///鍙傛暟锛歴tring sql銆�
@@ -459,19 +505,17 @@
objJsonResult.data = null;
return objJsonResult;
}
- Int64 lngBillKey = 0;
- lngBillKey = HInterID;
- if (lngBillKey == 0)
+ if (HInterID == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓�0锛�";
+ objJsonResult.Message = "鍗曟嵁ID涓�0锛屼笉鑳藉鏍革紒";
objJsonResult.data = null;
return objJsonResult;
}
DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HChecker.Trim() != "")
{
@@ -491,10 +535,10 @@
return objJsonResult;
}
//瀹℃牳
- if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (Cj_StationInBillCheckBill(HInterID,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
@@ -518,6 +562,47 @@
return objJsonResult;
}
}
+
+ //瀹℃牳
+ public bool Cj_StationInBillCheckBill(Int64 lngBillKey, string CurUserName, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("Select * from Sc_StationInBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationInBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ oCN.RunProc(" Update Sc_StationInBillMain set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
+ //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ DataSet ds1;
+ ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
+ " from Sc_ProcessExchangeBillMain a " +
+ " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ " Where a.HInterID=(Select HProcExchInterID from Sc_StationInBillMain Where HInterID=55) " +
+ " and b.HEntryID=(Select HProcExchEntryID from Sc_StationInBillMain Where HInterID=55)", "Sc_ProcessExchangeBillMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ }
+ else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ {
+ }
+ sReturn = sReturn + " 瀹℃牳鍔熻兘锛�";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ return false; ;
+ }
+ }
#endregion
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6314e8b..96553ac 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/19/2021 17:37:44</publishTime>
+ <publishTime>08/20/2021 14:25:34</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/19/2021 17:37:44</publishTime>
+ <publishTime>08/20/2021 14:25:34</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/19/2021 17:37:42</publishTime>
+ <publishTime>08/20/2021 14:25:30</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/19/2021 17:37:42</publishTime>
+ <publishTime>08/20/2021 14:25:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/19/2021 17:37:40</publishTime>
+ <publishTime>08/20/2021 14:25:24</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/19/2021 17:37:40</publishTime>
+ <publishTime>08/20/2021 14:25:24</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
- <publishTime>08/19/2021 17:37:43</publishTime>
+ <publishTime>08/20/2021 14:25:31</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:25</publishTime>
+ <publishTime>09/20/2018 19:08:18</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,37 +60,37 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/19/2021 17:37:41</publishTime>
+ <publishTime>08/20/2021 14:25:25</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/19/2021 17:37:41</publishTime>
+ <publishTime>08/20/2021 14:25:25</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/19/2021 17:37:39</publishTime>
+ <publishTime>08/20/2021 14:25:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/19/2021 17:37:39</publishTime>
+ <publishTime>08/20/2021 14:25:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/19/2021 17:37:39</publishTime>
+ <publishTime>08/20/2021 14:25:22</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/19/2021 17:37:39</publishTime>
+ <publishTime>08/20/2021 14:25:22</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/19/2021 17:37:40</publishTime>
+ <publishTime>08/20/2021 14:25:23</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/19/2021 17:37:40</publishTime>
+ <publishTime>08/20/2021 14:25:23</publishTime>
</File>
<File Include="bin/stdole.dll">
- <publishTime>05/09/2021 13:35:37</publishTime>
+ <publishTime>01/13/2021 17:00:05</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/19/2021 17:37:45</publishTime>
+ <publishTime>08/20/2021 14:25:39</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/19/2021 17:37:45</publishTime>
+ <publishTime>08/20/2021 14:25:39</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +204,166 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:27</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:27</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:27</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/19/2021 17:37:54</publishTime>
+ <publishTime>08/20/2021 14:25:53</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1