From 0403c09aef92881f61ae71a8ecb88667de25b209 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 30 六月 2021 17:01:24 +0800
Subject: [PATCH] 新增模具寿命调整单
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 14 ++--
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/Sc_MouldController.cs | 127 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 68a0493..6a9be79 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -428,5 +428,132 @@
#endregion
+ #region 妯″叿瀵垮懡璋冩暣鍗�
+
+ #region 妯″叿瀵垮懡璋冩暣鍗曚繚瀛�
+
+ [Route("Sc_MouldLifeChangeBill/MouldLifeChangeBill_Save")]
+ [HttpPost]
+ public object MouldLifeChangeBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ return objJsonResult = MouldLifeChangeAddBill(msg1);
+ }
+
+ public json MouldLifeChangeAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldLifeChangeBill BillNew = new DAL.ClsSc_MouldLifeChangeBill();
+ List<Model.ClsSc_MouldLifeChangeBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldLifeChangeBillMain>>(msg1);
+ List<Model.ClsSc_MouldLifeChangeBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldLifeChangeBillSub>>(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.HRemark = mainList[0].HRemark;
+ BillNew.omodel.HMangerID = mainList[0].HMangerID;
+ BillNew.omodel.HEmpID = mainList[0].HEmpID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HReason = mainList[0].HReason;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldLifeChangeBillSub>();
+ Model.ClsSc_MouldLifeChangeBillSub oSub = new Model.ClsSc_MouldLifeChangeBillSub();
+ 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.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HLeaveLife = DBUtility.ClsPub.isSingle(subList[0].HLeaveLife);
+ oSub.HDesignLife = DBUtility.ClsPub.isSingle(subList[0].HDesignLife);
+ oSub.HNewLeaveLife = DBUtility.ClsPub.isSingle(subList[0].HNewLeaveLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oSub.HLeaveLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍓╀綑瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ 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/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 14f17f0..a22039b 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 5d043e9..9151e30 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -21,7 +21,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/28/2021 17:33:22</publishTime>
+ <publishTime>06/30/2021 16:33:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
@@ -42,7 +42,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/28/2021 17:33:22</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -153,10 +153,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/29/2021 13:54:57</publishTime>
+ <publishTime>06/30/2021 16:44:16</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/29/2021 13:54:57</publishTime>
+ <publishTime>06/30/2021 16:44:16</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -180,7 +180,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>06/28/2021 17:33:22</publishTime>
+ <publishTime>06/30/2021 16:33:18</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -189,7 +189,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>06/28/2021 17:33:22</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -324,7 +324,7 @@
<publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/29/2021 13:55:01</publishTime>
+ <publishTime>06/30/2021 16:44:26</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1