From 7c80dbea61efde5d4690baa1bc96b8d98f4c2ac6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 九月 2022 08:45:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj.user | 2 +-
WebAPI/Controllers/LMESController.cs | 40 ++++++++++++++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 3 +--
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index f71a2bc..ec460aa 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -128,6 +128,46 @@
}
/// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗★紙涓嬭揪锛夊垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+
+ [Route("LEMS/MES_Sc_ProcessExchangeIssueBillList_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessExchangeIssueBillList_Json(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
+ 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;
+ }
+ }
+
+ /// <summary>
/// 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5592753..0138426 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -581,6 +581,7 @@
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -743,10 +744,8 @@
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
- <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
- <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index ceaae00..a3179f3 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -18,7 +18,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
--
Gitblit v1.9.1