From 78d46ab53d8689c31c8538c2b7f673765a414cc9 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 26 十一月 2021 17:35:53 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 8 ++++----
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index cac2f61..7149de7 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -2362,7 +2362,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select HMaterID,HUnitID,HQty,HQtyMust,HRemark from Sc_MouldMaintainPlanBillSub", "Sc_MouldMaintainPlanBillSub");
+ ds = oCN.RunProcReturn("select a.HMaterID,m.HNumber HMaterNumber,a.HUnitID,u.HNumber HUnitNumber,a.HQty,a.HQtyMust,a.HRemark from Sc_MouldMaintainPlanBillSub a left join Gy_Unit u on a.HUnitID=u.HItemID left join h_v_IF_Material m on a.HMaterID=m.HItemID", "Sc_MouldMaintainPlanBillSub");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -2370,7 +2370,7 @@
}
else
{
- string sql1 = "select HMaterID,HUnitID,HQty,HQtyMust,HRemark from Sc_MouldMaintainPlanBillSub where 1 = 1 ";
+ string sql1 = "select a.HMaterID,m.HNumber HMaterNumber,a.HUnitID,u.HNumber HUnitNumber,a.HQty,a.HQtyMust,a.HRemark from Sc_MouldMaintainPlanBillSub a left join Gy_Unit u on a.HUnitID=u.HItemID left join h_v_IF_Material m on a.HMaterID=m.HItemID where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainPlanBillSub");
objJsonResult.code = "0";
@@ -3234,7 +3234,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckPlanBillSub", "Sc_MouldDotCheckPlanBillSub");
+ ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID", "Sc_MouldDotCheckPlanBillSub");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -3242,7 +3242,7 @@
}
else
{
- string sql1 = "select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckPlanBillSub where 1 = 1 ";
+ string sql1 = "select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckPlanBillSub");
objJsonResult.code = "0";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2497608..8178547 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/24/2021 19:23:01</publishTime>
+ <publishTime>11/26/2021 17:29:39</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/24/2021 19:23:01</publishTime>
+ <publishTime>11/26/2021 17:29:39</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/24/2021 19:22:59</publishTime>
+ <publishTime>11/26/2021 17:29:37</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/24/2021 19:22:59</publishTime>
+ <publishTime>11/26/2021 17:29:37</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/24/2021 19:22:55</publishTime>
+ <publishTime>11/26/2021 17:29:33</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/24/2021 19:22:55</publishTime>
+ <publishTime>11/26/2021 17:29:33</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/24/2021 19:22:55</publishTime>
+ <publishTime>11/26/2021 17:29:33</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/24/2021 19:22:55</publishTime>
+ <publishTime>11/26/2021 17:29:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/24/2021 19:22:52</publishTime>
+ <publishTime>11/26/2021 17:29:31</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/24/2021 19:22:52</publishTime>
+ <publishTime>11/26/2021 17:29:31</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/24/2021 19:22:53</publishTime>
+ <publishTime>11/26/2021 17:29:32</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/24/2021 19:22:53</publishTime>
+ <publishTime>11/26/2021 17:29:32</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/24/2021 19:22:54</publishTime>
+ <publishTime>11/26/2021 17:29:32</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/24/2021 19:22:54</publishTime>
+ <publishTime>11/26/2021 17:29:32</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/24/2021 19:23:04</publishTime>
+ <publishTime>11/26/2021 17:29:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/24/2021 19:23:04</publishTime>
+ <publishTime>11/26/2021 17:29:43</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/24/2021 19:23:17</publishTime>
+ <publishTime>11/26/2021 17:30:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1