From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/Warehouse/MesBarCFManager.cs | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/service/Warehouse/MesBarCFManager.cs b/service/Warehouse/MesBarCFManager.cs
index 2efe965..7865083 100644
--- a/service/Warehouse/MesBarCFManager.cs
+++ b/service/Warehouse/MesBarCFManager.cs
@@ -1,12 +1,11 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
-using Masuit.Tools.Hardware;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.util;
using SqlSugar;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -14,12 +13,43 @@
{
public MesInvItemStocks GetBarInfo(WarehouseQuery unity)
{
- var barInfo = Db.Queryable<MesInvItemStocks>()
+ var barInfo = Db.Queryable<MesInvItemStocks>()
.Where(s => s.ItemBarcode == unity.barcode)
.First();
if (barInfo is null) throw new Exception("璇ユ潯鐮佸簱瀛樹笉瀛樺湪锛�");
return barInfo; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
+ }
+
+ public dynamic GetBarInfoBefore(WarehouseQuery unity)
+ {
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter>
+ { new("@barcode", unity.barcode) };
+
+ var sql1 =
+ @"SELECT 1 FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE =@barcode ";
+
+ var KcInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
+
+ if (KcInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鍏ュ簱涓嶈兘杩涜鍏ュ簱鍓嶆媶鍒嗭紒");
+
+
+ //var sql3 = @"SELECT 1 FROM MES_INV_ITEM_CGYT_C_DETAILS WHERE ITEM_BARCODE =@barcode";
+
+ //var YtInfo = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams);
+
+ //if (YtInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鎵弿閫�鏂欎笉鑳借繘琛屽叆搴撳墠鎷嗗垎锛�");
+
+ var sql2 =
+ @"SELECT ITEM_ID,QUANTITY FROM MES_INV_ITEM_BARCODES WHERE ITEM_BARCODE =@barcode ";
+
+ var barInfo =
+ Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
+
+ if (barInfo is null) throw new Exception("璇ユ潯鐮佷俊鎭笉瀛樺湪锛�");
+
+ return barInfo;
}
public MesItems GetItemNo(decimal strItemId)
@@ -36,7 +66,7 @@
{
var _strMsg = "";
var _intSum = "";
- var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
@@ -56,8 +86,7 @@
new("@barcode_new", SqlDbType.NVarChar, 300),
new("@c_user", unity.userName),
new("@p_old_barcode", unity.barcode),
- new("@p_qty", unity.CfNum),
-
+ new("@p_qty", unity.CfNum)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -76,8 +105,8 @@
var dto = new ProductionPickDto
{
- barcode = unity.barcode,//鍘熸潯鐮�
- cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ barcode = unity.barcode, //鍘熸潯鐮�
+ cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -87,7 +116,6 @@
//return _strMsg;
//return 0;
-
}
catch (Exception ex)
{
@@ -101,33 +129,11 @@
}
}
- //鍏ュ簱鍓嶆媶鍒�
- public dynamic GetBarInfoBefore(WarehouseQuery unity)
- {
-
- // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter> { new("@barcode", unity.barcode) };
-
- var sql1 = @"SELECT 1 FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE =@barcode ";
-
- var KcInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
-
- if (KcInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鍏ュ簱涓嶈兘杩涜鍏ュ簱鍓嶆媶鍒嗭紒");
-
- var sql2 = @"SELECT ITEM_ID,QUANTITY FROM MES_INV_ITEM_BARCODES WHERE ITEM_BARCODE =@barcode ";
-
- var barInfo = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
-
- if (barInfo is null) throw new Exception("璇ユ潯鐮佷俊鎭笉瀛樺湪锛�");
-
- return barInfo;
- }
- //鍏ュ簱鍓嶆媶鍒�
public ProductionPickDto BarCfBefore(WarehouseQuery unity)
{
var _strMsg = "";
var _intSum = "";
- var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
@@ -147,8 +153,7 @@
new("@barcode_new", SqlDbType.NVarChar, 300),
new("@c_user", unity.userName),
new("@p_old_barcode", unity.barcode),
- new("@p_qty", unity.CfNum),
-
+ new("@p_qty", unity.CfNum)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -167,8 +172,8 @@
var dto = new ProductionPickDto
{
- barcode = unity.barcode,//鍘熸潯鐮�
- cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ barcode = unity.barcode, //鍘熸潯鐮�
+ cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -178,7 +183,6 @@
//return _strMsg;
//return 0;
-
}
catch (Exception ex)
{
@@ -191,5 +195,4 @@
}
}
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3