From 170dc25004f6d0a22add0d71fdec602545902999 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 十一月 2025 10:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
index 6277fa9..028976c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -27,10 +27,20 @@
/// <returns></returns>
[Route("JIT_Complete/JIT_CompleteDetailList")]
[HttpGet]
- public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID)
+ public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID,string user)
{
try
{
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("JIT_CompleteMaterlDetailList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = "";
if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1")
{
@@ -61,7 +71,6 @@
///
/// </summary>
/// <param name="sWhere">鏌ヨ鏉′欢</param>
- /// <param name="HMainICMOEntryID">鐢熶骇璁㈠崟鏄庣粏琛╥d</param>
/// <returns></returns>
[Route("JIT_Complete/JIT_CompleteMaterlDetailList")]
[HttpGet]
@@ -178,7 +187,7 @@
#region 榻愬鍒嗘瀽鎶ヨ〃
public class ReportMOMaterReadysBill
{
- public int? HORGID;//缁勭粐
+ public string HORGID;//缁勭粐
public int? HMATERIALID;//鐗╂枡
public string HDeptID;//鐢熶骇杞﹂棿
public int? HSCZYID;//鐢熶骇璧勬簮
@@ -189,16 +198,23 @@
public string HMaterAtt; //鐗╂枡灞炴��
}
/// <summary>
- ///
+ /// 榻愬鍒嗘瀽鎶ヨ〃
/// </summary>
/// <returns></returns>
[Route("JIT_Complete/ReportMOMaterReadysBillList")]
[HttpGet]
- public object ReportMOMaterReadysBillList(string sWhere)
+ public object ReportMOMaterReadysBillList(string sWhere,string user)
{
try
{
-
+ if (!DBUtility.ClsPub.Security_Log("JIT_ReportMOMaterReadysBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ReportMOMaterReadysBill Report = JsonConvert.DeserializeObject<ReportMOMaterReadysBill>(sWhere);
ds = oCN.RunProcReturn($"exec PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},'{Report.HDeptID}',{Report.HSCZYID},{Report.HMATERIALID},'{Report.HBeginDate}','{Report.HEndDate}','{Report.HMaterAtt}'", "PR_Complete_Report");
@@ -219,5 +235,52 @@
}
}
#endregion
+
+ #region 娆犳枡鎶ヨ〃
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ [Route("JIT_Complete/MaterialLevelShorReportList")]
+ [HttpGet]
+ public object MaterialLevelShorReportList(string sWhere,string HBEGINDATE,string HENDDATE,string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("JIT_MaterialLevelShorAnalysisReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_MaterialLevelShorReportList '{sWhere}','{HBEGINDATE}','{HENDDATE}'", "h_p_JIT_MaterialLevelShorReportList");
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1