From 1ae7a525919be78160f2d061c8adb41d1aef3335 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 07 八月 2024 14:58:03 +0800
Subject: [PATCH] 修复出站单带出模具赋值
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 29 +++++++-------
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user | 36 +++++++++---------
2 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index bf61a5a..95f0e3c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -3683,28 +3683,29 @@
{
try
{
- string sql = @"SELECT b.HMouldID,c.HMouldNo 妯″叿缂栫爜,c.HName 妯″叿鍚嶇О,c.HModel 妯″叿鍨嬪彿 FROM Sc_ICMOBillStatus_Tmp a
- LEFT JOIN(
+ string sql = @"SELECT b.HMouldID,c.HMouldNo 妯″叿缂栫爜,c.HName 妯″叿鍚嶇О,c.HModel 妯″叿鍨嬪彿 FROM Sc_ICMOBillStatus_Tmp a LEFT JOIN(
SELECT *, ROW_NUMBER() OVER(PARTITION BY HSourceID ORDER BY HScanDate DESC) AS RowNum FROM Sc_MouldUpperBillSub
- ) b ON a.HSourceID = b.HSourceID AND b.RowNum = 1
- left join Gy_MouldFileMain c on b.HMouldID = c.HInterID
- where a.HSourceInterID ='" + HInterID + "' and a.HSourceEntryID ='" + HEntryID + "' and a.HSourceBillNo ='" + HBillNo + "'";
+ ) b ON a.HSourceID = b.HSourceID AND b.RowNum = 1 left join Gy_MouldFileMain c on b.HMouldID = c.HInterID
+ where b.HMouldID is not null and a.HSourceInterID ='" + HInterID + "' and a.HSourceEntryID ='" + HEntryID + "' and a.HSourceBillNo ='" + HBillNo + "'";
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
- if (ds.Tables[0].Rows.Count == 0)
+ if (ds.Tables[0].Rows.Count != 0 && ds != null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠璁惧娌℃湁妯″叿杩涜缁戝畾!";
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ return objJsonResult;
+ }
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+
}
catch (Exception e)
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
index ce88f33..6499d89 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-08-06T07:58:21.9478483Z;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;True|2024-08-05T10:38:17.0385673+08:00;True|2024-08-02T15:30:55.2850118+08:00;True|2024-08-02T14:51:56.4523731+08:00;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
+ <History>True|2024-08-07T06:54:25.8394649Z;True|2024-08-07T14:50:30.7287125+08:00;True|2024-08-07T14:47:58.1033886+08:00;True|2024-08-07T14:42:04.7937203+08:00;False|2024-08-07T14:41:11.1166410+08:00;True|2024-08-07T14:40:06.2944968+08:00;True|2024-08-06T17:31:51.1577940+08:00;True|2024-08-06T15:58:21.9478483+08:00;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;True|2024-08-05T10:38:17.0385673+08:00;True|2024-08-02T15:30:55.2850118+08:00;True|2024-08-02T14:51:56.4523731+08:00;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/06/2024 15:52:11</publishTime>
+ <publishTime>08/07/2024 14:54:12</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/06/2024 15:52:11</publishTime>
+ <publishTime>08/07/2024 14:54:12</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/06/2024 15:52:09</publishTime>
+ <publishTime>08/07/2024 14:54:11</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/06/2024 15:52:09</publishTime>
+ <publishTime>08/07/2024 14:54:11</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/06/2024 15:52:07</publishTime>
+ <publishTime>08/07/2024 14:54:09</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/06/2024 15:52:07</publishTime>
+ <publishTime>08/07/2024 14:54:09</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/06/2024 15:52:07</publishTime>
+ <publishTime>08/07/2024 14:54:09</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/06/2024 15:52:07</publishTime>
+ <publishTime>08/07/2024 14:54:09</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/06/2024 15:52:05</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/06/2024 15:52:05</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/06/2024 15:52:06</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/06/2024 15:52:06</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/06/2024 15:52:06</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/06/2024 15:52:06</publishTime>
+ <publishTime>08/07/2024 14:54:08</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/06/2024 15:52:17</publishTime>
+ <publishTime>08/07/2024 14:54:16</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/06/2024 15:52:17</publishTime>
+ <publishTime>08/07/2024 14:54:16</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/06/2024 15:52:24</publishTime>
+ <publishTime>08/07/2024 14:54:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1