From a333bc3f6ecdd9ea03ca325b73ac48d3426dc77a Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 05 八月 2025 08:19:46 +0800
Subject: [PATCH] 1.内箱核对 2.其他出库优化，新增子表仓库 3.登录菜单逻辑调整 4.巡检优化
---
service/Wom/WomdaaManager.cs | 134 +++++++++++++++++++++++++++++++++
Controllers/Wom/WomdaaController.cs | 53 +++++++++++++
service/base/LoginService.cs | 2
service/QC/IpqcService.cs | 22 ++++-
service/Warehouse/MesItemQtManager.cs | 18 ++--
entity/MesItemQtDatall.cs | 6 +
6 files changed, 219 insertions(+), 16 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index c761e97..5790a6b 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -583,5 +583,58 @@
}
}
+ /// <summary>
+ /// 鍐呯鏍稿 锛� 鎵弿鍚庣洊鐮佽幏鍙栦俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("getHgBarInfo")]
+ public ResponseResult getHgBarInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.ZsBarInfo = m.getHgBarInfo(query);
+ resultInfos.tbBillList.Traceability = m.getTraceabilityByLsBar(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍐呯鏍稿锛岃拷婧爜鍜屾祦姘寸爜缁戝畾
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanNxhd")]
+ public ResponseResult ScanNxhd([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ // 鍏堝垵濮嬪寲tbBillList灞炴��
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanNxhd(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/entity/MesItemQtDatall.cs b/entity/MesItemQtDatall.cs
index 57fe40f..174a795 100644
--- a/entity/MesItemQtDatall.cs
+++ b/entity/MesItemQtDatall.cs
@@ -101,4 +101,10 @@
/// </summary>
[SugarColumn(IsIgnore = true)]
public string? Qt011 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "depotId")]
+ public int? DepotId { get; set; }
}
\ No newline at end of file
diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index d9bcc43..d477004 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -93,6 +93,10 @@
public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj)
{
+
+
+
+ var totalCount = 0;
var parsedGuid = Guid.Empty;
if (!queryObj.id.IsNullOrEmpty())
{
@@ -100,10 +104,6 @@
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
}
-
-
- var totalCount = 0;
-
//var pageList = Db.Queryable<VIpqcXj>()
// .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
// a.ItemNo.Contains(queryObj.keyword) ||
@@ -168,9 +168,19 @@
AND TRY_CONVERT(date, SUBSTRING([check_time_slot], 1, 10)) = CAST(GETDATE() AS date)
AND CAST(GETDATE() AS time) >= '17:00:00'
)
- )");
+ )
+ {0}",
+ parsedGuid != Guid.Empty ? "AND guid = @parsedGuid" : ""); // 鏂板GUID杩囨护鏉′欢
- var pageList = Db.Ado.SqlQuery<VIpqcXj>(sql).ToList();
+
+
+
+
+ var sqlParams = new List<SugarParameter> {
+ new("@parsedGuid", parsedGuid) // 鏂板鍙傛暟
+ };
+
+ var pageList = Db.Ado.SqlQuery<VIpqcXj>(sql,sqlParams).ToList();
return (pageList, totalCount);
}
diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs
index 50c0199..68f2121 100644
--- a/service/Warehouse/MesItemQtManager.cs
+++ b/service/Warehouse/MesItemQtManager.cs
@@ -146,14 +146,6 @@
.Where(it => it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true && it.Qt029 == true && it.Qt032 == true)
.First();
- if (mesItemQt == null)
- throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- // 妫�鏌ヤ粨搴撴槸鍚︿竴鑷�
- if (Convert.ToInt32(mesItemQt.Qt008) != stock.DepotId)
- throw new Exception(
- $"鎵爜鍑鸿揣浠撳簱id{mesItemQt.Qt008}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟stock.DepotId}涓嶄竴鑷达紝璇锋牳瀵癸紒");
-
// 鑾峰彇鍑哄簱鍗曟槑缁�
var qtDetail = Db.Queryable<MesItemQtDatall>()
.Where(it =>
@@ -161,6 +153,16 @@
it.ItemId == stock.ItemId.ToString())
.First();
+ if (mesItemQt == null)
+ throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 涓嶅瓨鍦紝璇风‘璁わ紒");
+
+ // 妫�鏌ヤ粨搴撴槸鍚︿竴鑷�
+ if (Convert.ToInt32(qtDetail.DepotId) != stock.DepotId)
+ throw new Exception(
+ $"鎵爜鍑鸿揣浠撳簱id{qtDetail.DepotId}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟stock.DepotId}涓嶄竴鑷达紝璇锋牳瀵癸紒");
+
+
+
if (qtDetail == null) throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒");
// 妫�鏌ュ墿浣欐暟閲�
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 1436d92..f2ee0f5 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -301,7 +301,8 @@
LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
-WHERE A.barCode = '{0}'", query.Zsbarcode);
+WHERE A.barCode = '{0}'
+ORDER BY A.createDate", query.Zsbarcode);
var Traceability = Db.Ado.SqlQuery<dynamic>(sql);
@@ -1087,4 +1088,135 @@
}
}
+
+ /// <summary>
+ /// 鍐呯鏍稿锛氳幏鍙栧悗鐩栫爜瀵瑰簲浜у搧淇℃伅
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public dynamic getHgBarInfo(dynamic query)
+ {
+
+ var sql = string.Format(@"DECLARE @ZsBar varchar(100)
+SELECT TOP 1 @ZsBar= ABOUT_TRAC_BARCODE FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{1}'
+SELECT TOP 1 A.barCode AS zsBarcode,
+ D.name AS lineName,
+ D.line_no,
+ B.daa001,
+ C.item_no,
+ C.item_name,
+ C.item_model,
+ A.quantity as barQty,
+ B.daa008 as sumQty,
+ isnull((SELECT count(1) FROM WORK_COLLECT WHERE processNo = '{0}' AND ABOUT_GUID = A.ABOUT_GUID),0) AS finQty,
+ isnull((SELECT TOP 1 processNo FROM WORK_COLLECT WHERE WORK_COLLECT.barCode = @ZsBar AND ISNULL(checkResult,'') = '鈭�' AND ISNULL(barCodeStatus,1) = 1 ORDER BY WORK_COLLECT.createDate DESC ),'') AS lastGx
+FROM WORK_TRAC_CODE A
+ LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
+ LEFT JOIN MES_ITEMS C ON B.daa002 = C.item_id
+ LEFT JOIN MES_WORKSHOP_LINE D ON A.lineId = D.id
+WHERE A.barCode = @ZsBar", query.GX, query.Zsbarcode);
+
+ 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 getTraceabilityByLsBar(dynamic query)
+ {
+ 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
+ LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
+WHERE A.barCode = (SELECT TOP 1 ABOUT_TRAC_BARCODE FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{0}')
+ORDER BY A.createDate", query.Zsbarcode);
+
+ var Traceability = Db.Ado.SqlQuery<dynamic>(sql);
+
+ return Traceability;
+ }
+
+ /// <summary>
+ /// 鍐呯鏍稿锛氭壂鐮佹牳瀵�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="ArgumentNullException"></exception>
+ /// <exception cref="ArgumentException"></exception>
+ /// <exception cref="Exception"></exception>
+ public dynamic ScanNxhd(dynamic query)
+ {
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
+ // 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
+ if (string.IsNullOrEmpty(query.userName?.ToString()))
+ throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
+
+ if (string.IsNullOrEmpty(query.ZsBar?.ToString()))
+ throw new ArgumentException("鍚庣洊鐮佷笉鍏佽涓虹┖", nameof(query.ZsBar));
+
+ if (string.IsNullOrEmpty(query.LsBar?.ToString()))
+ throw new ArgumentException("绠辨潯鐮佷笉鍏佽涓虹┖", nameof(query.LsBar));
+
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_pda_Scan_Nxhd", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_hg_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
+ new("@pi_x_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";
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new
+ {
+ message = _strMsg,
+ status = result,
+ tracBarcode = query.ZsBar
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index 89fcf9d..e43cb5e 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -35,7 +35,7 @@
else
{
string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
- LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid
+ LEFT JOIN SYS_USER_BIND B ON CAST(A.guid AS VARCHAR(100)) = B.aboutGuid
LEFT JOIN SYS_USER C ON C.GUID = B.userGuid
WHERE C.ACCOUNT = '{0}'", name);
pageViewList = Db.Ado.SqlQuery<MesSysPageview>(sql);
--
Gitblit v1.9.3