From 411ebc3c0a2b457bc5eb61443c549b6142a60ff6 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 19 四月 2025 08:16:13 +0800
Subject: [PATCH] 1.采购入库取消检验结果校验 2.新增ipqc查询
---
service/QC/IpqcService.cs | 32 ++++++++
service/Warehouse/MesInvItemInCDetailsManager.cs | 8 +-
entity/VIpqcXj.cs | 160 ++++++++++++++++++++++++++++++++++++++++
Controllers/QC/IpqcController.cs | 35 ++++++++
4 files changed, 230 insertions(+), 5 deletions(-)
diff --git a/Controllers/QC/IpqcController.cs b/Controllers/QC/IpqcController.cs
index c4f6370..abc4a94 100644
--- a/Controllers/QC/IpqcController.cs
+++ b/Controllers/QC/IpqcController.cs
@@ -14,6 +14,11 @@
{
IpqcService m = new IpqcService();
+ /// <summary>
+ /// 棣栨鍗曟嵁鏌ヨ
+ /// </summary>
+ /// <param name="queryObj"></param>
+ /// <returns></returns>
[HttpPost("getPageSj")]
public ResponseResult getPageSj([FromBody] XJPageResult queryObj)
{
@@ -64,5 +69,33 @@
}
-
+ /// <summary>
+ /// 棣栨鍗曟嵁鏌ヨ
+ /// </summary>
+ /// <param name="queryObj"></param>
+ /// <returns></returns>
+ [HttpPost("getPageXj")]
+ public ResponseResult getPageXj([FromBody] XJPageResult queryObj)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var (item, totalCount) = m.getPageXj(queryObj);
+ var tbBillList =
+ resultInfos.tbBillList = item;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos,
+ TotalCount = totalCount
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/entity/VIpqcXj.cs b/entity/VIpqcXj.cs
new file mode 100644
index 0000000..8fc4c7a
--- /dev/null
+++ b/entity/VIpqcXj.cs
@@ -0,0 +1,160 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Models;
+
+/// <summary>
+/// IPQC宸℃瑙嗗浘瀹炰綋绫�
+/// </summary>
+[SugarTable("V_IPQC_XJ")]
+public class VIpqcXj
+{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(ColumnName = "guid")]
+ public string Guid { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "fsubmit")]
+ public int? FSubmit { get; set; }
+
+ /// <summary>
+ /// 淇敼鏍囧織
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG")]
+ public string Modify1Flag { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙� --鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string LotNo { get; set; }
+
+ /// <summary>
+ /// 涓嶈壇澶勭悊鏂规硶
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_HANDLE")]
+ public string FnGHandle { get; set; }
+
+ /// <summary>
+ /// 鐗堟湰
+ /// </summary>
+ [SugarColumn(ColumnName = "FVERSION")]
+ public string FVersion { get; set; }
+
+ /// <summary>
+ /// 灏忔壒娆″彿,鐢ㄤ綔澶囨敞浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO1")]
+ public string LotNo1 { get; set; }
+
+ /// <summary>
+ /// 杞崲鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FCOVERT_QTY")]
+ public string FCovertQty { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
+ public string FCheckResu { get; set; }
+
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
+ public string ReleaseNo { get; set; }
+
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA001")]
+ public string Daa001 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ枡鏁伴噺(妫�楠屾暟閲�)
+ /// </summary>
+ [SugarColumn(ColumnName = "FBATCH_QTY")]
+ public string FBatchQty { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string ItemNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
+ public string FCheckBy { get; set; }
+
+ /// <summary>
+ /// 涓嶈壇鎻忚堪
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_DESC")]
+ public string FnGDesc { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
+
+ /// <summary>
+ /// DAA013
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA013")]
+ public string Daa013 { get; set; }
+
+ /// <summary>
+ /// sj_xt
+ /// </summary>
+ [SugarColumn(ColumnName = "sj_xt")]
+ public string SjXt { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "departmentname")]
+ public string DepartmentName { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "name")]
+ public string xtName { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NAME")]
+ public string ItemName { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "remarks")]
+ public string Remarks { get; set; }
+
+ /// <summary>
+ /// 妫�鏌ユ棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DATE_01")]
+ public string Date01 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_MODEL")]
+ public string ItemModel { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public string CreateDate { get; set; }
+}
\ No newline at end of file
diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index d238f10..15b90d9 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -110,4 +110,36 @@
}).OrderBy(a => a.Order)
.ToList();
}
+
+
+ public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj)
+ {
+ var parsedGuid = Guid.Empty;
+ if (!queryObj.id.IsNullOrEmpty())
+ {
+ var isValid = Guid.TryParse(queryObj.id, out parsedGuid);
+ 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) ||
+ a.ItemName.Contains(queryObj.keyword) ||
+ a.Daa001.Contains(queryObj.keyword) ||
+ a.ReleaseNo.Contains(queryObj.keyword) ||
+ a.DepartmentName.Contains(queryObj.keyword) ||
+ a.xtName.Contains(queryObj.keyword)
+ )
+ .WhereIF(UtilityHelper.CheckGuid(parsedGuid),
+ a => a.Guid == parsedGuid.ToString())
+ .Where(a => (a.FSubmit ?? 0) == 0)
+ .OrderByDescending(a => a.CreateDate)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (pageList, totalCount);
+ }
}
\ No newline at end of file
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 78c31d2..bb2a217 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -64,10 +64,10 @@
if (inventoryDetails == null)
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
- if (string.IsNullOrEmpty(inventoryDetails.CheckRes) || inventoryDetails.CheckRes != "鍚堟牸")
- {
- throw new Exception("璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠屼笉鍚堟牸鎴栨湭妫�楠岋紒");
- }
+ //if (string.IsNullOrEmpty(inventoryDetails.CheckRes) || inventoryDetails.CheckRes != "Y:鍚堟牸")
+ //{
+ // throw new Exception("璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠屼笉鍚堟牸鎴栨湭妫�楠岋紒");
+ //}
var depotCode = Db.Queryable<MesDepotSections>()
.Where(it => it.DepotSectionCode == sectionCode)
--
Gitblit v1.9.3