From 0ce9810f76ceb670fab4482aafa06e8bd80ad22c Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期一, 24 五月 2021 10:10:50 +0800 Subject: [PATCH] nothing --- WebAPI/Models/StationBill.cs | 2 WebAPI/Controllers/PZGL/QC_LastPieceCheckBillController.cs | 75 +++++++++ WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 2 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 2 WebAPI/Properties/PublishProfiles/API.pubxml.user | 130 ++++++++-------- WebAPI/WebAPI.csproj | 1 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 248 ++++++++++++++++++++++-------- WebAPI/DLL/Model.dll | 0 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs | 2 9 files changed, 325 insertions(+), 137 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs index b3e79bb..22e4bde 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs @@ -167,7 +167,7 @@ double HMoney = list[0].HMoney;//閲戦 string HRemark = list[0].HRemark;//澶囨敞 double HTaxRate = list[0].HTaxRate;//绋庣巼 - string HProcNo = list[0].HProcNo;//娴佹按鍙� + long HProcNo = list[0].HProcNo;//娴佹按鍙� string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� int HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜 int HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧 diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs index 7274261..dadcc8d 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs @@ -111,7 +111,7 @@ double HMoney = list[0].HMoney;//閲戦 string HRemark = list[0].HRemark;//澶囨敞 double HTaxRate = list[0].HTaxRate;//绋庣巼 - string HProcNo = list[0].HProcNo;//娴佹按鍙� + long HProcNo = list[0].HProcNo;//娴佹按鍙� string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� int HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜 int HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧 diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs index 761dd47..f034796 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs @@ -21,9 +21,8 @@ DataSet ds1; - /// <summary> - /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + /// test ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> @@ -72,75 +71,56 @@ double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟 string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID - string HProcNo = list[0].HProcNo;//娴佹按鍙� + long HProcNo = list[0].HProcNo;//娴佹按鍙� string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� - //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� - oCN.BeginTran(); - //涓昏〃 - oCN.RunProc("Insert Into Sc_StationInBillMain " + - "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + - ",HYear,HPeriod,HRemark" + - ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" + - ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" + - ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + - ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" + - ",HProcNo,HOrderProcNO" + - ") " + - " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + - "," + HYear + "," + HPeriod + ",'" + HRemark + "'" + - "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID + - ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + - "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + - "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID + - ",'" + HProcNo + "','" + HOrderProcNO + "'" + - ") "); - ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); - if (ds == null) - { - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; - objJsonResult.data = null; - return objJsonResult; - } - if (ds.Tables[0].Rows.Count == 0) - { - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; - objJsonResult.data = null; - return objJsonResult; - } - if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") - { - oCN.RollBack(); - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); - objJsonResult.data = null; - return objJsonResult; - } - oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1"); - //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭 - ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " + - " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " + - " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain"); - if (ds1 == null || ds1.Tables[0].Rows.Count == 0) - { - - } - else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�") - { + ListModels oListModels = new ListModels(); + + DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill(); + + BillNew.omodel.HInterID = HInterID; + BillNew.omodel.HYear = 2011; + BillNew.omodel.HPeriod = 1; + BillNew.omodel.HBillNo = HBillNo; + BillNew.omodel.HICMOBillNo = HICMOBillNo; + BillNew.omodel.HICMOInterID = HICMOInterID; + BillNew.omodel.HProcExchInterID = HProcExchInterID; + BillNew.omodel.HProcExchEntryID = HProcExchEntryID; + BillNew.omodel.HProcExchBillNo = HProcExchBillNo; + BillNew.omodel.HProcID = HProcID; + BillNew.omodel.HMaterID = HMaterID; + BillNew.omodel.HStationInTime = DateTime.Now; + BillNew.omodel.HEmpID = HEmpID; + BillNew.omodel.HSourceID = HSourceID; + BillNew.omodel.HGroupID = HGroupID; + BillNew.omodel.HICMOQty = HICMOQty; + BillNew.omodel.HPlanQty = HPlanQty; + BillNew.omodel.HQty = HQty; + BillNew.omodel.HPieceQty = HPieceQty; + BillNew.omodel.HSourceName = HSourceName; + BillNew.omodel.HCenterID = HCenterID; + + BillNew.omodel.HProcNo = HProcNo; + BillNew.omodel.HOrderProcNO = HOrderProcNO; + bool bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo); + + //鎻愮ず + if (bResult == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + HBillNo.Trim() + ClsPub.sExeReturnInfo; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } - oCN.Commit(); - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } } catch (Exception e) { @@ -153,6 +133,138 @@ } } + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + //[Route("Cj_StationInBill/AddBill")] + //[HttpPost] + //public object AddBill([FromBody] JObject oMain) + //{ + // var _value = oMain["oMain"].ToString(); + // string msg1 = _value.ToString(); + // try + // { + // //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲 + // msg1 = "[" + msg1.ToString() + "]"; + // List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1); + // string BillType = "3790"; + // long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + // string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + // int HBillStatus = 0; + // string HMaker = list[0].HMaker;//鍒跺崟浜� + // int HYear = 2021; + // double HPeriod = 1; + // string HRemark = list[0].HRemark;//澶囨敞 + // long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D + // string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗� + // int HProcPlanInterID = 0; + // int HProcPlanEntryID = 0; + // string HProcPlanBillNo = ""; + // int HProcExchInterID = 0; + // int HProcExchEntryID = 0; + // string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗� + // long HMaterID = list[0].HMaterID;//浜у搧ID + // long HProcID = list[0].HProcID;//褰撳墠宸ュ簭 + // double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲� + // double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲� + // long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID + // long HGroupID = list[0].HGroupID;//鐝粍ID + // long HDeptID = 0; + // long HEmpID = list[0].HEmpID;//鎺ユ敹浜篒D + // string HBarCode = list[0].HBarCode;//鏉″舰鐮� + // string HAddr = ""; + // string HBarCodeMaker = ""; + // long HSupID = 0; + // double HQty = list[0].HQty;//鎺ユ敹鏁伴噺 + // double HPrice = 0; + // double HMoney = 0; + // double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟 + // string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О + // long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID + // string HProcNo = list[0].HProcNo;//娴佹按鍙� + // string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� + // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + // oCN.BeginTran(); + // //涓昏〃 + // oCN.RunProc("Insert Into Sc_StationInBillMain " + + // "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + + // ",HYear,HPeriod,HRemark" + + // ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" + + // ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" + + // ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + + // ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" + + // ",HProcNo,HOrderProcNO" + + // ") " + + // " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + + // "," + HYear + "," + HPeriod + ",'" + HRemark + "'" + + // "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID + + // ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + + // "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + + // "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID + + // ",'" + HProcNo + "','" + HOrderProcNO + "'" + + // ") "); + // ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); + // if (ds == null) + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // if (ds.Tables[0].Rows.Count == 0) + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; + // objJsonResult.data = null; + // return objJsonResult; + // } + // if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + // objJsonResult.data = null; + // return objJsonResult; + // } + // oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1"); + // //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭 + // ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " + + // " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " + + // " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain"); + // if (ds1 == null || ds1.Tables[0].Rows.Count == 0) + // { + + // } + // else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�") + // { + + // } + // oCN.Commit(); + // objJsonResult.code = "1"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + // objJsonResult.data = ds.Tables[0]; + // return objJsonResult; + // } + // catch (Exception e) + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "Exception锛�" + e.ToString(); + // objJsonResult.data = null; + // return objJsonResult; + // } + //} + /// <summary> /// 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅 ///鍙傛暟锛歴tring sql銆� diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index 0b119b7..0f15e3f 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -85,7 +85,7 @@ double HMoney = 0; double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺 long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID - string HProcNo = list[0].HProcNo;//娴佹按鍙� + long HProcNo = list[0].HProcNo;//娴佹按鍙� string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟 long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D diff --git a/WebAPI/Controllers/PZGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/PZGL/QC_LastPieceCheckBillController.cs new file mode 100644 index 0000000..3e14f8b --- /dev/null +++ b/WebAPI/Controllers/PZGL/QC_LastPieceCheckBillController.cs @@ -0,0 +1,75 @@ +锘縰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 QC_LastPieceCheckBillController : 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("QC_LastPieceCheckBill/List")] + [HttpGet] + public object List(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("Select * from h_v_QC_LastPieceCheckBillList Where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ", "h_v_QC_LastPieceCheckBillList"); + } + else + { + string sql1 = "select * from h_v_QC_LastPieceCheckBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillList"); + } + 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; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll index 67c6846..9d15d15 100644 --- a/WebAPI/DLL/Model.dll +++ b/WebAPI/DLL/Model.dll Binary files differ diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs index cb61e50..0064bc6 100644 --- a/WebAPI/Models/StationBill.cs +++ b/WebAPI/Models/StationBill.cs @@ -33,7 +33,7 @@ public double HMoney { get; set; } public string HRemark { get; set; } public double HTaxRate { get; set; } - public string HProcNo { get; set; } + public long HProcNo { get; set; } public string HOrderProcNO { get; set; } public long HWWWorkOrderInterID { get; set; } public long HWWWorkOrderEntryID { get; set; } diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 226d062..f5dc625 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -12,7 +12,7 @@ <ItemGroup> <File Include="apiapp.json"> <publishTime>04/12/2021 11:33:15</publishTime> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -27,19 +27,19 @@ <publishTime>05/07/2021 20:31:20</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>05/06/2021 09:48:41</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>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>04/26/2020 09:57:16</publishTime> @@ -57,7 +57,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/20/2021 17:29:58</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -66,13 +66,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -138,7 +138,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>05/06/2021 09:48:41</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> @@ -171,10 +171,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>05/12/2021 09:04:46</publishTime> + <publishTime>05/20/2021 17:33:43</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>05/12/2021 09:04:46</publishTime> + <publishTime>05/20/2021 17:33:43</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -192,166 +192,166 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/20/2021 17:29:58</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Index.html"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="packages.config"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/21/2021 13:19:40</publishTime> </File> <File Include="PrecompiledApp.config"> <publishTime>05/07/2021 20:31:19</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>02/22/2021 09:25:20</publishTime> </File> <File Include="Web.config"> - <publishTime>05/12/2021 09:06:24</publishTime> + <publishTime>05/20/2021 17:34:04</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index dbd9b7c..d8a26fc 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -343,6 +343,7 @@ <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" /> + <Compile Include="Controllers\PZGL\QC_LastPieceCheckBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" /> <Compile Include="Controllers\LMESController.cs" /> -- Gitblit v1.9.1