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/CGGL/Cg_POOrderBillController.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 0db6ff1..b5e58ab 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -44,12 +44,25 @@
objJsonResult.data = null;
return objJsonResult;
}
- //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
- bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
- if (!isCgjl)
+
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
{
- sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
+ {
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ }
+ }
}
+
sWhere = sWhere.Replace("'", "''");
@@ -1374,9 +1387,11 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
+ string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName,a.HWHID,w.HName 榛樿浠撳簱,a.HPOUnitID,u.HName HPOUnitName " +
" from Gy_Material AS a " +
" LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
+ " left outer join Gy_Warehouse as w on a.HWHID = w.HItemID " +
+ " left outer join Gy_Unit As u on a.HPOUnitID = u.HItemID" +
" where a.HItemID =" + HMaterID;
var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
@@ -3277,6 +3292,46 @@
}
#endregion
+
+ #region 閲囪喘璁㈠崟 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈渚涘簲鍟嗚繃婊ゆ潯浠�
+ [Route("Cg_POOrderBill/getSupIDListByUser")]
+ [HttpGet]
+ public object getSupIDListByUser(string CurUserID, string CurUserName)
+ {
+ string sWhere = "";
+ string ModRightNameCheck = "Gy_UserLookAllSup";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //鏉冮檺鍒ゆ柇锛氭槸鍚﹀彲浠ユ煡鐪嬫墍鏈変緵搴斿晢
+ if (DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ sWhere = "";
+ }
+ else
+ {
+ sWhere = " and HSupID in (select HSupID from Gy_UserSupplierRelation Where HUserID = '" + CurUserID + "')";
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = sWhere;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ sWhere = " and 1=0 ";
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = sWhere;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1