From 35bb50e0a87f0ec4dde2c5882f555d7a6c3b0fd5 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期二, 29 六月 2021 10:23:38 +0800 Subject: [PATCH] 新增模具其他出入库模块 --- WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 130 ++++++++-------- WebAPI/WebAPI.csproj.user | 2 WebAPI/DLL/DAL.dll | 0 WebAPI/WebAPI.csproj | 4 WebAPI/Controllers/Sc_MouldController.cs | 318 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 388 insertions(+), 66 deletions(-) diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs new file mode 100644 index 0000000..bf84079 --- /dev/null +++ b/WebAPI/Controllers/Sc_MouldController.cs @@ -0,0 +1,318 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections.Generic; +using System.Data; +using System.Web.Http; +using WebAPI.Models; +namespace WebAPI.Controllers +{ + public class Sc_MouldController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛� + + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + public WebServer webserver = new WebServer(); + + + #region 妯″叿鍏朵粬鍏ュ簱鍗� + + #region 妯″叿鍏朵粬鍏ュ簱鍗曚繚瀛� + + [Route("Sc_MouldOtherInBill/MouldOtherInBill_Save")] + [HttpPost] + public object AddBill([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + //淇濆瓨鍗曟嵁 + return objJsonResult = MouldOtherInAddBill(msg1); + } + + public json MouldOtherInAddBill(string msg1) + { + //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + //string msg2 = sArray[0].ToString(); + //string msg3 = sArray[0].ToString(); + bool bResult; + try + { + //msg2 = "[" + msg2.ToString() + "]"; + msg1 = "[" + msg1.ToString() + "]"; + DAL.ClsSc_MouldOtherInBill BillNew = new DAL.ClsSc_MouldOtherInBill(); + List<Model.ClsSc_MouldOtherInBillMain> mainList = Newtonsoft + .Json + .JsonConvert + .DeserializeObject<List<Model.ClsSc_MouldOtherInBillMain>>(msg1); + List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft + .Json + .JsonConvert + .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(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.HWHID = mainList[0].HWHID; + BillNew.omodel.HSupID = 0; + BillNew.omodel.HSCWHID = 0; + BillNew.omodel.HEmpID = 0; + BillNew.omodel.HManagerID = mainList[0].HManagerID; + BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID; + BillNew.omodel.HKeeperID = mainList[0].HSecManagerID; + BillNew.omodel.HDeptID = mainList[0].HSecManagerID; + BillNew.omodel.HExplanation = mainList[0].HExplanation; + BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo; + BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag; + BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>(); + Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub(); + + 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.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID); + oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust); + oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty); + oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode); + if (oSub.HQty <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0"; + objJsonResult.data = null; + return objJsonResult; + } + oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife); + if (oSub.HDesignLife < 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0"; + objJsonResult.data = null; + return objJsonResult; + } + oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife); + oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice); + oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID); + oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID); + oSub.HSCWHID = 0; + oSub.HSCSPID = 0; + oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID); + oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo); + oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel); + oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness); + oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness); + oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel); + oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter); + oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag); + 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 + + #region 妯″叿鍏朵粬鍑哄簱鍗� + + #region 妯″叿鍏朵粬鍑哄簱鍗曚繚瀛� + + [Route("Sc_MouldOtherOutBill/MouldOtherOutBill_Save")] + [HttpPost] + public object MouldOtherOutBill_Save([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + //淇濆瓨鍗曟嵁 + return objJsonResult = MouldOtherOutAddBill(msg1); + } + + public json MouldOtherOutAddBill(string msg1) + { + //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + //string msg2 = sArray[0].ToString(); + //string msg3 = sArray[0].ToString(); + bool bResult; + try + { + //msg2 = "[" + msg2.ToString() + "]"; + msg1 = "[" + msg1.ToString() + "]"; + DAL.ClsSc_MouldOtherOutBill BillNew = new DAL.ClsSc_MouldOtherOutBill(); + List<Model.ClsSc_MouldOtherOutBillMain> mainList = Newtonsoft + .Json + .JsonConvert + .DeserializeObject<List<Model.ClsSc_MouldOtherOutBillMain>>(msg1); + List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft + .Json + .JsonConvert + .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(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.HWHID = mainList[0].HWHID; + BillNew.omodel.HSupID = 0; + BillNew.omodel.HSCWHID = 0; + BillNew.omodel.HEmpID = 0; + BillNew.omodel.HManagerID = mainList[0].HManagerID; + BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID; + BillNew.omodel.HKeeperID = mainList[0].HSecManagerID; + BillNew.omodel.HDeptID = mainList[0].HSecManagerID; + BillNew.omodel.HExplanation = mainList[0].HExplanation; + BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo; + BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag; + BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>(); + Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub(); + + 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.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID); + oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust); + oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty); + oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode); + if (oSub.HQty <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0"; + objJsonResult.data = null; + return objJsonResult; + } + oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife); + if (oSub.HDesignLife < 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0"; + objJsonResult.data = null; + return objJsonResult; + } + oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife); + oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice); + oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID); + oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID); + oSub.HSCWHID = 0; + oSub.HSCSPID = 0; + oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID); + oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo); + oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel); + oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness); + oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness); + oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel); + oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter); + oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag); + 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 61c41aa..f3c1344 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 9df8fb4..db35720 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/20/2021 14:28:50</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/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>06/29/2021 10:09:47</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/20/2021 14:28:50</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>05/31/2021 09:54:31</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/20/2021 14:28:50</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>05/20/2021 14:28:50</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/20/2021 14:28:50</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/25/2021 14:17:06</publishTime> + <publishTime>06/29/2021 10:12:34</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>06/25/2021 14:17:06</publishTime> + <publishTime>06/29/2021 10:12:34</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/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>06/29/2021 10:09:47</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>05/31/2021 09:54:31</publishTime> + <publishTime>06/17/2021 23:18:55</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Index.html"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="packages.config"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/21/2021 13:19:40</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>05/20/2021 14:28:50</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web.config"> - <publishTime>06/25/2021 14:17:56</publishTime> + <publishTime>06/29/2021 10:12:40</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 19c7d2f..729de1b 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -354,6 +354,7 @@ <Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" /> <Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" /> <Compile Include="Controllers\PublicPageMethodController.cs" /> + <Compile Include="Controllers\Sc_MouldController.cs" /> <Compile Include="Controllers\Sc_GroupOrderBillController.cs" /> <Compile Include="Controllers\QC_ManagementController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" /> @@ -395,6 +396,7 @@ <Compile Include="DLL\ClsSc_MESStopWorkBill.cs" /> <Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" /> <Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" /> + <Compile Include="DLL\ClsSc_MouldMaintainBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdOutBill.cs" /> <Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" /> @@ -412,6 +414,8 @@ <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" /> <Compile Include="Models\ClsSc_MouldDotCheckBillMain.cs" /> <Compile Include="Models\ClsSc_MouldDotCheckBillSub.cs" /> + <Compile Include="Models\ClsSc_MouldMaintainBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldMaintainBillSub.cs" /> <Compile Include="Models\ClsSc_MouldStockBillMain.cs" /> <Compile Include="Models\ClsSc_MouldStockBillSub.cs" /> <Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index e7403e8..c934955 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -7,7 +7,7 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> - <NameOfLastUsedPublishProfile>D:\椤圭洰\MESWMS-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> -- Gitblit v1.9.1