From 175f31386e47b1ca2c751b8f87cd7a089c66e7ae Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 八月 2023 16:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 770bc0f..f3e8764 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"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -25,11 +26,16 @@
/// <returns></returns>
[Route("JIT_Complete/JIT_CompleteDetailList")]
[HttpGet]
- public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID)
+ public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
+ string sql = "";
+ if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1")
+ {
+ sql = "and 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' and 涓荤敓浜ц鍗曚富鍐呯爜='" + HMainICMOInterID + "' and 鏃ヨ鍒掕鍗曚富鍐呯爜='" + HICMOInterID + "'";
+ }
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 1=1 " +sql + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -110,5 +116,47 @@
}
}
#endregion
+
+ #region 榻愬鍒嗘瀽鎶ヨ〃
+ public class ReportMOMaterReadysBill
+ {
+ public int? HORGID;//缁勭粐
+ public int? HMATERIALID;//鐗╂枡
+ public int? HDeptID;//鐢熶骇杞﹂棿
+ public int? HSCZYID;//鐢熶骇璧勬簮
+ public string HXQD;//闇�姹傚崟鍙�
+ public string HMOBILLNO;//鐢熶骇璁㈠崟鍙�
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ [Route("JIT_Complete/ReportMOMaterReadysBillList")]
+ [HttpGet]
+ public object ReportMOMaterReadysBillList(string sWhere)
+ {
+ try
+ {
+
+ 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");
+
+ objJsonResult.code = "1";
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1