From 6ced0cff2123105422ec0d66d6e5f3c5b7dba8e0 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 01 九月 2021 15:23:42 +0800
Subject: [PATCH] 不良原因修改页面完善以及列表完善
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 146 ++++++++++++++++++++++++------------------------
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 6 +-
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 1
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/WebAPIController.cs | 24 ++++----
5 files changed, 89 insertions(+), 90 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index c8fe01b..650b243 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -31,12 +31,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere, "h_v_IF_BadReasonList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere+ " order by HItemID desc", "h_v_IF_BadReasonList");
}
else
{
- string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1";
+ string sql = sql1 + sWhere+ " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 9434b26..dedfd6e 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -491,7 +491,6 @@
{
try
{
-
ds = Sc_MouldRepairCheckBillList_s(sWhere);
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 73bf700..b6c0485 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1237,22 +1237,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- if (HStopflag)
- {
- oCN.RollBack();//鍥炴粴浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 5643afb..b729f90 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/16/2021 17:23:16</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/31/2021 16:28:48</publishTime>
+ <publishTime>09/01/2021 14:30:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/31/2021 16:28:48</publishTime>
+ <publishTime>09/01/2021 14:30:57</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/31/2021 16:28:46</publishTime>
+ <publishTime>09/01/2021 14:30:55</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/31/2021 16:28:46</publishTime>
+ <publishTime>09/01/2021 14:30:55</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/31/2021 16:28:44</publishTime>
+ <publishTime>09/01/2021 14:30:52</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/31/2021 16:28:44</publishTime>
+ <publishTime>09/01/2021 14:30:52</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:25</publishTime>
+ <publishTime>08/16/2021 17:23:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/31/2021 16:28:45</publishTime>
+ <publishTime>09/01/2021 14:30:52</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/31/2021 16:28:45</publishTime>
+ <publishTime>09/01/2021 14:30:52</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</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/31/2021 16:28:42</publishTime>
+ <publishTime>09/01/2021 14:30:50</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/31/2021 16:28:42</publishTime>
+ <publishTime>09/01/2021 14:30:50</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/31/2021 16:28:43</publishTime>
+ <publishTime>09/01/2021 14:30:51</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/31/2021 16:28:43</publishTime>
+ <publishTime>09/01/2021 14:30:51</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/31/2021 16:28:43</publishTime>
+ <publishTime>09/01/2021 14:30:51</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/31/2021 16:28:43</publishTime>
+ <publishTime>09/01/2021 14:30:51</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</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/16/2021 17:23:15</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/31/2021 16:28:49</publishTime>
+ <publishTime>09/01/2021 14:31:00</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/31/2021 16:28:49</publishTime>
+ <publishTime>09/01/2021 14:31:00</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/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/31/2021 16:28:55</publishTime>
+ <publishTime>09/01/2021 14:31:07</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 8d7bb3f..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>D:\Git浠撳簱\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1