From c3ad7025d45c0cd270396e83e6ba0e200d64c575 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 31 七月 2022 14:59:32 +0800
Subject: [PATCH] 修改了 生产任务单维护根据单据号倒序排列 以及流转卡 已经有下游进出站单后，不允许删除
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
WebAPI/Web.config | 4 ++--
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 19 +++++++++++++++++++
WebAPI/Controllers/LMESController.cs | 2 +-
4 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 8c801b9..4e378da 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -552,6 +552,25 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+
+ //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds;
+ ds = oCn.RunProcReturn("select ct from ( " +
+ " select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
+ " union all " +
+ " select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a ", "Sc_ProcExchReportSub");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
DBUtility.ClsPub.HOrgID = HPRDORGID;
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 89db549..f71a2bc 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -389,7 +389,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by HEntryID", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index fe3cabf..cad06b8 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/29/2022 08:36:32</publishTime>
+ <publishTime>07/31/2022 12:56:21</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/29/2022 08:36:32</publishTime>
+ <publishTime>07/31/2022 12:56:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/29/2022 08:36:31</publishTime>
+ <publishTime>07/31/2022 12:56:19</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/29/2022 08:36:31</publishTime>
+ <publishTime>07/31/2022 12:56:19</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:12</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:12</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:15</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:15</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/29/2022 08:36:28</publishTime>
+ <publishTime>07/31/2022 12:56:10</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/29/2022 08:36:28</publishTime>
+ <publishTime>07/31/2022 12:56:10</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/29/2022 08:36:28</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/29/2022 08:36:28</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/29/2022 08:36:29</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/29/2022 08:36:34</publishTime>
+ <publishTime>07/31/2022 12:56:25</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/29/2022 08:36:34</publishTime>
+ <publishTime>07/31/2022 12:56:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/29/2022 08:36:41</publishTime>
+ <publishTime>07/31/2022 12:56:38</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0d54a06..c117bfe 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
- <add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
@@ -92,7 +92,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
--
Gitblit v1.9.1