From e9beac86f7a46e49452584d09a51fbd78b6f3fdc Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期二, 12 十月 2021 16:34:07 +0800 Subject: [PATCH] nothing --- WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 67 ++- .gitignore | 1 Model/生产管理/模具管理/ClsSc_MouldProdOutBillMain.cs | 1 WebAPI/Controllers/Pay_SingleBalBillController.cs | 143 +++--- WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 152 +++--- WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 66 ++ WebAPI/Controllers/Pay_OtherBalBillController.cs | 332 +++++++++++++++ WebAPI/WebAPI.csproj.user | 2 Model/工资管理/ClsPay_OtherBalBillSub.cs | 13 WebAPI/Models/Pay_OtherBalBill.cs | 74 +++ Model/生产管理/模具管理/ClsSc_MouldProdBackBillMain.cs | 1 WebAPI/Models/Pay_OtherBalBillSub.cs | 45 ++ WebAPI/Models/Pay_SingleBalBillSub.cs | 2 WebAPI/DLL/ClsSc_MouldProdBackBill.cs | 5 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 6 WebAPI/DLL/ClsSc_MouldProdOutBill.cs | 5 WebAPI/Models/ClsSc_MouldProdBillMain.cs | 5 WebAPI/DLL/ClsPay_OtherBalBill.cs | 289 +++++++++++++ WebAPI/WebAPI.csproj | 4 Pub_Class/CustomerCls/ClsPub.cs | 2 WebAPI/DLL/ClsSc_MouldProdInBill.cs | 19 21 files changed, 1,033 insertions(+), 201 deletions(-) diff --git a/.gitignore b/.gitignore index a5668fe..5459578 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ /LMES/obj/Release /LMES/obj/x86/Debug /MES/bin/x86/Debug +/MES/bin/Debug /MES/obj/Debug /MES/obj/Release /MES/obj/x86/Debug diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs" index 98c9116..117c582 100644 --- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs" +++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs" @@ -15,6 +15,9 @@ public double HQty;// decimal(18,8) --数量 public double HPrice;// decimal(18,8) --工价 public double HMoney;// decimal(18,8) --金额 + public Single HPriceRate;// money -- 定额浮动比率 + public Single HSubsidyTotal;// money -- 补贴合计 + public Single HDeuctTotal;// money -- 扣款小计 public Int64 HICMOInterID;// int --生产任务单ID public string HICMOBillNo;// varchar(50) --生产任务单号 public Int64 HProcReportInterID;// int --工序汇报单ID @@ -23,5 +26,15 @@ public Int64 HProcPlanInterID;// int --工序计划单ID public Int64 HProcPlanEntryID;// int --工序计划单子ID public string HProcPlanBillNo;// varchar(50) --工序计划单号 + public Int64 HSourceID; + public long HSubsidyID;// money -- 补贴合计 + public long HDeuctID;// money -- 扣款小计 + public double HPackQty;// dec(18,8) --包装数量 --addnew + public double HPackPrice;// dec(18,8) --包装单价 --addnew + public double HPackMoney;// dec(18,8) --包装金额 --addnew + public Int64 HPackMaterID;// int --包装类型 --addnew + public double HSubsidyQty; + public double HSubsidyMoney; + public double HSqty; } } diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs" index 35961b1..ed53605 100644 --- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs" +++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdBackBillMain.cs" @@ -7,6 +7,7 @@ public class ClsSc_MouldProdBackBillMain : DBUtility.ClsXt_BaseBillMain { public Int64 HSupID;// int --供应商 + public Int64 HSupTypeID;// int --往来类型 public Int64 HWHID;// int --仓库 public Int64 HSCWHID;// int --调出仓库 public Int64 HEmpID;// int --业务员 diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdOutBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdOutBillMain.cs" index 3e93e35..05579cb 100644 --- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdOutBillMain.cs" +++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldProdOutBillMain.cs" @@ -7,6 +7,7 @@ public class ClsSc_MouldProdOutBillMain : DBUtility.ClsXt_BaseBillMain { public Int64 HSupID;// int --供应商 + public Int64 HSupTypeID;// int --往来单位 public Int64 HWHID;// int --仓库 public Int64 HSCWHID;// int --调出仓库 public Int64 HEmpID;// int --业务员 diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs index 5739f2b..093a9b1 100644 --- a/Pub_Class/CustomerCls/ClsPub.cs +++ b/Pub_Class/CustomerCls/ClsPub.cs @@ -707,7 +707,7 @@ } - //鍒ゆ柇鏄兘瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇� + //鍒ゆ柇鏄惁瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇� public static bool Security_Log(string gnsy, int LogTF, bool Msg,string CurUserName) { //gnsy 鍔熻兘绱㈠紩,妯″潡 diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 05fabe2..97299d5 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -359,10 +359,18 @@ /// </summary> [Route("Gy_Mould/list1")] [HttpGet] - public object list1(string sWhere) + public object list1(string sWhere,string ModRightNameSelect, string user) { try { + if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList"); @@ -508,14 +516,27 @@ ///杩斿洖鍊硷細object銆� /// </summary> [Route("Gy_Mould_Edit/AddBill")] - [HttpPost] - public object AddBill([FromBody] JObject sMainSub) + [HttpGet] + public object AddBill([FromBody] JObject oMain) { - var _value = sMainSub["oMain"].ToString(); + var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString();//褰撳墠浜� + string msg4 = sArray[2].ToString();//妯″潡鏉冮檺 + oCN.BeginTran(); + if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } //淇濆瓨涓昏〃 - objJsonResult = AddBillMain(msg1); + objJsonResult = AddBillMain(msg2); if (objJsonResult.code == "0") { oCN.RollBack(); @@ -532,10 +553,8 @@ return objJsonResult; } - public json AddBillMain(string msg1) + public json AddBillMain(string msg2) { - string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); - string msg2 = sArray[0].ToString(); try { msg2 = "[" + msg2.ToString() + "]"; @@ -650,16 +669,25 @@ [HttpPost] public object AddBill1([FromBody] JObject oMain) { - + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString();//褰撳墠浜� + string msg4 = sArray[2].ToString();//妯″潡鏉冮檺 try { + if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } DAL.ClsGy_MouldFile oMould = new DAL.ClsGy_MouldFile(); DAL.ClsGy_MouldFileMain_View oDeptHlp = new DAL.ClsGy_MouldFileMain_View(); - var _value = oMain["oMain"].ToString(); - string msg1 = _value.ToString(); - string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); - string msg2 = sArray[0].ToString(); //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -814,12 +842,20 @@ /// </summary> [Route("Gy_Mould_Edit/Delete_Json")] [HttpGet] - public object Delete_Json(long hmainid) + public object Delete_Json(long hmainid, string ModRightNameDelete, string user) { DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile(); try { - if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo)) + if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo)) { //鍐欏叆鏃ュ織 ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName); diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs index dbb4ac5..1110345 100644 --- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs @@ -30,10 +30,18 @@ /// </summary> [Route("Gy_ModelType/list")] [HttpGet] - public object list(string sWhere) + public object list(string sWhere, string ModRightNameSelect, string user) { try { + if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere, "Gy_MouldType"); if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -120,14 +128,14 @@ try { - //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } if (oDeptHlp.GetInfoByID(HItemID)) { if (oDept.HavChildCodes(HItemID)) @@ -201,10 +209,15 @@ { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); - //鍙嶅簭鍒楀寲 - msg1 = "[" + msg1.ToString() + "]"; + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString();//褰撳墠浜� + string msg4 = sArray[2].ToString();//妯″潡鏉冮檺 - List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg1); + //鍙嶅簭鍒楀寲 + msg2 = "[" + msg2.ToString() + "]"; + + List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg2); string HNumber = list[0].HNumber; string HName = list[0].HName; @@ -216,6 +229,16 @@ bool HStopflag = list[0].HStopflag; string HUseFlag = list[0].HUseFlag; bool HEndFlag = list[0].HEndFlag; + + //鍒ゆ柇鏉冮檺 + if (!ClsPub.Security_Log(msg4, 1, true, msg3)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; + objJsonResult.data = null; + return objJsonResult; + } if (!DBUtility.ClsPub.AllowNumber(HNumber)) { @@ -275,8 +298,8 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - string msg4 = sArray[2].ToString(); - string msg5 = sArray[3].ToString(); + string msg4 = sArray[2].ToString();//褰撳墠浜� + string msg5 = sArray[3].ToString();//鏉冮檺妯″潡 //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -293,14 +316,14 @@ string HUseFlag = list[0].HUseFlag; //鍒ゆ柇鏉冮檺 - //if (!ClsPub.Security_Log(msg5, 1, true, msg4)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!ClsPub.Security_Log(msg5, 1, true, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; + objJsonResult.data = null; + return objJsonResult; + } if (!DBUtility.ClsPub.AllowNumber(HNumber)) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs index 63cac9f..b94c955 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs @@ -406,7 +406,8 @@ { ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec, 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, - 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark + 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName, + HSPID, 鏀舵枡浠撲綅浠g爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList"); objJsonResult.code = "0"; @@ -420,7 +421,8 @@ //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 "; string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec, 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, - 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark + 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName, + HSPID, 鏀舵枡浠撲綅浠g爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdInHouseBillList where 1=1"); string sql = sql1 + sqlWhere; ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList"); diff --git a/WebAPI/Controllers/Pay_OtherBalBillController.cs b/WebAPI/Controllers/Pay_OtherBalBillController.cs new file mode 100644 index 0000000..44e2217 --- /dev/null +++ b/WebAPI/Controllers/Pay_OtherBalBillController.cs @@ -0,0 +1,332 @@ +锘縰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 +{ + + public class Pay_OtherBalBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + public WebServer webserver = new WebServer(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //DataSet ds; + + + /// <summary> + /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Pay_OtherBalBill/GetOtherBalBill")] + [HttpGet] + public object GetOtherBalBill(string sWhere) + { + try + { + + ds = Sc_GetOtherBalBill(sWhere); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + public static DataSet Sc_GetOtherBalBill(string sWhere) + { + if (sWhere == null || sWhere.Equals("")) + { + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by 鏃ユ湡 desc", "h_v_Pay_OtherBalBillList"); + } + else + { + string sql1 = "select * from h_v_Pay_OtherBalBillList where 1 = 1 "; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; + return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_OtherBalBillList"); + } + + } + + #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] + [Route("Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail")] + [HttpGet] + public ApiResult<DataSet> Pay_OtherBalBillListCheckDetail(string HID) + { + if (string.IsNullOrEmpty(HID)) + return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" }; + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Pay_OtherBalBillList where hmainid= " + HID + " ", "h_v_Pay_OtherBalBillList"); + if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) + return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" }; + + return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet }; + } + #endregion + + #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁] + [Route("Pay_OtherBalBill/Pay_OtherBalBillListProjectDetai")] + [HttpGet] + public object Pay_OtherBalBillListProjectDetai(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + string sql1 = "SELECT 鐗╂枡ID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,HDeptID,閮ㄩ棬浠g爜,閮ㄩ棬" + + ", HGroupID, 鐝粍浠g爜, 鐝粍, 宸ヨ祫绫诲瀷, 鎽樿, 鍐呴儴鍗曟嵁鍙�, 琛ㄥご澶囨敞" + + ", 宸ュ簭ID, 宸ュ簭浠g爜, 宸ュ簭鍚嶇О" + + ", 鑱屽憳ID, 鑱屽憳浠g爜, 鑱屽憳, 宸ユ椂, 鏁伴噺, 宸ヤ环, 閲戦 FROM h_v_Pay_OtherBalBillList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_Pay_OtherBalBillList"); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + } + return objJsonResult; + } + #endregion + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Pay_OtherBalBill/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<Pay_OtherBalBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_OtherBalBill>>(msg2); + string HBillType = "2206"; + 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 HBillSubType = mainList[0].HBillSubType; + string HMaker = mainList[0].HMaker; + string HExplanation = mainList[0].HExplanation; + string HInnerBillNo = mainList[0].HInnerBillNo; + long HMaterID = mainList[0].HMaterID;//浜у搧ID + long HGroupID = mainList[0].HGroupID; + long HDeptID = mainList[0].HDeptID; + long HProcID = mainList[0].HProcID; + long HEmpID = mainList[0].HEmpID; + long HPayType = mainList[0].HPayType; + //long HMaterTypeID = 0; + int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐 + + //涓昏〃 + oCN.RunProc("Insert Into Pay_OtherBalBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + + ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" + + ") " + + " values('" + HBillType + "'," + HBillSubType + ",'" + HInterID + "','" + HBillNo + "','" + HDate + "'" + + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HGroupID + "," + HDeptID + "," + HEmpID + ","+ + "," + HPayType + "," + HExplanation + ",'" + HInnerBillNo + "'," + + ") "); + + //淇濆瓨瀛愯〃 + objJsonResult = AddBillSub(msg3, HInterID); + if (objJsonResult.code == "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = 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<Pay_OtherBalBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_OtherBalBillSub>>(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; + //} + + string HCloseMan = "";//鍏抽棴浜� + bool HCloseType = false;// + string HEntryCloseDate = "";//鏃堕棿鍗曚綅 + long HSourceInterID = 0;//婧愬崟涓诲唴鐮� + long HSourceEntryID = 0;//婧愬崟瀛愬唴鐮� + string HSourceBillNo = "";//婧愬崟鍗曞彿 + string HSourceBillType = "";//婧愬崟绫诲瀷 + double HRelationQty = 0;//鍏宠仈鏁伴噺 + double HRelationMoney = 0;//鍏宠仈閲戦 + decimal HTimes = 0; + decimal HQty = 0; + decimal HPrice = 0; + decimal HMoney = 0; + long HICMOInterID = 0; + string HICMOBillNo = ""; + long HProcID_S = 0;//宸ユID + long HMaterID_S = 0; + long HEmpID_S = 0; + long HSourceID_S = 0; + long HProcReportInterID = 0; + long HProcReportEntryID = 0; + long HProcPlanInterID = 0; + long HProcPlanEntryID = 0; + string HProcReportBillNo = ""; + string HProcPlanBillNo = ""; + decimal HPriceRate = 0; + decimal HSubsidyTotal = 0; + decimal HDeuctTotal = 0; + decimal HPackQty = 0; + decimal HPackPrice = 0; + decimal HPackMoney = 0; + long HPackMaterID = 0; + decimal HSubsidyQty = 0; + decimal HSubsidyMoney = 0; + + oCN.RunProc("Insert into Pay_OtherBalBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID_S,HProcID_S,HEmpID_S,HSourceID_S,HTimes,HQty,HPrice," + + ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" + + ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" + + ",HPriceRate,HSubsidyTotal,HDeuctTotal" + + ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" + + ") values(" + + HInterID + "," + i + "," + subList[i].HEntryID + ",'" + HCloseMan + "'" + + "," + HEntryCloseDate + "," + Convert.ToString(HCloseType ? 1 : 0) + + ",'" + subList[i].HRemark + "'," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty + "," + HRelationMoney + "," + + "," + HProcID_S + "," + HMaterID_S + "," + HEmpID_S + ", " + HSourceID_S + ",'" + HTimes + "','" + HQty + "'" + + ",'" + HPrice + "','" + HMoney + "','" + HICMOInterID + "'," + HICMOBillNo + "," + HProcReportInterID + "," + HProcReportEntryID + "," + + "," + HProcReportBillNo + "," + HProcPlanInterID + ",'" + HProcPlanEntryID + "','" + HProcPlanBillNo + "'," + HPriceRate + "," + HSubsidyTotal + "," + + "," + HDeuctTotal + ",'" + HPackQty + "'," + HPackPrice + "," + HPackMoney + "," + HPackMaterID + "," + HSubsidyQty + "," + HSubsidyMoney + "," + + ") "); + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = null; + objJsonResult.data = null; + return objJsonResult; + } + + /// <summary> + ///宸ヨ祫缁撶畻鍏朵粬鍗曞垹闄ゅ姛鑳� + /// </summary> + /// <returns></returns> + [Route("Pay_OtherBalBill/DeltetOtherBalBill")] + [HttpGet] + public object Pay_OtherBalBill(string HInterID) + { + try + { + oCN.BeginTran(); + oCN.RunProc("Delete From Pay_OtherBalBillMain where HInterID = " + HInterID); + oCN.RunProc("Delete From Pay_OtherBalBillSub where HInterID = " + HInterID); + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + 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/Controllers/Pay_SingleBalBillController.cs b/WebAPI/Controllers/Pay_SingleBalBillController.cs index 206cecf..9a209c8 100644 --- a/WebAPI/Controllers/Pay_SingleBalBillController.cs +++ b/WebAPI/Controllers/Pay_SingleBalBillController.cs @@ -27,48 +27,45 @@ ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Pay_SingleBalBill/list")] + [Route("Pay_SingleBalBill/GetSingleBalBill")] [HttpGet] - public object list(string sWhere) + public object GetSingleBalBill(string sWhere) { try { - if (sWhere == null || sWhere.Equals("")) - { - ds = oCN.RunProcReturn("select * from h_v_Pay_SingleBalBillList " + sWhere, "h_v_Pay_SingleBalBillList"); - } - else - { - string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 "; - string sql = sql1 + sWhere; - ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList"); - } - 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; - } + + ds = Sc_GetSingleBalBill(sWhere); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } - catch (Exception e) + catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } + + public static DataSet Sc_GetSingleBalBill(string sWhere) + { + if (sWhere == null || sWhere.Equals("")) + { + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by 鏃ユ湡 desc", "h_v_Pay_SingleBalBillList"); + } + else + { + string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 "; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; + return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList"); + } + + } + #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] [Route("Pay_SingleBalBill/Pay_SingleBalBillListCheckDetail")] [HttpGet] @@ -95,34 +92,16 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - if (sqlWhere == null || sqlWhere.Equals("")) - { - ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID 鐗╂枡浠g爜,鐗╂枡鍚嶇О, HDeptID 閮ㄩ棬浠g爜,閮ㄩ棬,HGroupID 鐝粍浠g爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�, - 琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID 宸ュ簭浠g爜,宸ュ簭鍚嶇О, - HEmpID 鑱屽憳浠g爜,鑱屽憳,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 - FROM h_v_Pay_SingleBalBillList"), "h_v_Pay_SingleBalBillList"); - - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; - } - else - { - - //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 "; - string sql1 = string.Format(@"SELECT HMaterID 鐗╂枡浠g爜,鐗╂枡鍚嶇О, HDeptID 閮ㄩ棬浠g爜,閮ㄩ棬,HGroupID 鐝粍浠g爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�, - 琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡,瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID 宸ュ簭浠g爜,宸ュ簭鍚嶇О, - HEmpID 鑱屽憳浠g爜,鑱屽憳,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 - FROM h_v_Pay_SingleBalBillList where 1 = 1 "); - string sql = sql1 + sqlWhere; - ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList"); - - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; - } + string sql1 = "SELECT HMaterID,鐗╂枡浠g爜,鐗╂枡鍚嶇О, HDeptID,閮ㄩ棬浠g爜,閮ㄩ棬" + + ",HGroupID,鐝粍浠g爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" + + ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,宸ュ簭浠g爜,宸ュ簭鍚嶇О" + + ",HEmpID,鑱屽憳浠g爜,鑱屽憳,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 FROM h_v_Pay_SingleBalBillList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList"); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; } catch (Exception e) { @@ -195,15 +174,14 @@ int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐 //涓昏〃 - oCN.RunProc("Insert Into Pay_SingleBalBillMain " + - "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + - ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + - ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" + - ") " + - " values('" + HBillType + "'," + HBillSubType + ",'" + HInterID + "','" + HBillNo + "','" + HDate + "'" + - "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HGroupID + "," + HDeptID + "," + HEmpID + ","+ - "," + HPayType + "," + HExplanation + ",'" + HInnerBillNo + "'," + - ") "); + oCN.RunProc(" Insert Into Pay_SingleBalBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + + ",HYear,HPeriod,HRemark,HMaker" + + ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" + ")" + + "values('" + HBillType + "'" + HBillSubType + "," + HInterID + ",'" + HBillNo + "','" + HDate + + "',"+ HDeptID + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "'," + HGroupID + + "," + HEmpID + ","+ HPayType +",'" + HInnerBillNo + "'" + HExplanation + + ") "); //淇濆瓨瀛愯〃 objJsonResult = AddBillSub(msg3, HInterID); @@ -316,7 +294,36 @@ objJsonResult.data = null; return objJsonResult; } - + /// <summary> + ///宸ヨ祫缁撶畻涓汉鍗曞垹闄ゅ姛鑳� + /// </summary> + /// <returns></returns> + [Route("Pay_SingleBalBill/DeltetSingleBalBill")] + [HttpGet] + public object Pay_SingleBalBill(string HInterID) + { + try + { + oCN.BeginTran(); + oCN.RunProc("Delete From Pay_SingleBalBillMain where HInterID = " + HInterID); + oCN.RunProc("Delete From Pay_SingleBalBillSub where HInterID = " + HInterID); + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + 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/ClsPay_OtherBalBill.cs b/WebAPI/DLL/ClsPay_OtherBalBill.cs new file mode 100644 index 0000000..be97614 --- /dev/null +++ b/WebAPI/DLL/ClsPay_OtherBalBill.cs @@ -0,0 +1,289 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace DAL +{ + public class ClsPay_OtherBalBill : DBUtility.ClsXt_BaseBill + { + public Model.ClsPay_OtherBalBillMain omodel = new Model.ClsPay_OtherBalBillMain(); + public List<Model.ClsPay_OtherBalBillSub> DetailColl = new List<Model.ClsPay_OtherBalBillSub>(); + + public ClsPay_OtherBalBill() + { + base.MvarItemKeySub = "Pay_OtherBalBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey = "Pay_OtherBalBillMain"; + base.MvarReportTitle = "宸ヨ祫缁撶畻鍗曪紙鍏朵粬锛�"; + base.BillType = "2206"; + base.HBillSubType = "2206"; + + } + + #region 鍥哄畾浠g爜 + + ~ClsPay_OtherBalBill() + { + DetailColl = null; + } + + #endregion 鑷畾涔夋柟娉� + //淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + // + oCn.BeginTran(); + //鏇存柊涓昏〃 + oCn.RunProc("UpDate Pay_OtherBalBillMain set " + + " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��=============== + ",HDate='" + omodel.HDate + "'" + + ",HYear='" + omodel.HYear.ToString() + "'" + + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + + ",HRemark='" + omodel.HRemark + "'" + + ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" + + ",HUpDateDate=getdate()" + + //======================================== + ",HGroupID=" + omodel.HGroupID.ToString() + + ",HDeptID=" + omodel.HDeptID.ToString() + + ",HEmpID=" + omodel.HEmpID.ToString() + + ",HPayType=" + omodel.HPayType.ToString() + + ",HExplanation='" + omodel.HExplanation + "'" + + ",HInnerBillNo='" + omodel.HInnerBillNo + "'" + + " where HInterID=" + lngBillKey.ToString()); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsPay_OtherBalBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Pay_OtherBalBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" + + ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" + + ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" + + ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" + + ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HSourceID.ToString() + + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSqty.ToString() + + "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" + + "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" + + "," + oSub.HPriceRate.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyID.ToString() + "," + oSub.HDeuctID.ToString() + + "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() + + ") "); + } + // + //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl) + //{ + // Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, ""); + // if (Ds.Tables[0].Rows.Count == 0) + // return; + // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") + // { + // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨"; + // return false; + // } + //} + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + //寰楀埌mainid + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + oCn.BeginTran(); + //涓昏〃 + oCn.RunProc("Insert Into Pay_OtherBalBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HSaveFlag" + + ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" + + ") " + + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + + ", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" + + ") "); + //鎻掑叆瀛愯〃 + foreach (Model.ClsPay_OtherBalBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Pay_OtherBalBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" + + ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" + + ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" + + ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" + + ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HSourceID.ToString() + + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSqty.ToString() + + "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" + + "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" + + "," + oSub.HPriceRate.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyID.ToString() + "," + oSub.HDeuctID.ToString() + + "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() + + ") "); + } + // + //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl) + //{ + // Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, ""); + // if (Ds.Tables[0].Rows.Count == 0) + // return; + // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") + // { + // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨"; + // return false; + // } + //} + // + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds; + Ds = oCn.RunProcReturn("Select * from Pay_OtherBalBillMain Where HInterID=" + lngBillKey.ToString(), "Pay_OtherBalBillMain"); + if (Ds.Tables[0].Rows.Count == 0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + //鍥哄畾璧嬪��=========================================== + omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]); + omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]); + omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]); + omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]); + omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]); + omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]); + omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim(); + omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]); + omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]); + omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]); + omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim(); + omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim(); + omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim(); + omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim(); + omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); + omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim(); + omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim(); + omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim(); + omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim(); + omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim(); + omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim(); + omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]); + omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim(); + omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim(); + //======================================================== + omodel.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"]); + omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]); + omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]); + omodel.HPayType = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPayType"]); + omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]); + omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]); + // + + //寰幆 + DataSet DsSub; + DsSub = oCn.RunProcReturn("Select * from Pay_OtherBalBillSub Where HInterID=" + lngBillKey.ToString() + "order by HEntryID", "Pay_OtherBalBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsPay_OtherBalBillSub oSub = new Model.ClsPay_OtherBalBillSub(); + // 鍥哄畾璧嬪��=============================================== + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]); + oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]); + oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]); + oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]); + oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim(); + //=================================================== + oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]); + oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]); + oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]); + oSub.HEmpID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEmpID"]); + oSub.HTimes = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTimes"]); + oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]); + oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]); + + oSub.HPriceRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPriceRate"]); + oSub.HSubsidyTotal = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSubsidyTotal"]); + oSub.HDeuctTotal = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HDeuctTotal"]); + // + oSub.HSubsidyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSubsidyID"]); + oSub.HDeuctID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HDeuctID"]); + + oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]); + oSub.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]); + oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]); + oSub.HProcReportInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcReportInterID"]); + oSub.HProcReportEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcReportEntryID"]); + oSub.HProcReportBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcReportBillNo"]); + oSub.HProcPlanInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanInterID"]); + oSub.HProcPlanEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanEntryID"]); + oSub.HProcPlanBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcPlanBillNo"]); + + oSub.HPackQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPackQty"]); + oSub.HPackPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPackPrice"]); + oSub.HPackMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPackMoney"]); + oSub.HPackMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPackMaterID"]); + oSub.HSubsidyQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSubsidyQty"]); + oSub.HSubsidyMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSubsidyMoney"]); + oSub.HSqty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSqty"]); + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + + + } + +} diff --git a/WebAPI/DLL/ClsSc_MouldProdBackBill.cs b/WebAPI/DLL/ClsSc_MouldProdBackBill.cs index d79bd49..0c8e718 100644 --- a/WebAPI/DLL/ClsSc_MouldProdBackBill.cs +++ b/WebAPI/DLL/ClsSc_MouldProdBackBill.cs @@ -49,6 +49,7 @@ ",HUpDateDate=getdate()" + //======================================== ",HSupID=" + omodel.HSupID.ToString() + + ",HSupTypeID=" + omodel.HSupTypeID.ToString() + ",HWHID=" + omodel.HWHID.ToString() + ",HSCWHID=" + omodel.HSCWHID.ToString() + ",HEmpID=" + omodel.HEmpID.ToString() + @@ -129,12 +130,12 @@ oCn.RunProc("Insert Into Sc_MouldStockBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + - ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + + ",HSupTypeID,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker+ "',getdate()" + - ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + + ", " + omodel.HSupTypeID.ToString() + "," + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + ") "); diff --git a/WebAPI/DLL/ClsSc_MouldProdInBill.cs b/WebAPI/DLL/ClsSc_MouldProdInBill.cs index c6d4569..d3c3b3b 100644 --- a/WebAPI/DLL/ClsSc_MouldProdInBill.cs +++ b/WebAPI/DLL/ClsSc_MouldProdInBill.cs @@ -41,24 +41,24 @@ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� oCn.BeginTran(); - - //涓昏〃 - oCn.RunProc("Insert Into Sc_MouldStockBillMain " + + string sql = "Insert Into Sc_MouldStockBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + - ",HRemark,HMaker,HMakeDate,HYear, HPeriod"+ - ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + + ",HRemark,HMaker,HMakeDate" + /*"HYear, HPeriod,"*/ + ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + - ", '" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + - ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + + ", '" + omodel.HRemark.ToString() + "','" + omodel.HMaker + "',getdate()" + /*omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" +*/ + ", " + omodel.HSupID.ToString() + ", " + omodel.HSupTypeID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + - ") "); + ") "; + //涓昏〃 + oCn.RunProc(sql); //鎻掑叆瀛愯〃 foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl) { - + oCn.RunProc("Insert into Sc_MouldStockBillSub " + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + @@ -121,6 +121,7 @@ ",HUpDateDate=getdate()" + //======================================== ",HSupID=" + omodel.HSupID.ToString() + + ",HSupTypeID=" + omodel.HSupTypeID.ToString() + ",HWHID=" + omodel.HWHID.ToString() + ",HSCWHID=" + omodel.HSCWHID.ToString() + ",HEmpID=" + omodel.HEmpID.ToString() + diff --git a/WebAPI/DLL/ClsSc_MouldProdOutBill.cs b/WebAPI/DLL/ClsSc_MouldProdOutBill.cs index c1f6b70..5785e6a 100644 --- a/WebAPI/DLL/ClsSc_MouldProdOutBill.cs +++ b/WebAPI/DLL/ClsSc_MouldProdOutBill.cs @@ -49,6 +49,7 @@ ",HUpDateDate=getdate()" + //======================================== ",HSupID=" + omodel.HSupID.ToString() + + ",HSupTypeID=" + omodel.HSupTypeID.ToString() + ",HWHID=" + omodel.HWHID.ToString() + ",HSCWHID=" + omodel.HSCWHID.ToString() + ",HEmpID=" + omodel.HEmpID.ToString() + @@ -122,13 +123,13 @@ oCn.RunProc("Insert Into Sc_MouldStockBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + - ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + + ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + ",HProcID"+ ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + - ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + + ", " + omodel.HSupID.ToString() + ", " + omodel.HSupTypeID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "," + '0' + ") "); diff --git a/WebAPI/Models/ClsSc_MouldProdBillMain.cs b/WebAPI/Models/ClsSc_MouldProdBillMain.cs index c0cb484..962dbfc 100644 --- a/WebAPI/Models/ClsSc_MouldProdBillMain.cs +++ b/WebAPI/Models/ClsSc_MouldProdBillMain.cs @@ -7,8 +7,8 @@ { public class ClsSc_MouldProdBillMain : DBUtility.ClsXt_BaseBillMain { - public Int64 HSupID;// int --渚涘簲鍟� - public Int64 HWHID;// int --浠撳簱 + public Int64 HSupID;// int --1 渚涘簲鍟嗐��2 瀹㈡埛銆� 3 杞﹂棿閮ㄩ棬 + public Int64 HWHID = 0;// int --浠撳簱 public Int64 HSCWHID;// int --璋冨嚭浠撳簱 public Int64 HEmpID;// int --涓氬姟鍛� public Int64 HManagerID;// int --璐熻矗浜� @@ -19,5 +19,6 @@ public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙� public string HRemark; //鍔犲伐瑕佹眰 public bool HRedBlueFlag;// bit --绾㈣摑鍗� + public Int64 HSupTypeID;// bit --寰�鏉ョ被鍨� } } \ No newline at end of file diff --git a/WebAPI/Models/Pay_OtherBalBill.cs b/WebAPI/Models/Pay_OtherBalBill.cs new file mode 100644 index 0000000..00374fe --- /dev/null +++ b/WebAPI/Models/Pay_OtherBalBill.cs @@ -0,0 +1,74 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class Pay_OtherBalBill + { + public long HInterID { get; set; } + public long HEntryID { get; set; } + public long HPeriod { get; set; } + public string HBillType { get; set; } + public string HBillSubType { get; set; } + + public DateTime HDate { get; set; } + public string HBillNo { get; set; } + public long HBillStatus { get; set; } + public long HCheckItemNowID { get; set; } + public long HCheckItemNextID { get; set; } + public long HCheckFlowID { get; set; } + public string HRemark { get; set; } + public string HExplanation { get; set; } + public string HInnerBillNo { get; set; } + public string HBacker { get; set; } + public DateTime HBackDate { get; set; } + public string HChecker { get; set; } + public DateTime HCheckDate { get; set; } + public string HMaker { get; set; } + public DateTime HMakeDate { get; set; } + public string HUpDater { get; set; } + public DateTime HUpDateDate { get; set; } + public string HCloseMan { get; set; } + public DateTime HCloseDate { get; set; } + public string HDeleteMan { get; set; } + public DateTime HDeleteDate { get; set; } + public string HCloseType { get; set; } + public long HGroupID { get; set; } + public long HDeptID { get; set; } + public long HMaterID { get; set; } + public long HProcID { get; set; } + public long HSourceInterID { get; set; } + public long HSourceEntryID { get; set; } + public long HEmpID { get; set; } + public long HPayType { get; set; } + public string HSourceBillNo { get; set; } + public string HSourceBillType { get; set; } + public decimal HTimes { get; set; } + public decimal HRelationQty { get; set; } + public decimal HRelationMoney { get; set; } + public decimal HQty { get; set; } + public decimal HPrice { get; set; } + public decimal HPackQty { get; set; } + public decimal HPackPrice { get; set; } + public decimal HPackMoney { get; set; } + public long HPackMaterID { get; set; } + public decimal HPriceRate { get; set; } + public decimal HSubsidyTotal { get; set; } + public decimal HDeuctTotal { get; set; } + public decimal HSubsidyQty { get; set; } + public decimal HSubsidyMoney { get; set; } + public decimal HMoney { get; set; } + public long HICMOInterID { get; set; } + public string HICMOBillNo { get; set; } + public long HProcReportInterID { get; set; } + public long HProcReportEntryID { get; set; } + public long HProcPlanInterID { get; set; } + public long HProcPlanEntryID { get; set; } + public string HProcReportBillNo { get; set; } + public string HProcPlanBillNo { get; set; } + public int HPRDORGID { get; set; } + + } +} \ No newline at end of file diff --git a/WebAPI/Models/Pay_OtherBalBillSub.cs b/WebAPI/Models/Pay_OtherBalBillSub.cs new file mode 100644 index 0000000..70bab04 --- /dev/null +++ b/WebAPI/Models/Pay_OtherBalBillSub.cs @@ -0,0 +1,45 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class Pay_SingleBalBillSub + { + public long HEntryID { get; set; } + public long HMaterID { get; set; } + public string HRemark { get; set; } + public long HProcID { get; set; } + public long HSourceInterID { get; set; } + public long HSourceEntryID { get; set; } + public long HEmpID { get; set; } + public long HPayType { get; set; } + public string HSourceBillNo { get; set; } + public string HSourceBillType { get; set; } + public decimal HTimes { get; set; } + public decimal HRelationQty { get; set; } + public decimal HRelationMoney { get; set; } + public decimal HQty { get; set; } + public decimal HPrice { get; set; } + public decimal HPackQty { get; set; } + public decimal HPackPrice { get; set; } + public decimal HPackMoney { get; set; } + public long HPackMaterID { get; set; } + public decimal HPriceRate { get; set; } + public decimal HSubsidyTotal { get; set; } + public decimal HDeuctTotal { get; set; } + public decimal HSubsidyQty { get; set; } + public decimal HSubsidyMoney { get; set; } + public decimal HMoney { get; set; } + public long HICMOInterID { get; set; } + public string HICMOBillNo { get; set; } + public long HProcReportInterID { get; set; } + public long HProcReportEntryID { get; set; } + public long HProcPlanInterID { get; set; } + public long HProcPlanEntryID { get; set; } + public string HProcReportBillNo { get; set; } + public string HProcPlanBillNo { get; set; } + + } +} \ No newline at end of file diff --git a/WebAPI/Models/Pay_SingleBalBillSub.cs b/WebAPI/Models/Pay_SingleBalBillSub.cs index 70bab04..ff2246e 100644 --- a/WebAPI/Models/Pay_SingleBalBillSub.cs +++ b/WebAPI/Models/Pay_SingleBalBillSub.cs @@ -5,7 +5,7 @@ namespace WebAPI.Models { - public class Pay_SingleBalBillSub + public class Pay_OtherBalBillSub { public long HEntryID { get; set; } public long HMaterID { get; set; } diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 2eb49e4..cfcd449 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,11 +5,11 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-10-11T11:33:53.4844277Z;True|2021-10-11T19:29:12.1879435+08:00;True|2021-10-11T19:19:49.7174750+08:00;True|2021-10-11T19:10:55.0562613+08:00;True|2021-10-11T18:46:03.8177522+08:00;True|2021-10-11T18:41:20.7781616+08:00;True|2021-10-11T18:40:26.0210797+08:00;True|2021-10-11T18:20:12.7302833+08:00;False|2021-10-11T18:19:18.2409458+08:00;True|2021-10-11T17:05:18.2414168+08:00;True|2021-10-11T16:52:58.0880311+08:00;True|2021-10-11T16:47:08.2301760+08:00;True|2021-10-11T15:40:43.7377585+08:00;True|2021-10-11T15:25:21.4986191+08:00;True|2021-10-10T21:04:15.5330090+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> + <History>True|2021-10-11T08:59:07.3568342Z;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -18,31 +18,31 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>10/12/2021 16:27:08</publishTime> + <publishTime>10/12/2021 14:40:22</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>10/12/2021 16:27:08</publishTime> + <publishTime>10/12/2021 14:40:22</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>10/12/2021 16:27:07</publishTime> + <publishTime>10/12/2021 14:40:20</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>10/12/2021 16:27:07</publishTime> + <publishTime>10/12/2021 14:40:20</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>10/12/2021 16:27:05</publishTime> + <publishTime>10/12/2021 09:01:59</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>10/12/2021 16:27:05</publishTime> + <publishTime>10/12/2021 09:01:59</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/09/2021 09:06:25</publishTime> + <publishTime>10/11/2021 09:26:35</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -60,34 +60,34 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>10/12/2021 16:27:06</publishTime> + <publishTime>10/12/2021 14:40:17</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>10/12/2021 16:27:06</publishTime> + <publishTime>10/12/2021 14:40:17</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:57</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:57</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:58</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:58</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:58</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>10/12/2021 16:27:04</publishTime> + <publishTime>10/12/2021 09:01:58</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -156,7 +156,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -189,181 +189,181 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>10/12/2021 16:27:10</publishTime> + <publishTime>10/12/2021 14:38:15</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>10/12/2021 16:27:10</publishTime> + <publishTime>10/12/2021 14:38:15</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> - <publishTime>11/29/2018 13:26:02</publishTime> + <publishTime>11/29/2018 21:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> - <publishTime>11/29/2018 13:26:30</publishTime> + <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:37</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:37</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:37</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Global.asax"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Index.html"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="packages.config"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/web.config"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>08/09/2021 09:06:27</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>08/10/2021 08:30:51</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>08/10/2021 08:30:52</publishTime> + <publishTime>10/11/2021 09:26:38</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> - <publishTime>10/12/2021 16:27:16</publishTime> + <publishTime>10/11/2021 09:31:00</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index e8b60da..3057874 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -332,6 +332,7 @@ <Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" /> <Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" /> <Compile Include="Controllers\Open_PrintTemController.cs" /> + <Compile Include="Controllers\Pay_OtherBalBillController.cs" /> <Compile Include="Controllers\Pay_SingleBalBillController.cs" /> <Compile Include="Controllers\ProductionOrderController.cs" /> <Compile Include="Controllers\PublicPageMethodController.cs" /> @@ -400,6 +401,7 @@ <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" /> <Compile Include="DLL\ClsPay_SingleBalBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" /> + <Compile Include="DLL\ClsPay_OtherBalBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdInBill.cs" /> <Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" /> @@ -434,7 +436,9 @@ <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" /> <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" /> <Compile Include="Models\ClsGy_ProcPrice.cs" /> + <Compile Include="Models\Pay_OtherBalBill.cs" /> <Compile Include="Models\Pay_SingleBalBill.cs" /> + <Compile Include="Models\Pay_OtherBalBillSub.cs" /> <Compile Include="Models\Pay_SingleBalBillSub.cs" /> <Compile Include="Models\Xt_ORGANIZATIONS.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 16d95e2..038673c 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> - <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> -- Gitblit v1.9.1