From 2cae7ac47f79cbc707be77a5b2563a8f18967ade Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 26 五月 2022 09:14:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 f5b247d..770bc0f 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"
@@ -29,7 +29,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_Gy_WorkWarehouseBillList");
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -61,7 +61,38 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 鐗╂枡ID = '" + HMaterID + "' " + sWhere + " ORDER BY 鏃ヨ鍒掓棩鏈� ASC,鍙敤鏁伴噺 DESC,鐢熶骇杞﹂棿 ", "h_v_JIT_Gy_WorkWarehouseBillList");
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 鐗╂枡ID = '" + HMaterID + "' " + sWhere + " ORDER BY 鏃ヨ鍒掓棩鏈� ASC,鍙敤鏁伴噺 DESC,鐢熶骇杞﹂棿 ", "h_v_JIT_MOMaterReadysBill");
+
+ 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
+
+ #region 鍗虫椂搴撳瓨鍒楄〃
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sWhere">鏌ヨ鏉′欢</param>
+ /// <returns></returns>
+ [Route("JIT_Complete/JIT_InventoryList")]
+ [HttpGet]
+ public object JIT_InventoryList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_STK_Inventory where 1=1 " + sWhere + "", "h_v_STK_Inventory");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1