From a6f9b5610c5c9dcc25e9c4dfc288a959fb11f458 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 10 十二月 2025 09:48:17 +0800
Subject: [PATCH] 1、收料模块 2、异常单
---
WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs | 145 ++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
index aa7daa7..c64bc65 100644
--- a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
+++ b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
@@ -115,6 +115,7 @@
m = dr.RowToDynamic();
m.list1 = dset.Tables[1].TableToDynamicList();
m.list2 = dset.Tables[2].TableToDynamicList();
+ m.list3 = dset.Tables[3].TableToDynamicList();
}
}
catch (Exception ex)
@@ -131,6 +132,60 @@
/// <param name="model"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
+ /* public ReturnDto<int?> DeleteBarcode([FromBody] dynamic model)
+ {
+ int? rtnInt = (int)ReturnCode.Default;
+ string guidList = model.guidList;
+ string aboutType = model.aboutType;
+ string aboutGuid = model.aboutGuid;
+ var _outMsg = "";
+ var _outSum = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inOrderGuid", aboutGuid),
+ new("@inEdtUserGuid", _userGuid),
+ new("@guidList", guidList),
+ new("@aboutType", aboutType)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _outMsg = parameters[0].Value.ToString();
+ _outSum = int.Parse(parameters[1].Value.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_barcode_del error锛�" + ex.Message);
+ _outMsg = ex.Message;
+ _outSum = -1;
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ if (_outSum <= 0)
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
+ _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
+ }
+ */
+
public ReturnDto<int?> DeleteBarcode([FromBody] dynamic model)
{
int? rtnInt = (int)ReturnCode.Default;
@@ -139,9 +194,15 @@
string aboutGuid = model.aboutGuid;
var _outMsg = "";
var _outSum = -1;
+
+ // 鍒ゆ柇aboutGuid鏄惁涓烘湁鏁堢殑uniqueidentifier
+ bool is_validGuid = Guid.TryParse(aboutGuid, out _);
+ // 鏍规嵁楠岃瘉缁撴灉閫夋嫨瀵瑰簲鐨勫瓨鍌ㄨ繃绋�
+ string storedProcedureName = is_validGuid ? "[prc_barcode_del]" : "[prc_barcode_del_hb]";
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
+ using (var cmd = new SqlCommand(storedProcedureName, conn))
{
try
{
@@ -149,13 +210,13 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inOrderGuid", aboutGuid),
- new("@inEdtUserGuid", _userGuid),
- new("@guidList", guidList),
- new("@aboutType", aboutType)
- };
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inOrderGuid", aboutGuid),
+ new("@inEdtUserGuid", _userGuid),
+ new("@guidList", guidList),
+ new("@aboutType", aboutType)
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
@@ -167,7 +228,7 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(),
- "prc_barcode_del error锛�" + ex.Message);
+ $"{storedProcedureName} error锛歿ex.Message}");
_outMsg = ex.Message;
_outSum = -1;
}
@@ -183,6 +244,8 @@
_outMsg);
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
}
+
+
/// <summary>
/// 閫夋嫨鏉＄爜
@@ -258,68 +321,4 @@
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
-
-
- /// <summary>
- /// 鎵撳嵃鎶ヨ〃
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetListPageReport([FromBody] dynamic model)
- {
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- new("@inFid", ""),
- new("@inP1", ""),
- new("@inP2", ""),
- new("@inP3", ""),
- new("@inP4", "")
- };
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("prc_dhtm_report", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
- }
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
-
}
\ No newline at end of file
--
Gitblit v1.9.3