From a5e3cae8ab6c4635c316ea0d3a2cfe6b200e0f78 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 30 六月 2021 15:43:21 +0800
Subject: [PATCH] 新增模具维修记录单
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 130 +++++++++++++-------------
WebAPI/Controllers/WebAPIController.cs | 52 ++++++++++
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/Sc_MouldController.cs | 114 ++++++++++++++++++++++
4 files changed, 231 insertions(+), 65 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index bf84079..68a0493 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -314,5 +314,119 @@
#endregion
+ #region 妯″叿缁翠慨璁板綍鍗�
+
+ #region 妯″叿缁翠慨璁板綍鍗曚繚瀛�
+
+ [Route("Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save")]
+ [HttpPost]
+ public object MouldRepairWorkBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ return objJsonResult = MouldRepairWorkAddBill(msg1);
+ }
+
+ public json MouldRepairWorkAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSb_MouldRepairWorkBill BillNew = new DAL.ClsSb_MouldRepairWorkBill();
+ List<Model.ClsSb_MouldRepairWorkBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillMain>>(msg1);
+ List<Model.ClsSb_MouldRepairWorkBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(msg1);
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HEmpID = mainList[0].HEmpID;
+ BillNew.omodel.HRepairID = mainList[0].HRepairID;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
+ BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
+ BillNew.omodel.HRepairContent = mainList[0].HRepairContent;
+ BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+ BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+ BillNew.omodel.HTimes = mainList[0].HTimes;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ BillNew.omodel.HSupID = mainList[0].HSupID;
+ BillNew.omodel.HRepairType = mainList[0].HRepairType;
+ BillNew.omodel.HNewModel = mainList[0].HNewModel;
+ BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+ BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.DetailColl = new List<Model.ClsSb_MouldRepairWorkBillSub>();
+ Model.ClsSb_MouldRepairWorkBillSub oSub = new Model.ClsSb_MouldRepairWorkBillSub();
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HRepairID = DBUtility.ClsPub.isLong(subList[0].HRepairID);
+ oSub.HManagerID = DBUtility.ClsPub.isLong(subList[0].HManagerID);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(subList[0].HMoney);
+ oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(subList[0].HRepairExplanation);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 42aee5b..c1d9ee8 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1832,6 +1832,58 @@
}
}
+ /// <summary>
+ /// 鑾峰彇缁翠慨椤圭洰鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetRepairList_Json")]
+ [HttpGet]
+ public object GetRepairList_Json(string Repair)
+ {
+ if (Repair != "")
+ {
+ sWhere = " and ( HNumber like '%" + Repair + "%' or HName like '%" + Repair + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_Repair where HStopflag=0 Order by HItemID ", "Gy_Repair");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_Repair where HStopflag=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_Repair");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
}
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index f3c1344..14f17f0 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index f222ee4..a83deb8 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>06/30/2021 15:32:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -42,19 +42,19 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/02/2021 13:19:20</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -120,7 +120,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -153,10 +153,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/28/2021 14:37:51</publishTime>
+ <publishTime>06/30/2021 15:39:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/28/2021 14:37:51</publishTime>
+ <publishTime>06/30/2021 15:39:14</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -168,163 +168,163 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>06/30/2021 15:32:52</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>06/02/2021 13:19:20</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/21/2021 13:19:40</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/28/2021 14:37:55</publishTime>
+ <publishTime>06/30/2021 15:39:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1