From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/base/MesPrintMangeer.cs | 160 +++++++++++++++++++++++++----------------------------
1 files changed, 76 insertions(+), 84 deletions(-)
diff --git a/service/base/MesPrintMangeer.cs b/service/base/MesPrintMangeer.cs
index b73c912..84ef4fb 100644
--- a/service/base/MesPrintMangeer.cs
+++ b/service/base/MesPrintMangeer.cs
@@ -1,109 +1,104 @@
-锘縩amespace NewPdaSqlServer.service.@base
+锘縰sing NewPdaSqlServer.DB;
+using SqlSugar;
+
+namespace NewPdaSqlServer.service.@base;
+
+public class MesPrintMangeer : Repository<dynamic>
{
- using NewPdaSqlServer.Dto.service;
- using NewPdaSqlServer.entity;
- using SqlSugar;
- using System;
- using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
- using System.Data;
- using NewPdaSqlServer.DB;
- using System.Data;
- using System.Data.SqlClient;
- using Microsoft.EntityFrameworkCore.Metadata.Internal;
-
-
- public class MesPrintMangeer : Repository<dynamic>
+ public dynamic getPrintInfo(dynamic query)
{
- public dynamic getPrintInfo(dynamic query)
- {
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter>
+ { new("@userAccount", query.userName) };
- // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter> { new("@userAccount", query.userName) };
-
- var sql1 = @"SELECT TOP 1 ip,port fROM print_info A
+ var sql1 = @"SELECT TOP 1 ip,port fROM print_info A
left join SYS_USER_BIND B on A.guid = B.aboutGuid
left join SYS_USER C ON C.GUID = B.userGuid
WHERE C.ACCOUNT = @userAccount AND B.fType = '鎵撳嵃鏈�'";
- var printInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
+ var printInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- if (printInfo.Count < 1 ) throw new Exception("褰撳墠鐢ㄦ埛鏈粦瀹氭墦鍗版満锛岃缁存姢鍚庝娇鐢ㄦ媶鍒嗗姛鑳斤紒");
+ if (printInfo.Count < 1) throw new Exception("褰撳墠鐢ㄦ埛鏈粦瀹氭墦鍗版満锛岃缁存姢鍚庝娇鐢ㄦ媶鍒嗗姛鑳斤紒");
- return printInfo;
- }
+ return printInfo;
+ }
- public dynamic getCfInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ public dynamic getCfInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ {
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.cfBarcode))
+ throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter>
{
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.cfBarcode))
- throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+ new("@cfBar", query.cfBarcode.Trim()),
+ new("@oldBar", query.barcode.Trim())
+ };
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter> {
- new("@cfBar", query.cfBarcode.Trim()),
- new("@oldBar", query.barcode.Trim())
- };
+ var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";
- var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ return mergedData;
+ }
- return mergedData;
- }
+ /// <summary>
+ /// PDA閲嶆墦鏉＄爜
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="ArgumentException"></exception>
+ public dynamic getPrintBarInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ {
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
- /// <summary>
- /// PDA閲嶆墦鏉＄爜
- /// </summary>
- /// <param name="query"></param>
- /// <returns></returns>
- /// <exception cref="ArgumentException"></exception>
- public dynamic getPrintBarInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter>
{
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+ new("@pi_Bar", query.barcode.Trim())
+ };
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter> {
- new("@pi_Bar", query.barcode.Trim())
- };
+ var sql = @"EXEC prc_pda_basePrint_selBarInfo @pi_Bar ";
- var sql = @"EXEC prc_pda_basePrint_selBarInfo @pi_Bar ";
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ return mergedData;
+ }
- return mergedData;
- }
+ // // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ // public class PrintBarInfo
+ // {
+ // public List<dynamic> cfBarInfo { get; set; }
+ // public List<dynamic> oldBarInfo { get; set; }
+ // }
- // // 鐜板満鏀舵枡灞曠ず鍒楄〃
- // public class PrintBarInfo
- // {
- // public List<dynamic> cfBarInfo { get; set; }
- // public List<dynamic> oldBarInfo { get; set; }
- // }
+ public dynamic getCfBeforeInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ {
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.cfBarcode))
+ throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
- public dynamic getCfBeforeInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter>
{
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.cfBarcode))
- throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+ new("@cfBar", query.cfBarcode.Trim()),
+ new("@oldBar", query.barcode.Trim())
+ };
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter> {
- new("@cfBar", query.cfBarcode.Trim()),
- new("@oldBar", query.barcode.Trim())
- };
-
- var sql = @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鎷嗗垎鏉＄爜' AS BarType,B.ITEM_BARCODE,GETDATE() as print_date
+ var sql =
+ @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鎷嗗垎鏉＄爜' AS BarType,B.ITEM_BARCODE,GETDATE() as print_date
FROM MES_INV_ITEM_BARCODES B
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
WHERE B.ITEM_BARCODE = @cfBar
@@ -115,13 +110,10 @@
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
WHERE B.ITEM_BARCODE = @oldBar";
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- return mergedData;
- }
-
-
+ return mergedData;
}
}
\ No newline at end of file
--
Gitblit v1.9.3