From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/Warehouse/MesItemQtManager.cs | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs
index a254c1e..2ee0c44 100644
--- a/service/Warehouse/MesItemQtManager.cs
+++ b/service/Warehouse/MesItemQtManager.cs
@@ -1,13 +1,11 @@
-锘縰sing Masuit.Tools;
+锘縰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 System.Data;
-using System.Data.SqlClient;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -19,7 +17,7 @@
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
public dynamic GetPendingQtList(dynamic RequestInfo)
- {
+ {
var orgId = RequestInfo.OrgId;
if (orgId == null)
@@ -28,17 +26,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
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛�
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_qtck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ "EXEC prc_pda_qtck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
+ parameters);
return blDetails;
}
catch (Exception ex)
@@ -60,25 +59,26 @@
throw new Exception("缁勭粐涓嶅瓨鍦紒");
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_qtck_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_qtck_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,
- allList = blDetails,
+ items,
+ ysitems,
+ allList = blDetails
};
}
catch (Exception ex)
@@ -89,7 +89,7 @@
}
/// <summary>
- /// 鎵爜鍑哄簱
+ /// 鎵爜鍑哄簱
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -124,8 +124,6 @@
throw new Exception($"mes涓笉瀛樺湪姝ゆ潯鐮�,璇锋牳瀵癸紒{p_item_barcode}");
-
-
// 鑾峰彇搴撳瓨淇℃伅
var stock = Db.Queryable<MesInvItemStocks>()
.Where(it => it.ItemBarcode == p_item_barcode && it.Quantity > 0)
@@ -153,7 +151,9 @@
// 鑾峰彇鍏朵粬鍑哄簱鍗曚俊鎭�
var mesItemQt = Db.Queryable<MesItemQt>()
- .Where(it => it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true && it.Qt029 == true && it.Qt032 == true)
+ .Where(it =>
+ it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true &&
+ it.Qt029 == true && it.Qt032 == true)
.First();
if (mesItemQt == null)
@@ -169,17 +169,14 @@
if (qtDetail == null) throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒");
- if (mesItemQt.Qt014 == true)
+ if (mesItemQt.Qt014)
throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 宸插畬缁擄紝璇风‘璁わ紒");
// 妫�鏌ヤ粨搴撴槸鍚︿竴鑷�
- if (qtDetail.DepotId != stock.DepotId)
+ if (qtDetail.DepotId != stock.DepotId)
throw new Exception(
$"鎵爜鍑鸿揣浠撳簱id{qtDetail.DepotId}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟stock.DepotId}涓嶄竴鑷达紝璇锋牳瀵癸紒");
-
-
-
// 妫�鏌ュ墿浣欐暟閲�
var remainingQty = (qtDetail.Qd007 ?? 0) - (qtDetail.Qd008 ?? 0);
@@ -190,8 +187,8 @@
if (stock.Quantity > remainingQty)
{
var pendingList = Db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
- (a, b, c) => new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
+ new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -210,7 +207,7 @@
var message =
$"璇风‘璁ゅ彂鏂欐暟閲忥紒锛佸凡甯﹀嚭婊¤冻鍏朵粬鍑哄簱鍗曠殑鍙戞枡鏁伴噺 {remainingQty} 纭鍚庤鐐瑰嚮鏉＄爜鎷嗗垎";
- throw new Exception($"鏉＄爜鏁伴噺瓒呭嚭鍙戞枡鏁伴噺锛岃鎷嗗垎鍚庡啀鎵弿锛�");
+ throw new Exception("鏉＄爜鏁伴噺瓒呭嚭鍙戞枡鏁伴噺锛岃鎷嗗垎鍚庡啀鎵弿锛�");
query.itemNo = stock.ItemNo;
query.Num = stock.Quantity;
@@ -298,7 +295,8 @@
// 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鐗╂枡璁板綍
var existingOutItem = Db.Queryable<MesInvItemOutItems>()
.Where(it =>
- it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
+ it.ItemOutId == outId && it.ItemId == barcode.ItemId &&
+ it.ItemDabid == qtDetail.Guid)
.First();
if (existingOutItem == null)
@@ -340,7 +338,9 @@
commit += db.Updateable<MesInvItemOutItems>()
.SetColumns(it =>
it.TlQty == (it.TlQty ?? 0) + stock.Quantity)
- .Where(it => it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
+ .Where(it =>
+ it.ItemOutId == outId && it.ItemId == barcode.ItemId &&
+ it.ItemDabid == qtDetail.Guid)
.ExecuteCommand();
}
@@ -431,8 +431,8 @@
.ExecuteCommand();
mesItemQtDatalls = Db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
- (a, b, c) => new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
+ new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -465,8 +465,10 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "銆怭DA銆戝叾浠栧嚭搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��"+ stock.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
- logService.CreateLog(db, query.userName, mesItemQt.Guid.ToString(), "MES_ITEM_QT", LogMsg, mesItemQt.Qtck);
+ var LogMsg = "銆怭DA銆戝叾浠栧嚭搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��" +
+ stock.Quantity + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
+ logService.CreateLog(db, query.userName, mesItemQt.Guid.ToString(),
+ "MES_ITEM_QT", LogMsg, mesItemQt.Qtck);
if (commit < 5) throw new Exception("鏇存柊澶辫触");
@@ -477,7 +479,7 @@
}
/// <summary>
- /// 鎷嗗垎鏉＄爜骞跺嚭搴�
+ /// 鎷嗗垎鏉＄爜骞跺嚭搴�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -862,8 +864,8 @@
// 鑾峰彇鍓╀綑寰呭鐞嗘槑缁�
mesItemQtDatalls = db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
- (a, b, c) => new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
+ new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -888,7 +890,7 @@
/// <summary>
- /// 鍏朵粬鍑哄簱锛堟柊锛夊瓨鍌ㄨ繃绋�
+ /// 鍏朵粬鍑哄簱锛堟柊锛夊瓨鍌ㄨ繃绋�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -900,7 +902,8 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�"); if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_QTCK]", conn))
{
@@ -968,7 +971,7 @@
var _strMsg = "";
var _intSum = "";
- var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_QTCK_CF]", conn))
@@ -1004,8 +1007,8 @@
var dto = new ProductionPickDto
{
daa001 = query.billNo,
- barcode = query.barcode,//鍘熸潯鐮�
- cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode, //鍘熸潯鐮�
+ cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
};
return dto;
--
Gitblit v1.9.3