From d70b6043c4d8d4486b2b3eca81e404480b032f13 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期四, 29 四月 2021 16:23:08 +0800 Subject: [PATCH] 工艺路线模块 --- WebAPI/Models/Gy_RoutingBillSub.cs | 19 ++ WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 288 ++++++++++++++++++++++++++++++++++++ WebAPI/Models/Gy_RoutingBill.cs | 33 ++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 130 ++++++++-------- WebAPI/WebAPI.csproj | 3 5 files changed, 408 insertions(+), 65 deletions(-) diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs new file mode 100644 index 0000000..c1ad168 --- /dev/null +++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs @@ -0,0 +1,288 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //宸ヨ壓璺嚎Controller + public class Gy_RoutingBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖宸ヨ壓璺嚎鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_RoutingBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList"); + } + else + { + string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + 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 = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_RoutingBill/AddBill")] + [HttpPost] + public object AddBill([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + oCN.BeginTran(); + //淇濆瓨涓昏〃 + objJsonResult = AddBillMain(msg1); + if (objJsonResult.code == "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + + public json AddBillMain(string msg1) + { + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + try + { + msg2 = "[" + msg2.ToString() + "]"; + List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2); + string BillType = "3301"; + long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + DateTime HDate = mainList[0].HDate;//鏃ユ湡 + int HYear = 2021; + double HPeriod = 1; + string HRemark = mainList[0].HRemark;//澶囨敞 + string HMaker = mainList[0].HMaker;//鍒跺崟浜� + long HMaterID = mainList[0].HMaterID;//浜у搧ID + string HName = mainList[0].HName;//宸ヨ壓璺嚎鍚嶇О + long HMaterTypeID = 0; + long HRoutingGroupID = mainList[0].HRoutingGroupID;//宸ヨ壓璺嚎澶х被ID + long HUnitID = mainList[0].HUnitID;//璁¢噺鍗曚綅 + string HMaterNumber = mainList[0].HMaterNumber;//浜у搧浠g爜 + long HUnitNumber = mainList[0].HUnitID;//璁¢噺鍗曚綅ID + bool HStandard = mainList[0].HStandard;//鏄惁榛樿宸ヨ壓 + long HMainGroupID = mainList[0].HGroupID;//鐢熶骇鐝粍ID + long HMainProcID = mainList[0].HMainProcID;//宸ュ簭ID + long HMainCenterID = mainList[0].HMainCenterID;//宸ヤ綔涓績ID + string HMainTimeUnit = mainList[0].HMainTimeUnit;//杩愯鏃堕棿鍗曚綅 + double HMainUnitTime = mainList[0].HMainUnitTime;//杩愯鏃堕棿 + double HMainWorkQty = mainList[0].HMainWorkQty;//鍔犲伐鏁伴噺 + double HMainPrice = mainList[0].HMainPrice;//宸ヤ环 + double HStdSourceQty = mainList[0].HStdSourceQty;//鏍囧噯璧勬簮鏁� + double HAddSourceRate = mainList[0].HAddSourceRate;//鍔犺祫婧愬閲� + double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲� + + //涓昏〃 + oCN.RunProc("Insert Into Gy_RoutingBillMain " + + "(HBillType,HInterID,HBillNo,HDate" + + ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" + + ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" + + ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" + + ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" + + ") " + + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" + + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID + + "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) + + "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty + + "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HDelSourceRate + + ") "); + + //淇濆瓨瀛愯〃 + objJsonResult = AddBillSub(msg3, HInterID); + if (objJsonResult.code == "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎 + //鍒ゆ柇鏄惁閲嶅宸ュ簭鍙� + ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒ゆ柇閲嶅宸ュ簭鍙峰け璐ワ紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]); + objJsonResult.data = null; + return objJsonResult; + } + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = null; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + public json AddBillSub(string msg3,long HInterID) { + List<Gy_RoutingBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3); + for (int i=0;i< subList.ToArray().Length;i++) + { + if (subList[i].HWorkQty <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + i + "琛岋紝鍔犲伐鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0"; + objJsonResult.data = null; + return objJsonResult; + } + long HCenterID = 0;//宸ヤ綔涓績ID + string HTimeUnit = "";//鏃堕棿鍗曚綅 + double HUnitTime = 0;//杩愯鏃堕棿 + double HReadyTime = 0;//鍑嗗鏃堕棿 + double HQueueTime = 0;//鎺掗槦鏃堕棿 + double HMoveTime = 0;//杞Щ鏃堕棿 + string HCloseMan = "";//鍏抽棴浜� + bool HCloseType = false;// + string HProcType = "";//宸ュ簭绫诲瀷 + bool HNextProcFlag = false;//涓嬮亾娴佽浆宸ュ簭 + bool HFlowProc = false;//娴佽浆宸ュ簭 + double HFixPrice = 0;//鐝骇瀹氶 + double HProcPrice = 0;//宸ュ簭宸ヤ环 + double HBadPrice = 0;//涓嶅悎鏍煎崟浠� + double HWasterPrice = 0;//鎶ュ簾鍗曚环 + bool HStdFlag = false;//鏍囧噯瀹氶 + double HBeginDayQty = 0;//寮�宸ヤ綑閲忥紙澶╂暟锛� + double HBeginFixQty = 0;//寮�宸ヤ綑閲忥紙鍥烘暟锛� + long HSourceInterID = 0;//婧愬崟涓诲唴鐮� + long HSourceEntryID = 0;//婧愬崟瀛愬唴鐮� + string HSourceBillNo = "";//婧愬崟鍗曞彿 + string HSourceBillType = "";//婧愬崟绫诲瀷 + double HRelationQty = 0;//鍏宠仈鏁伴噺 + double HRelationMoney = 0;//鍏宠仈閲戦 + bool HAutoTrunFlag = false;//鑷姩绉昏浆 + double HFixWorkDays = 0;//涓婇亾鍥哄畾澶╂暟 + double HTrunWorkDays = 0;//涓婇亾寰幆鍛ㄦ湡 + double HReadyTimes = 0;//鏈亾鍑嗗鏃堕棿 + double HICMOReadyTimes = 0;//鎹㈠崟鍑嗗鏃堕棿 + double HSubStdEmpQty = 0;//鏍囧噯浜烘暟 + double HSubCanUseSourceQty = 0;//鍙搷浣滆澶囨暟 + long HProcID_S = 0;//宸ユID + long HCenterID_S = 0;//浜х嚎涓績ID + double HWorkQty_S = 0;//浜х嚎浜ц兘 + double HSubStdEmpQty_S = 0;//浜х嚎浜烘暟 + string HMouldNo = "";//妯″叿缂栧彿 + double HChangeMould = 0;//鎹㈡ā鏃堕棿/鎹㈠垁鏃堕棿 + string HPackStd = "";//鍛ㄨ浆绠辨爣鍑� + string HPack = "";//鍛ㄨ浆绠� + string HPutArea = "";//鏆傛斁鍖� + double HMyWorkDays = 0;//鐢熶骇鍛ㄦ湡 + double HMyFixWorkDays = 0;//鍥哄畾鐢熶骇澶╂暟 + + oCN.RunProc("Insert into Gy_RoutingBillSub " + + "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" + + ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" + + ",HReadyTime,HQueueTime,HMoveTime" + + ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" + + ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" + + ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" + + ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" + + ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" + + ") values(" + + HInterID + "," + i + "," + subList[i].HProcID + "," + subList[i].HProcNo + "," + subList[i].HSupID + "," + Convert.ToString(subList[i].HSupFlag ? 1 : 0) + "" + + "," + subList[i].HWorkQty + "," + HCenterID + ",'" + HTimeUnit + "'," + HUnitTime + + "," + HReadyTime + "," + HQueueTime + "," + HMoveTime + + ",'" + HCloseMan + "'," + Convert.ToString(HCloseType ? 1 : 0) + ",'" + subList[i].HRemark + "','" + HProcType + "'," + Convert.ToString(HNextProcFlag ? 1 : 0) + "," + Convert.ToString(HFlowProc ? 1 : 0) + + "," + HFixPrice + "," + HProcPrice + "," + HBadPrice + "," + HWasterPrice + "," + Convert.ToString(HStdFlag ? 1 : 0) + "," + HBeginDayQty + "," + HBeginFixQty + + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty + "," + HRelationMoney + "," + Convert.ToString(HAutoTrunFlag ? 1 : 0) + + "," + HFixWorkDays + "," + HTrunWorkDays + "," + HReadyTimes + "," + HICMOReadyTimes + "," + HSubStdEmpQty + "," + HSubCanUseSourceQty + + "," + HProcID_S + "," + HCenterID_S + "," + HWorkQty_S + ", " + HSubStdEmpQty_S + ",'" + HMouldNo + "'," + HChangeMould + + ",'" + HPackStd + "','" + HPack + "','" + HPutArea + "'," + HMyWorkDays + "," + HMyFixWorkDays + "," + subList[i].HPassRate + + ") "); + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = null; + objJsonResult.data = null; + return objJsonResult; + } + + // + } +} \ No newline at end of file diff --git a/WebAPI/Models/Gy_RoutingBill.cs b/WebAPI/Models/Gy_RoutingBill.cs new file mode 100644 index 0000000..ef05e1d --- /dev/null +++ b/WebAPI/Models/Gy_RoutingBill.cs @@ -0,0 +1,33 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class Gy_RoutingBill + { + public long HInterID { get; set; } + public string HBillNo { get; set; } + public DateTime HDate { get; set; } + public string HRemark { get; set; } + public string HMaker { get; set; } + public long HMaterID { get; set; } + public string HName { get; set; } + public long HRoutingGroupID { get; set; } + public long HUnitID { get; set; } + public string HMaterNumber { get; set; } + public bool HStandard { get; set; } + public long HGroupID { get; set; } + public long HMainProcID { get; set; } + public long HMainCenterID { get; set; } + public string HMainTimeUnit { get; set; } + public double HMainUnitTime { get; set; } + public double HMainWorkQty { get; set; } + public double HMainPrice { get; set; } + public double HStdSourceQty { get; set; } + public double HAddSourceRate { get; set; } + public double HDelSourceRate { get; set; } + + } +} \ No newline at end of file diff --git a/WebAPI/Models/Gy_RoutingBillSub.cs b/WebAPI/Models/Gy_RoutingBillSub.cs new file mode 100644 index 0000000..8f50770 --- /dev/null +++ b/WebAPI/Models/Gy_RoutingBillSub.cs @@ -0,0 +1,19 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class Gy_RoutingBillSub + { + public long HProcID { get; set; }//宸ュ簭ID + public string HProcNo { get; set; }//娴佹按鍙� + public long HSupID { get; set; }//渚涘簲鍟咺D + public bool HSupFlag { get; set; }//澶栧崗鏍囪 + public double HWorkQty { get; set; }//鍔犲伐鏁伴噺 + public double HPassRate { get; set; }//鑹巼 + public string HRemark { get; set; }//澶囨敞 + + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 768687e..31acb14 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -11,7 +11,7 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -20,19 +20,19 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -50,7 +50,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -59,13 +59,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -131,7 +131,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>03/26/2021 14:35:48</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> @@ -164,10 +164,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/22/2021 20:00:19</publishTime> + <publishTime>04/29/2021 10:22:28</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/22/2021 20:00:19</publishTime> + <publishTime>04/29/2021 10:22:28</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -185,163 +185,163 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Global.asax"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Index.html"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="packages.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/21/2021 13:19:40</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/web.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web.config"> - <publishTime>04/22/2021 20:00:25</publishTime> + <publishTime>04/29/2021 10:22:33</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index bdf1880..57fa317 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -333,6 +333,7 @@ <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> + <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" /> <Compile Include="Controllers\LMESController.cs" /> @@ -352,6 +353,7 @@ <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> <Compile Include="Models\DocumentsView.cs" /> + <Compile Include="Models\Gy_RoutingBillSub.cs" /> <Compile Include="Models\LookingForBill.cs" /> <Compile Include="Models\M_Department.cs" /> <Compile Include="Models\M_ProcMul.cs" /> @@ -360,6 +362,7 @@ <Compile Include="Models\Sc_ProcessPlanViewModel.cs" /> <Compile Include="Models\Sc_ProcessReportViewModel.cs" /> <Compile Include="Models\Sc_ProcessSendWorkViewModel.cs" /> + <Compile Include="Models\Gy_RoutingBill.cs" /> <Compile Include="Models\StationBill.cs" /> <Compile Include="Models\StationOutBillView.cs" /> <Compile Include="Properties\Resources.Designer.cs"> -- Gitblit v1.9.1