From 3652ccd21dffadf73d58ab241938c49c1929ff5b Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:30:59 +0800
Subject: [PATCH] 页面过滤条件：开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图：x轴lot号，y轴良品率。根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据料号、批次分组合计得到该料号每个批次的不良PCS的数量合计。然后获取该料号每个批次中PNL条码的数量(PNL条码不能重复)并乘PNL布局信息中子表的记录数(该料号中的PCS数量)得到每个批次的PCS总数。对每个批次进行((PCS总数-不良PCS数量)/PCS总数 *100)得到每个批次的良品率。 3.饼状图：根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据检验信息中的不良原因分组统计各个原因的数量。在饼状图显示 4.表格：根据开始时间和结束时间、站台、料号 过滤检验信息，表头包含(站台、料号、PNL条码、PCS号、正反面、不良原因)，并针对表头字段进行去重
---
WebAPI/Controllers/Open_PrintTemController.cs | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/Open_PrintTemController.cs b/WebAPI/Controllers/Open_PrintTemController.cs
index 7ed9c32..ef8c5a4 100644
--- a/WebAPI/Controllers/Open_PrintTemController.cs
+++ b/WebAPI/Controllers/Open_PrintTemController.cs
@@ -30,7 +30,7 @@
{
sWhere = " Where 1=1 ";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (HNumber != "")
+ if (HNumber != "" && HNumber != null && HNumber != "undefined")
{
sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
}
@@ -73,11 +73,20 @@
/// <returns></returns>
[Route("Open_PrintTem/SaveOpenTmp")]
[HttpGet]
- public object SaveOpenTmp(string HNumber, string HName)
+ public object SaveOpenTmp(string HNumber, string HName,string user)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ //ClsCNSRM oCn = new ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
{
+ if (!DBUtility.ClsPub.Security_Log("OpenPrintTmp_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCn.BeginTran();
oCn.RunProc("Insert into SRM_OpenTmp " +
@@ -111,11 +120,20 @@
/// <returns></returns>
[Route("Open_PrintTem/DelOpenTmp")]
[HttpGet]
- public object DelOpenTmp(string HItemID)
+ public object DelOpenTmp(string HItemID, string user)
{
- ClsCNSRM oCn = new ClsCNSRM();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
try
{
+ if (!DBUtility.ClsPub.Security_Log("OpenPrintTmp_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCn.BeginTran();
oCn.RunProc("Delete from SRM_OpenTmp where HItemID='" + DBUtility.ClsPub.isLong(HItemID) + "'", ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -137,5 +155,89 @@
}
#endregion
+
+ #region [璁剧疆榛樿鎵撳嵃妯℃澘]
+ /// <summary>
+ /// 璁剧疆榛樿鍗版ā鏉�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Open_PrintTem/DefaultOpenTmp")]
+ [HttpGet]
+ public object DefaultOpenTmp(string HNumber,string HName)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ oCn.BeginTran();
+ //鍏堟妸姝ゆā鍧椾笅鐨勬ā鏉块粯璁ゆā鏉挎爣璁伴兘鍏抽棴
+ oCn.RunProc("update SRM_OpenTmp set HStdFlag = 0 where HNumber='" + HNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鏇存柊褰撳墠妯℃澘涓洪粯璁ゆā鏉�
+ oCn.RunProc("update SRM_OpenTmp set HStdFlag = 1 where HNumber='" + HNumber + "' and HName='"+ HName + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璁剧疆鎴愬姛!";
+ objjson.data = null;
+ return objjson;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁剧疆澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+
+ }
+ #endregion
+
+ #region [鑾峰彇榛樿鎵撳嵃妯℃澘]
+ /// <summary>
+ /// 鑾峰彇鎵撳嵃妯℃澘鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Open_PrintTem/GetDefaultOpenTmp_Json")]
+ [HttpGet]
+ public object GetDefaultOpenTmp_Json(string HNumber)
+ {
+ sWhere = " Where 榛樿鏍囪=1 ";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (HNumber != "")
+ {
+ sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
+ }
+ try
+ {
+ ds = webserver.GetOpenTmpList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触,娌℃湁璁剧疆榛樿妯℃澘" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "寮傚父" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1