From b38ef27a088410208e4643c3ab34de433fcf4849 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 08 五月 2025 11:20:38 +0800
Subject: [PATCH] 1.现场收料优化
---
service/Wom/WomdaaManager.cs | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 171 insertions(+), 2 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 3351413..006f15c 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -109,6 +109,7 @@
var _strMsg = "";
var _intSum = "";
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
@@ -119,8 +120,9 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outMsg", SqlDbType.NVarChar, 2000),
new("@outSum", SqlDbType.NVarChar, 300),
+ new("@outCfBar", SqlDbType.NVarChar, 300),
new("@c_User", query.userName),
new("@p_biLL_no", query.daa001),
new("@p_item_barcode", query.barcode),
@@ -128,11 +130,13 @@
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
_strMsg = parameters[0].Value.ToString();
_intSum = parameters[1].Value.ToString();
+ _cfBar = parameters[2].Value.ToString();
var result = Convert.ToInt32(_intSum);
@@ -141,7 +145,8 @@
var dto = new ProductionPickDto
{
daa001 = query.daa001,
- barcode = query.barcode
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -589,4 +594,168 @@
}
}
}
+
+
+
+ //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
+ public XcslResultDto GetItemsXcsl(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
+
+ var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == i.ItemId.ToString()))
+ .Where((a, i) => a.Daa001 == query.daa001
+ && a.Fstatus == 1)
+ .Select((a, i) => new
+ {
+ a.Daa001,
+ a.CaaGuid,
+ a.Daa008
+ }).First();
+
+ if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };
+
+ var sql1 = @"SELECT A.item_out_no,
+ SUM(B.QUANTITY) AS BL_Num,
+ ISNULL(Sub.JS_Sum, 0) AS JS_Num, -- 浣跨敤LEFT JOIN瀛愭煡璇㈢殑缁撴灉
+ C.item_no,
+ C.item_name,
+ D.USER_NAME
+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
+ LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+-- 鏂板LEFT JOIN鑱氬悎瀛愭煡璇�
+ LEFT JOIN (SELECT B1.ITEM_ID,
+ SUM(B1.QUANTITY) AS JS_Sum
+ FROM MES_INV_ITEM_OUTS A1
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B1 ON A1.GUID = B1.ITEM_OUT_ID
+ WHERE A1.out_type = '鐢熶骇棰嗘枡'
+ AND A1.task_no = @daa001
+ AND ISNULL(B1.IS_XCSL, '0') = 1
+ GROUP BY B1.ITEM_ID -- 鎸塈TEM_ID鎻愬墠鑱氬悎
+) AS Sub ON Sub.ITEM_ID = C.item_id
+WHERE A.out_type = '鐢熶骇棰嗘枡'
+ AND A.task_no = @daa001
+GROUP BY A.item_out_no,
+ C.item_no,
+ C.item_name,
+ D.USER_NAME,
+ C.item_id,
+ ISNULL(Sub.JS_Sum, 0);";
+
+ 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
+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
+LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_XCSL,'0') = 0";
+
+ 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
+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
+LEFT JOIN SYS_USER D ON B.XCSL_CREATE_BY = D.ACCOUNT
+WHERE out_type = '鐢熶骇棰嗘枡'
+AND A.task_no = @daa001
+AND ISNULL(IS_XCSL,'0') = 1";
+
+ var XcslYjsBar = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams);
+
+
+ var dto = new XcslResultDto
+ {
+ GD_Num = womdaa.Daa008,
+ XcslItemList = XcslItem,
+ XcslWjsBarList = XcslWjsBar,
+ XcslYjsBarList = XcslYjsBar
+
+ };
+
+ return dto;
+ }
+
+ // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ public class XcslResultDto
+ {
+ public int? GD_Num { 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 (string.IsNullOrEmpty(query.userAccount?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
+
+ if (string.IsNullOrEmpty(query.Bar?.ToString()))
+ throw new ArgumentException("鐗╂枡鏉＄爜涓嶅厑璁镐负绌�", nameof(query.Bar));
+
+ if (string.IsNullOrEmpty(query.DAA001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍗曞彿涓嶅厑璁镐负绌�", nameof(query.DAA001));
+
+ var _strMsg = "";
+ var _status = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_ScanXcsl", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ // 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
+ 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 }
+ };
+
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+
+ _strMsg = parameters[3].Value?.ToString() ?? "";
+ _status = Convert.ToInt32(parameters[4].Value ?? -1);
+
+ if (_status <= 0) throw new Exception(_strMsg);
+
+ return new
+ {
+ message = _strMsg,
+ status = _status,
+ daa001 = query.DAA001,
+ barCode = query.Bar
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"浜х嚎鏀舵枡澶辫触锛歿ex.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3