From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
index 445460a..ec7c04f 100644
--- a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
+++ b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
@@ -7,7 +7,6 @@
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-
namespace Gs.Warehouse.Services;
[ApiGroup(ApiGroupNames.PerMission)]
@@ -78,7 +77,7 @@
{
LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ ReturnCode.Exception, ex.Message);
}
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
@@ -103,7 +102,7 @@
{
new("@inOrderGuid", inOrderGuid),
new("@inP1", ""),
- new("@inP2", "")
+ new("@inP2", ""),
};
var dset = new DataSet();
try
@@ -122,13 +121,12 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ "璇诲彇鎴愬姛锛�");
}
/// <summary>
- /// 鍒犻櫎鏉＄爜
+ /// 鍒犻櫎鏉＄爜
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -187,7 +185,7 @@
}
/// <summary>
- /// 閫夋嫨鏉＄爜
+ /// 閫夋嫨鏉＄爜
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -228,18 +226,14 @@
dt.Fill(dset, "0");
}
}
-
conn.Close();
}
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(),
- "prc_barcode_select error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(
- default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ LogHelper.Debug(ToString(), "prc_barcode_select error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
-
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -261,7 +255,6 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
--
Gitblit v1.9.3