From 8012d4bb58c440b8b8109744d89b15161460fa45 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 13 一月 2022 11:35:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 64 ++++++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 2 +
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 3 +
3 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
new file mode 100644
index 0000000..e5b13d8
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -0,0 +1,64 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SBGL
+{
+ public class Sb_EquipRepairSendWorkBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 璁惧缁翠慨娲惧伐鍗曟煡璇㈠垪琛�
+ [Route("Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillList")]
+ [HttpGet]
+ public object GetEquipRepairSendWorkBillList(string sWhere)
+ {
+ try
+ {
+ string sql = "select * from h_v_Sb_EquipRepairSendWorkBillList ";
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRepairSendWorkBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sb_EquipRepairSendWorkBillList");
+ }
+
+ if (ds.Tables[0].Rows.Count == 0||ds==null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message ="鏃犺褰�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "Sucess";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception"+e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨娲惧伐鍗� 娣诲姞/淇敼
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 5ff1bab..f24d16c 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -14,6 +14,7 @@
public class Sc_MouldRepairSendWorkBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
ClsSb_MouldRepairWorkBillMain omodel = new ClsSb_MouldRepairWorkBillMain();
List<ClsSb_MouldRepairWorkBillSub> DetailColl = new List<ClsSb_MouldRepairWorkBillSub>();
private json objJsonResult = new json();
@@ -135,7 +136,7 @@
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
",HUpDateDate=getdate()" +
//========================================
",HMouldID=" + omodel.HMouldID.ToString() +
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2f77ed4..5d819cc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -367,6 +367,7 @@
<Compile Include="Controllers\MoveStockBillController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\ReportStepPlatFormController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipRepairSendWorkBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReturnBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
@@ -759,6 +760,7 @@
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
</ItemGroup>
--
Gitblit v1.9.1