From 012b220798a425cf147e5b9f6a148844519c1fd1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 28 十月 2022 16:32:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 ++++++++--------
WebAPI/Controllers/Sc_ProcessMangementController.cs | 6 +-
WebAPI/Controllers/POStockInBillController.cs | 49 ++++++++++++++++++++++++
3 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 2aa0519..32d8105 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -411,6 +411,55 @@
}
+
+
+
+
+ [Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")]
+ [HttpGet]
+ public object BarCode_Json(string HBarCode)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 鏉＄爜缂栧彿 ='" + HBarCode.ToString() + "'" , "h_v_QCStockInCheckBill_Json");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
+
+
+
+
/// <summary>
/// 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃
/// </summary>
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 079159d..13389e1 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -417,7 +417,7 @@
return objJsonResult;
}
//
- DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERPProcduct_LastProc where 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");
DataRow dr1 = ds1.Tables[0].Rows[0];
JObject model = new JObject();
@@ -501,8 +501,8 @@
["IsDeleteEntry"] = "true",
["SubSystemId"] = "",
- ["IsVerifyBaseDataField"] = "false",
- ["IsEntryBatchFill"] = "true",
+ ["IsVerifyBaseDataField"] = "true",
+ ["IsEntryBatchFill"] = "false",
["ValidateFlag"] = "true",
["NumberSearch"] = "true",
["IsAutoAdjustField"] = "false",
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2de5d57..33378cc 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>10/25/2022 23:35:35</publishTime>
+ <publishTime>10/26/2022 15:47:08</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/25/2022 23:35:35</publishTime>
+ <publishTime>10/26/2022 15:47:08</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/25/2022 23:35:33</publishTime>
+ <publishTime>10/26/2022 15:47:06</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/25/2022 23:35:33</publishTime>
+ <publishTime>10/26/2022 15:47:06</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/25/2022 23:35:25</publishTime>
+ <publishTime>10/26/2022 15:47:04</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/25/2022 23:35:25</publishTime>
+ <publishTime>10/26/2022 15:47:04</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>10/25/2022 23:35:28</publishTime>
+ <publishTime>10/26/2022 15:47:05</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/25/2022 23:35:28</publishTime>
+ <publishTime>10/26/2022 15:47:05</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>10/25/2022 23:35:23</publishTime>
+ <publishTime>10/26/2022 15:47:03</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/25/2022 23:35:23</publishTime>
+ <publishTime>10/26/2022 15:47:03</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/25/2022 23:35:24</publishTime>
+ <publishTime>10/26/2022 15:47:04</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/25/2022 23:35:24</publishTime>
+ <publishTime>10/26/2022 15:47:04</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/25/2022 23:35:24</publishTime>
+ <publishTime>10/26/2022 15:47:04</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/25/2022 23:35:24</publishTime>
+ <publishTime>10/26/2022 15:47:04</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>10/25/2022 23:35:42</publishTime>
+ <publishTime>10/26/2022 15:47:11</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/25/2022 23:35:42</publishTime>
+ <publishTime>10/26/2022 15:47:11</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>10/25/2022 23:35:49</publishTime>
+ <publishTime>10/26/2022 15:47:24</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1