From 671b60339271875c3d15357e7c792727d67e6c91 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 06 五月 2025 09:46:54 +0800
Subject: [PATCH] 1.现场收料 2.MES->OA优化 3.采购入库新增日志。
---
service/Wom/WomdaaManager.cs | 173 +++++++++++++++++++++++++++++++-----------
Controllers/Wom/WomdaaController.cs | 28 ++++++
service/QC/OaApi.cs | 4
service/Warehouse/MesInvItemInCDetailsManager.cs | 5 +
4 files changed, 161 insertions(+), 49 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 37724e4..fa38828 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -427,7 +427,7 @@
//GetItemsXcsl
/// <summary>
- /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栧緟鏀舵枡鐗╂枡鏄庣粏
/// </summary>
/// <returns></returns>
[HttpPost("GetItemsXcsl")]
@@ -450,5 +450,31 @@
}
}
+
+ //GetItemsXcsl
+ /// <summary>
+ /// 鐗╂枡鏉＄爜鏀舵枡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanXcsl")]
+ public ResponseResult ScanXcsl(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanXcsl(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index a126489..62f6d3f 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -112,7 +112,9 @@
C.item_name AS jzmcwlmc,
D.supp_name AS khgys,
B.bill_no AS dhdhmes,
- A.remark AS bhgpqxms
+ (SELECT STRING_AGG(releaseNo+':' + mx.fng_desc+'\n', ',') AS OrderIDs
+FROM [Mes_QC_Exceptional_Detail] mx where mx.pGuid=a.guid
+) AS bhgpqxms
FROM Mes_QC_Exceptional A
LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index bb2a217..d7c7063 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -855,6 +855,11 @@
if (mesInvItemInCDetails == null)
throw new Exception("鐗╂枡鍏ュ簱鏉＄爜鏄庣粏涓嶅瓨鍦�"); // 鎶涘嚭寮傚父浠ヤ緵鍓嶅彴澶勭悊
+ // 鍒涘缓 鎻掑叆鏃ュ織
+ var logService = new LogService();
+ var LogMsg = "[PDA]閲囪喘鍏ュ簱銆傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�";
+ logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "WW_GD", LogMsg, inventory.BillNo);
+
return 1;
});
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 066314a..a58ae4b 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -593,7 +593,7 @@
//鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
- public ProductionPickDto GetItemsXcsl(WarehouseQuery query)
+ public XcslResultDto GetItemsXcsl(WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
@@ -605,63 +605,142 @@
.Select((a, i) => new
{
a.Daa001,
- a.CaaGuid
+ a.CaaGuid,
+ a.Daa008
}).First();
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
- dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
- FROM WOMDAB B
- LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
- LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
- LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
- WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };
- var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+ var sql1 = @"SELECT A.item_out_no,
+ SUM(B.QUANTITY) AS BL_Num,
+ (SELECT ISNULL(SUM(B.QUANTITY), 0)
+ FROM MES_INV_ITEM_OUTS A
+ LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
+ WHERE out_type = '鐢熶骇棰嗘枡'
+ AND A.task_no = @daa001
+ AND ISNULL(IS_XCSL, '0') = 1) AS JS_Num,
+ 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
+WHERE out_type = '鐢熶骇棰嗘枡'
+ AND A.task_no = @daa001
+GROUP BY item_out_no, C.item_no, C.item_name, D.USER_NAME";
+
+ 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 DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
-
- var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
-
- var mesInvItemOutCDetailsList = Db
- .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
- ((a, b, c) =>
- new JoinQueryInfos(
- JoinType.Inner, a.ItemId == b.Id,
- JoinType.Inner, c.DepotId == a.DepotId
- ))
- .Where((a, b, c) => a.WorkNo == query.daa001)
- .Select((a, b, c) => new MesInvItemOutCDetails
- {
- ItemName = b.ItemName,
- ItemNo = b.ItemNo,
- ItemId = a.ItemId,
- DepotId = a.DepotId,
- WorkNo = a.WorkNo,
- DepotName = c.DepotName,
- Quantity = a.Quantity
- })
- .ToList();
-
- var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
- .First();
-
- if (womcaa == null)
+ var dto = new XcslResultDto
{
- throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
- }
+ GD_Num = womdaa.Daa008,
+ XcslItemList = XcslItem,
+ XcslWjsBarList = XcslWjsBar,
+ XcslYjsBarList = XcslYjsBar
- var dto = new ProductionPickDto
- {
- daa001 = womdaa.Daa001,
- PlanNo = womcaa.Caa020,
- items = DS_list,
- Ysitems = YS_list
- // yisao = mesInvItemOutCDetailsList
};
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