From 46f04decbfe0f8347dc1ee2574fb10b36208e01e Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 07 十一月 2022 10:12:43 +0800
Subject: [PATCH] 修改了生产入库赋值API存储过程
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
WebAPI/Controllers/Sc_ProcessMangementController.cs | 7 ++++---
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 9226e60..cd48eef 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -418,7 +418,8 @@
return objJsonResult;
}
//
- DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERPProcduct_LastProc where HLastProc = '鏄�' and hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
+ //DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERPProcduct_LastProc where HLastProc = '鏄�' and hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
+ DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc '" + BillNo + "'", "h_p_TOERPProcduct_LastProc");
DataRow dr1 = ds1.Tables[0].Rows[0];
JObject model = new JObject();
@@ -505,7 +506,7 @@
Fentity.Add(FentityModel);
- Fentity.Add(FentityModel);
+ //Fentity.Add(FentityModel);
}
model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
JObject jsonRoot = new JObject()
@@ -543,7 +544,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"鐢熶骇鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{HBillNo.ToString()}" + result;
+ objJsonResult.Message = $"鐢熶骇鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{HBillNo.ToString()}" + result + jsonRoot;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 273cd73..d4a7b98 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>11/02/2022 22:03:01</publishTime>
+ <publishTime>11/05/2022 18:54:29</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/02/2022 22:03:01</publishTime>
+ <publishTime>11/05/2022 18:54:29</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/02/2022 22:02:58</publishTime>
+ <publishTime>11/05/2022 18:54:26</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/02/2022 22:02:58</publishTime>
+ <publishTime>11/05/2022 18:54:26</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/02/2022 22:02:56</publishTime>
+ <publishTime>11/05/2022 18:54:18</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/02/2022 22:02:56</publishTime>
+ <publishTime>11/05/2022 18:54:18</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>11/02/2022 22:02:56</publishTime>
+ <publishTime>11/05/2022 18:54:21</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/02/2022 22:02:56</publishTime>
+ <publishTime>11/05/2022 18:54:21</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>11/02/2022 22:02:54</publishTime>
+ <publishTime>11/05/2022 18:54:15</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/02/2022 22:02:54</publishTime>
+ <publishTime>11/05/2022 18:54:15</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/02/2022 22:02:55</publishTime>
+ <publishTime>11/05/2022 18:54:16</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/02/2022 22:02:55</publishTime>
+ <publishTime>11/05/2022 18:54:16</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/02/2022 22:02:55</publishTime>
+ <publishTime>11/05/2022 18:54:16</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/02/2022 22:02:55</publishTime>
+ <publishTime>11/05/2022 18:54:16</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>11/02/2022 22:03:04</publishTime>
+ <publishTime>11/05/2022 18:54:36</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/02/2022 22:03:04</publishTime>
+ <publishTime>11/05/2022 18:54:36</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>11/02/2022 22:03:20</publishTime>
+ <publishTime>11/05/2022 18:54:46</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1