From 7d074703a8364c27ca38cbb8f82ebd2f6e85cf22 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 07 一月 2025 14:46:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 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 f3e8764..6277fa9 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"
@@ -15,6 +15,7 @@
{
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
DataSet ds;
#region 榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃
@@ -41,6 +42,52 @@
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 榻愬鐗╂枡淇℃伅鏄庣粏鍒楄〃
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sWhere">鏌ヨ鏉′欢</param>
+ /// <param name="HMainICMOEntryID">鐢熶骇璁㈠崟鏄庣粏琛╥d</param>
+ /// <returns></returns>
+ [Route("JIT_Complete/JIT_CompleteMaterlDetailList")]
+ [HttpGet]
+ public object JIT_CompleteMaterlDetailList(string sWhere )
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_MaterDetailList " + sWhere, "h_p_JIT_MaterDetailList");
+
+
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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)
@@ -98,7 +145,18 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_STK_Inventory where 1=1 " + sWhere + "", "h_v_STK_Inventory");
+
+ string Ret = "";
+ oSystemParameter.ShowBill(ref Ret);
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_STK_Inventory where 1=1 " + sWhere + "", "h_v_STK_Inventory");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select * from h_v_STK_Inventory where 1=1 " + sWhere + "", "h_v_STK_Inventory");
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -122,10 +180,13 @@
{
public int? HORGID;//缁勭粐
public int? HMATERIALID;//鐗╂枡
- public int? HDeptID;//鐢熶骇杞﹂棿
+ public string HDeptID;//鐢熶骇杞﹂棿
public int? HSCZYID;//鐢熶骇璧勬簮
public string HXQD;//闇�姹傚崟鍙�
public string HMOBILLNO;//鐢熶骇璁㈠崟鍙�
+ public string HBeginDate; //鎺掍骇璁″垝鏃ユ湡锛堝紑濮嬫椂闂达級
+ public string HEndDate; //鎺掍骇璁″垝鏃ユ湡锛堢粨鏉熸椂闂达級
+ public string HMaterAtt; //鐗╂枡灞炴��
}
/// <summary>
///
@@ -140,7 +201,7 @@
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}", "PR_Complete_Report");
+ 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");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1