From ed81b855b6a2e701db3f38a10f9aa611978c51fe Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期四, 09 十一月 2023 20:10:27 +0800 Subject: [PATCH] 生产订单变更单:变更单 审核时, 进行数据判断,新数量 不能小于 单据被关联的数量 --- WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 19 +++++++++++++++++++ WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++----------------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs index 5779e44..df2b71b 100644 --- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs @@ -468,6 +468,25 @@ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣� if (IsAudit == 0) //瀹℃牳鎻愪氦 { + //妫�楠屽瓙琛ㄦ暟鎹� + string errorMessage = ""; + foreach (Model.ClsSc_ICMOChangeBillSub oSub in oBill.DetailColl) + { + //鍒ゆ柇鏂版暟閲忔槸鍚﹀皬浜庡崟鎹叧鑱旀暟閲� + if (oSub.HQty_New < oSub.HRelationQty) + { + errorMessage += "鐗╂枡鏂版暟閲忓皬浜庡崟鎹鍏宠仈鏁伴噺!"; + } + } + if (errorMessage != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + errorMessage; + objJsonResult.data = null; + return objJsonResult; + } + //瀹℃牳鎻愪氦 if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) { diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index dbda4f3..b8f47a5 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -20,12 +20,12 @@ <File Include="bin/BLL.dll"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>11/09/2023 18:44:19</publishTime> + <publishTime>11/09/2023 20:08:36</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>11/09/2023 18:44:19</publishTime> + <publishTime>11/09/2023 20:08:36</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> @@ -33,12 +33,12 @@ <File Include="bin/DAL.dll"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>11/09/2023 18:44:17</publishTime> + <publishTime>11/09/2023 20:08:34</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>11/09/2023 18:44:17</publishTime> + <publishTime>11/09/2023 20:08:34</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> @@ -46,12 +46,12 @@ <File Include="bin/DBUtility.dll"> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>11/15/2022 13:55:23</publishTime> - <publishTime>11/09/2023 18:44:15</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/09/2022 16:01:58</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/09/2023 18:44:15</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -107,12 +107,12 @@ <File Include="bin/Model.dll"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/09/2023 18:44:15</publishTime> + <publishTime>11/09/2023 20:08:31</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/09/2023 18:44:15</publishTime> + <publishTime>11/09/2023 20:08:31</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -147,33 +147,33 @@ <File Include="bin/Pub_Class.dll"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>11/09/2023 18:44:13</publishTime> + <publishTime>11/09/2023 20:08:29</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>11/09/2023 18:44:13</publishTime> + <publishTime>11/09/2023 20:08:29</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/09/2023 18:44:14</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/09/2023 18:44:14</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>11/09/2023 18:44:14</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/09/2023 18:44:14</publishTime> + <publishTime>11/09/2023 20:08:30</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -286,7 +286,7 @@ <File Include="bin/WebAPI.dll"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>11/09/2023 18:44:23</publishTime> + <publishTime>11/09/2023 20:08:42</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/15/2021 17:59:43</publishTime> @@ -294,7 +294,7 @@ <File Include="bin/WebAPI.pdb"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>11/09/2023 18:44:23</publishTime> + <publishTime>11/09/2023 20:08:42</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -503,7 +503,7 @@ <File Include="Web.config"> <publishTime>11/14/2022 11:24:08</publishTime> <publishTime>11/02/2022 22:03:20</publishTime> - <publishTime>11/09/2023 18:44:27</publishTime> + <publishTime>11/09/2023 20:09:00</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file -- Gitblit v1.9.1