From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/Wom/WomdaahbManager.cs | 404 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 220 insertions(+), 184 deletions(-)
diff --git a/service/Wom/WomdaahbManager.cs b/service/Wom/WomdaahbManager.cs
index 4c4edc2..3d912c6 100644
--- a/service/Wom/WomdaahbManager.cs
+++ b/service/Wom/WomdaahbManager.cs
@@ -2,11 +2,11 @@
using System.Data.SqlClient;
using System.Text;
using Masuit.Tools;
-using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
+using NewPdaSqlServer.util;
using SqlSugar;
namespace NewPdaSqlServer.service.Wom;
@@ -110,7 +110,7 @@
var _strMsg = "";
var _intSum = "";
- var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_SCLLHB_CF]", conn))
@@ -146,8 +146,8 @@
var dto = new ProductionPickDto
{
daa001 = query.hbNo,
- barcode = query.barcode,//鍘熸潯鐮�
- cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode, //鍘熸潯鐮�
+ cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -168,29 +168,32 @@
{
if (string.IsNullOrEmpty(query.hbNo)) throw new Exception("鍚堝苟鍗曞彿涓虹┖");
- var queryResult = Db.Queryable<Womdaahb, Womdaa, MesItems>(
- (b, a, i) => new JoinQueryInfos(
- JoinType.Left, b.OrgId.ToString() == a.ErpSczz, // Womdaahb 鈫� Womdaa 鍏宠仈
- JoinType.Left, a.Daa002 == i.ItemId.ToString()) // Womdaa 鈫� MesItems 鍏宠仈
- )
- .Where((b, a, i) =>
- (b.Daah009 != null && a.Daa021 != null) && // 闃叉null寮傚父
- (
- b.Daah009.Contains("," + a.Daa021 + ",") || // 鍖归厤涓棿鍊�
- b.Daah009.StartsWith(a.Daa021 + ",") || // 鍖归厤寮�澶村��
- b.Daah009.EndsWith("," + a.Daa021) || // 鍖归厤缁撳熬鍊�
- b.Daah009 == a.Daa021 // 瀹屽叏鍖归厤
- )
- )
- .Where((b, a, i) => b.Daahb001 == query.hbNo && b.Fstatus == 1) // 鍏朵粬鏉′欢
- .Select((b, a, i) => new
- {
- b.Daahb001,
- a.Daa001, // 宸ュ崟鍙�
- a.CaaGuid, // Womdaa 鐨� GUID
- i.ItemName // MesItems 鐨勫瓧娈�
- })
- .First();
+ var queryResult = Db.Queryable<Womdaahb, Womdaa, MesItems>((b, a, i) =>
+ new JoinQueryInfos(
+ JoinType.Left,
+ b.OrgId.ToString() == a.ErpSczz, // Womdaahb 鈫� Womdaa 鍏宠仈
+ JoinType.Left,
+ a.Daa002 == i.ItemId.ToString()) // Womdaa 鈫� MesItems 鍏宠仈
+ )
+ .Where((b, a, i) =>
+ b.Daah009 != null && a.Daa021 != null && // 闃叉null寮傚父
+ (
+ b.Daah009.Contains("," + a.Daa021 + ",") || // 鍖归厤涓棿鍊�
+ b.Daah009.StartsWith(a.Daa021 + ",") || // 鍖归厤寮�澶村��
+ b.Daah009.EndsWith("," + a.Daa021) || // 鍖归厤缁撳熬鍊�
+ b.Daah009 == a.Daa021 // 瀹屽叏鍖归厤
+ )
+ )
+ .Where((b, a, i) =>
+ b.Daahb001 == query.hbNo && b.Fstatus == 1) // 鍏朵粬鏉′欢
+ .Select((b, a, i) => new
+ {
+ b.Daahb001,
+ a.Daa001, // 宸ュ崟鍙�
+ a.CaaGuid, // Womdaa 鐨� GUID
+ i.ItemName // MesItems 鐨勫瓧娈�
+ })
+ .First();
if (queryResult?.Daahb001 == null) throw new Exception("鍚堝苟鍗曞彿涓嶅瓨鍦�");
@@ -217,7 +220,7 @@
// })
// .ToList();
- var sql =string.Format(@"SELECT max(ahb.GUID) as hbguid,
+ var sql = string.Format(@"SELECT max(ahb.GUID) as hbguid,
m.item_no as itemNo,
max(m.item_name) as itemName,
max(m.item_model) as itemModel,
@@ -270,13 +273,11 @@
})
.ToList();
- var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == queryResult.CaaGuid)
+ var womcaa = Db.Queryable<Womcaa>()
+ .Where(s => s.Guid == queryResult.CaaGuid)
.First();
- if (womcaa == null)
- {
- throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
- }
+ if (womcaa == null) throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
var dto = new ProductionPickDto
{
@@ -291,13 +292,12 @@
}
/// <summary>
- /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
+ /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getZsBarInfo(dynamic query)
{
-
var sql = string.Format(@"SELECT TOP 1 A.barCode AS zsBarcode,
D.name AS lineName,
D.line_no,
@@ -318,9 +318,7 @@
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
if (ZsBarInfo.Count < 1)
- {
throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪");
- }
return ZsBarInfo;
}
@@ -328,7 +326,8 @@
//鑾峰彇鐢熶骇
public dynamic getTraceability(dynamic query)
{
- var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
+ var sql = string.Format(
+ @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
FROM WORK_COLLECT A
LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
@@ -342,7 +341,8 @@
public dynamic ProductBinding(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -366,18 +366,23 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
- new("@pi_trac_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_trac_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.ZsBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[3].Value?.ToString() ?? "";
_intSum = parameters[4].Value?.ToString() ?? "-1";
@@ -407,7 +412,7 @@
/// <summary>
- /// 鑾峰彇鍗℃澘淇℃伅
+ /// 鑾峰彇鍗℃澘淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -420,27 +425,25 @@
ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
DAA001
FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
-WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
+WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
if (ZsBarInfo.Count < 1)
- {
throw new Exception($"璇ュ崱鏉跨爜{query.Zsbarcode}涓嶅瓨鍦紒");
- }
return ZsBarInfo;
}
/// <summary>
- /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
+ /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getKbBarMxInfo(dynamic query)
{
-
- var sql = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
+ var sql = string.Format(
+ @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
FROM MES_INV_ITEM_BARCODES_TBMX A
LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -453,7 +456,7 @@
}
/// <summary>
- /// 鑾峰彇绠辨槑缁嗕俊鎭�
+ /// 鑾峰彇绠辨槑缁嗕俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -484,42 +487,44 @@
{
try
{
-
- using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY", conn, transaction))
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY",
+ conn, transaction))
+ {
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
{
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.Xbarcode },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
- };
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Xbarcode },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
+ };
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
- cmd.ExecuteNonQuery();
+ cmd.ExecuteNonQuery();
- var _strMsg = parameters[3].Value?.ToString() ?? "";
- var _intSum = parameters[4].Value?.ToString() ?? "-1";
+ var _strMsg = parameters[3].Value?.ToString() ?? "";
+ var _intSum = parameters[4].Value?.ToString() ?? "-1";
- var result = Convert.ToInt32(_intSum);
- if (result <= 0)
- {
- //transaction.Rollback();
- throw new Exception(_strMsg);
- //return new {
- // status = result,
- // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
- // failedBarcode = xBar.iteM_BARCODE,
- // successCount = successRecords.Count
- //};
- }
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0)
+ //transaction.Rollback();
+ throw new Exception(_strMsg);
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ }
- }
-
transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
}
catch (Exception ex)
@@ -534,7 +539,8 @@
}
}
- var sql2 = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
+ var sql2 = string.Format(
+ @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
FROM MES_INV_ITEM_BARCODES_TBMX A
LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -545,25 +551,26 @@
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql2);
if (ZsBarInfo.Count < 1)
- {
- throw new Exception($"璇ョ鏉＄爜[{query.Xbarcode}]瀵瑰簲宸ュ崟涓庢墭鐮佸伐鍗昜{query.DAA001}]涓嶅尮閰嶆垨宸茬粦瀹氭墭鐮侊紒");
- }
+ throw new Exception(
+ $"璇ョ鏉＄爜[{query.Xbarcode}]瀵瑰簲宸ュ崟涓庢墭鐮佸伐鍗昜{query.DAA001}]涓嶅尮閰嶆垨宸茬粦瀹氭墭鐮侊紒");
return ZsBarInfo;
}
public dynamic submitAllChecked(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙寮哄寲
if (string.IsNullOrEmpty(query.userName?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
-
+
if (string.IsNullOrEmpty(query.KbBar?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
-
- if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo).GetEnumerator().MoveNext())
+
+ if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo)
+ .GetEnumerator().MoveNext())
throw new ArgumentException("绠辩爜鍒楄〃涓嶈兘涓虹┖", nameof(query.XbarInfo));
var successRecords = new List<dynamic>();
@@ -575,53 +582,59 @@
try
{
foreach (var xBar in query.XbarInfo) // 閬嶅巻绠辩爜闆嗗悎
- {
- using (var cmd = new SqlCommand("prc_pda_Xbar_binding", conn, transaction))
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding",
+ conn, transaction))
{
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = xBar.iteM_BARCODE },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = xBar.iteM_BARCODE },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
var _strMsg = parameters[3].Value?.ToString() ?? "";
- var _intSum = parameters[4].Value?.ToString() ?? "-1";
-
+ var _intSum = parameters[4].Value?.ToString() ??
+ "-1";
+
var result = Convert.ToInt32(_intSum);
if (result <= 0)
- {
//transaction.Rollback();
throw new Exception(_strMsg);
- //return new {
- // status = result,
- // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
- // failedBarcode = xBar.iteM_BARCODE,
- // successCount = successRecords.Count
- //};
- }
-
- successRecords.Add(new {
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ successRecords.Add(new
+ {
kbBarcode = query.KbBar,
xBarcode = xBar.iteM_BARCODE,
- processTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ processTime =
+ DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
});
}
- }
+
transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
- return new {
- status = 1,
+ return new
+ {
+ status = 1,
message = "鎵归噺缁戝畾鎴愬姛",
successCount = successRecords.Count,
- details = successRecords
+ details = successRecords
};
}
catch (Exception ex)
@@ -639,44 +652,51 @@
public dynamic SubmitKbInspection(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
-
+
if (string.IsNullOrEmpty(query.KbBar?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
-
+
var _strMsg = "";
var _status = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("prc_pda_KBbar_submitInspection", conn))
+ using (var cmd =
+ new SqlCommand("prc_pda_KBbar_submitInspection", conn))
{
try
{
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.KbBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[2].Value?.ToString() ?? "";
_status = Convert.ToInt32(parameters[3].Value ?? -1);
-
+
if (_status <= 0) throw new Exception(_strMsg);
-
- return new {
+
+ return new
+ {
message = _strMsg,
status = _status,
kbBarcode = query.KbBar
@@ -695,7 +715,6 @@
}
-
//鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
public XcslResultDto GetItemsXcsl(WarehouseQuery query)
{
@@ -705,7 +724,7 @@
new JoinQueryInfos(JoinType.Left,
a.Daa002 == i.ItemId.ToString()))
.Where((a, i) => a.Daa001 == query.daa001
- && a.Fstatus == 1)
+ && a.Fstatus == 1)
.Select((a, i) => new
{
a.Daa001,
@@ -717,7 +736,8 @@
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };
+ var sqlParams = new List<SugarParameter>
+ { new("@daa001", query.daa001) };
var sql1 = @"SELECT A.item_out_no,
SUM(B.QUANTITY) AS BL_Num,
@@ -752,7 +772,8 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- var sql2 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
+ var sql2 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -763,7 +784,8 @@
var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
- var sql3 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.XCSL_CREATE_DATE
+ var sql3 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.XCSL_CREATE_DATE
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -782,26 +804,16 @@
XcslItemList = XcslItem,
XcslWjsBarList = XcslWjsBar,
XcslYjsBarList = XcslYjsBar
-
};
return dto;
}
- // 鐜板満鏀舵枡灞曠ず鍒楄〃
- public class XcslResultDto
- {
- public int? GD_Num { get; set; }
- public string? workNo { get; set; }
- public List<dynamic> XcslItemList { get; set; }
- public List<dynamic> XcslWjsBarList { get; set; }
- public List<dynamic> XcslYjsBarList { get; set; }
- }
-
public dynamic ScanXcsl(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -826,11 +838,16 @@
// 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
- new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
- new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100)
+ { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -866,7 +883,8 @@
public dynamic GetWeightByXt(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
// 鍙傛暟鏍￠獙
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -878,7 +896,7 @@
var _strMsg = "";
var _status = -1;
var _weight = "0";
-
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("prc_pda_Xbar_chenzhong", conn))
@@ -888,13 +906,18 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output },
- new("@po_outWeight", SqlDbType.NVarChar, 100) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userName },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output },
+ new("@po_outWeight", SqlDbType.NVarChar, 100)
+ { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -906,7 +929,7 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status,
@@ -928,8 +951,7 @@
public dynamic GetXcslDaa(dynamic unity)
{
-
- var sqlParams = new List<SugarParameter> { };
+ var sqlParams = new List<SugarParameter>();
var sql2 = new StringBuilder(@"
SELECT daahb001 as daaInfo,daahb001 as daa001
@@ -945,10 +967,7 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XcslItem == null)
- {
- throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
- }
+ if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
return XcslItem;
}
@@ -962,7 +981,7 @@
new JoinQueryInfos(JoinType.Left,
a.Daa002 == i.ItemId.ToString()))
.Where((a, i) => a.Daa001 == query.daa001
- && a.Fstatus == 1)
+ && a.Fstatus == 1)
.Select((a, i) => new
{
a.Daa001,
@@ -974,7 +993,8 @@
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };
+ var sqlParams = new List<SugarParameter>
+ { new("@daa001", query.daa001) };
var sql1 = @"SELECT A.item_out_no,
SUM(B.QUANTITY) AS BL_Num,
@@ -1018,7 +1038,8 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- var sql2 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
+ var sql2 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1029,7 +1050,8 @@
var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
- var sql3 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE
+ var sql3 =
+ @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1048,7 +1070,6 @@
XcslItemList = XcslItem,
XcslWjsBarList = XcslWjsBar,
XcslYjsBarList = XcslYjsBar
-
};
return dto;
@@ -1056,7 +1077,8 @@
public dynamic ScanXctl(dynamic query)
{
- if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -1081,11 +1103,16 @@
// 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
- new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
- new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100)
+ { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100)
+ { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100)
+ { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000)
+ { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int)
+ { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -1118,4 +1145,13 @@
}
}
+ // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ public class XcslResultDto
+ {
+ public int? GD_Num { get; set; }
+ public string? workNo { get; set; }
+ public List<dynamic> XcslItemList { get; set; }
+ public List<dynamic> XcslWjsBarList { get; set; }
+ public List<dynamic> XcslYjsBarList { get; set; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3