From de4fda95377a54635683dfa5896c726901bbd780 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 16 十月 2023 09:26:07 +0800
Subject: [PATCH] 生产计划平台 计划结束日期

---
 WebAPI/Controllers/SCGL/日计划管理/JIT_ICMOSortBillController.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
index 7e0c476..3fcd8eb 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
@@ -17,6 +17,8 @@
         public DataSet ds = new DataSet();
         public WebServer webserver = new WebServer();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
         #region 鐢熶骇鏃ヨ鍒� 鏌ヨ
         [Route("JIT_ICMOSortBill/JIT_ICMOSortBillList")]
         [HttpGet]
@@ -34,7 +36,18 @@
                     return objJsonResult;
                 }
 
-                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList", "h_v_Sc_ICMOSortBillList");
+
+                string Ret = "";
+                if (oSystemParameter.ShowBill(ref Ret)) {
+                    //鍒ゆ柇瀹㈡埛涓哄嚡璐�
+                    if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟                      
+                    {
+                        ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere, "h_v_Sc_ICMOSortBillList");
+                    }
+                    else {
+                        ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList where 1=1"+ sWhere , "h_v_Sc_ICMOSortBillList");
+                    }
+                }
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;

--
Gitblit v1.9.1