From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/Warehouse/MesXsckManager.cs | 80 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/service/Warehouse/MesXsckManager.cs b/service/Warehouse/MesXsckManager.cs
index df9f864..fd12c0e 100644
--- a/service/Warehouse/MesXsckManager.cs
+++ b/service/Warehouse/MesXsckManager.cs
@@ -1,14 +1,11 @@
-锘縰sing Masuit.Tools;
-using MES.Service.Modes;
+锘縰sing System.Data;
+using System.Data.SqlClient;
+using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
-using SqlSugar.Extensions;
-using System.Data;
-using System.Data.SqlClient;
namespace NewPdaSqlServer.service.Warehouse;
@@ -30,17 +27,18 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛℅et_Qt_ck_List
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_xsck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ "EXEC prc_pda_xsck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
+ parameters);
return blDetails;
}
catch (Exception ex)
@@ -53,7 +51,8 @@
/// 鏍规嵁鍙戣揣閫氱煡鍗曡幏鍙栧搴斾唬鍙戣揣鏄庣粏 prc_rf_pda_scan_zout_showbl
/// </summary>
/// <returns>鍙戣揣閫氱煡鍗曟槑缁嗗垪琛�</returns>
- public dynamic GetMesItemFHTZetailByBillNo(dynamic query, dynamic RequestInfo)
+ public dynamic GetMesItemFHTZetailByBillNo(dynamic query,
+ dynamic RequestInfo)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -71,24 +70,24 @@
// 鑾峰彇鏈畬鎴愮殑鍙戣揣閫氱煡鍗曟槑缁�
var parameters = new[]
-{
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId",orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+ {
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_xsck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ var blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_xsck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
+ parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items = items,
- ysitems = ysitems
+ items, ysitems
};
}
catch (Exception ex)
@@ -99,7 +98,7 @@
}
/// <summary>
- /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -111,14 +110,15 @@
/// - userName: 鐢ㄦ埛鍚�
/// - blNo: 鍙戣揣閫氱煡鍗曞彿(蹇呭～)
/// </remarks>
- public ProductionPickDto XSCKScanBarcode( WarehouseQuery query)
+ public ProductionPickDto XSCKScanBarcode(WarehouseQuery query)
{
var _strMsg = "";
var _intSum = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.daa001.IsNullOrEmpty()) throw new Exception("鍙戣揣閫氱煡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.daa001.IsNullOrEmpty())
+ throw new Exception("鍙戣揣閫氱煡鍗曞彿涓嶅厑璁镐负绌�");
if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_XSCK]", conn))
@@ -230,13 +230,9 @@
var outNoType = "";
if (query.Type == "鐢熶骇琛ユ枡")
- {
outNoType = "SCBL(鐢熶骇琛ユ枡)";
- }
else
- {
outNoType = "SCCL(鐢熶骇瓒呴)";
- }
// 寮�鍚簨鍔″鐞�
var success = UseTransaction(db =>
@@ -488,7 +484,7 @@
Status = 0,
DepotId = stockBarcode.DepotId,
THORGID = stockBarcode.StockOrgId,
- OutType = query.Type,
+ OutType = query.Type
//BbillNo = query.blNo
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -531,7 +527,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
DepotId = stockBarcode.DepotId.ToString(),
- ItemDabid = womdab.Guid,
+ ItemDabid = womdab.Guid
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -540,9 +536,9 @@
executeCommand += db.Updateable<MesInvItemOutItems>()
.SetColumns(it => it.TlQty == (it.TlQty ?? 0) + query.Num)
.Where(it =>
- it.ItemOutId == outId &&
- it.ItemId == stockBarcode.ItemId &&
- it.DepotId == stockBarcode.DepotId.ToString())
+ it.ItemOutId == outId &&
+ it.ItemId == stockBarcode.ItemId &&
+ it.DepotId == stockBarcode.DepotId.ToString())
.ExecuteCommand();
// 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
@@ -574,7 +570,7 @@
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
DepotId = (int)stockBarcode.DepotsId,
- Dabid = womdab.Guid,
+ Dabid = womdab.Guid
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟娴佹按
@@ -616,7 +612,8 @@
Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
})
- .Where(it => it.Guid == womdab.Guid && it.Dab003 == womdab.Dab003)
+ .Where(it =>
+ it.Guid == womdab.Guid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊鍙戣揣閫氱煡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -684,5 +681,4 @@
}
#endregion
-
}
\ No newline at end of file
--
Gitblit v1.9.3