From 34c78336cae81c8592405b2644da35e9ac91fdca Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 29 十一月 2022 11:25:18 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Properties/Settings.settings | 2 WebAPI/Web References/WebS/WebService1.wsdl | 165 ++- WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 256 ++-- WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 179 ++- WebAPI/Controllers/条码管理/WEBSController.cs | 510 +++++++++- WebAPI/WebAPI.csproj.user | 2 WebAPI/Controllers/ProductInController.cs | 7 WebAPI/Controllers/MateOutController.cs | 41 WebAPI/Controllers/OtherOutBillController.cs | 37 WebAPI/Web References/WebS/Reference.cs | 306 +++++- WebAPI/Web.config | 14 WebAPI/Models/ClsGy_Material_Model.cs | 2 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 2 WebAPI/Properties/Settings.Designer.cs | 4 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 16 WebAPI/packages.config | 1 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2 WebAPI/Web References/WebS/Reference.map | 4 WebAPI/Controllers/POStockInBillController.cs | 770 ++++++++++++++++- WebAPI/Controllers/PublicPageMethodController.cs | 41 WebAPI/Web References/WebS/WebService1.disco | 6 WebAPI/Controllers/MoveStockBillController.cs | 4 WebAPI/Controllers/Sc_ProcessMangementController.cs | 194 ++++ WebAPI/WebAPI.csproj | 7 WebAPI/DLL/ClsGy_Material_Ctl.cs | 43 25 files changed, 2,144 insertions(+), 471 deletions(-) diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs index e772018..b56d9e9 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs @@ -512,6 +512,14 @@ { omodel.Kf_OtherOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_FIFOList") + { + omodel.Kf_OtherOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_FIFOCtl") + { + omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //其他出库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl") { @@ -1847,6 +1855,14 @@ { omodel.Kf_OtherOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_FIFOList") + { + omodel.Kf_OtherOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_FIFOCtl") + { + omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //其他出库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl") { diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs index 774a779..fea6760 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs @@ -130,6 +130,8 @@ public string Kf_OtherOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) public string Kf_OtherOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) public string Kf_OtherOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_OtherOutBill_FIFOList; //先进先出下架清单 + public string Kf_OtherOutBill_FIFOCtl; //先进先出控制 //其他出库 校验 public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制 public string Kf_OtherOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位 diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 8c07c4e..1592ae8 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -1,6 +1,7 @@ 锘縰sing Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; +using RestSharp; using System; using System.Collections; using System.Collections.Generic; @@ -59,7 +60,7 @@ /// </summary> [Route("Gy_Material/list")] [HttpGet] - public object list(string sWhere,string user, string Organization) + public object list(string sWhere, string user, string Organization) { try { @@ -159,7 +160,7 @@ HItemID = maxid; } ListModels oListModels = new ListModels(); - + try { DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl(); @@ -193,32 +194,22 @@ objJsonResult.data = 1; return objJsonResult; } - if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim())) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒"; - objJsonResult.data = 1; - return objJsonResult; - } + //if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim())) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒"; + // objJsonResult.data = 1; + // return objJsonResult; + //} //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮� ds = oCN.RunProcReturn("select * from Gy_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material"); - if (oItem.HNumber.Trim() == "") - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒"; - objJsonResult.data = 1; - return objJsonResult; - } //鏂板鏃跺垽鏂� + #region 鐖剁骇鏍¢獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級 + /* if (oItem.HItemID == 0) { - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - - } - else + if (ds == null || ds.Tables[0].Rows.Count > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -274,6 +265,8 @@ } } } + */ + #endregion //寰楀埌鐭唬鐮� string sShortNumber; sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim()); @@ -291,13 +284,12 @@ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇 oBill.oModel = oItem; } - //淇濆瓨 //淇濆瓨瀹屾瘯鍚庡鐞� bool bResult; if (oBill.oModel.HItemID == 0) { - // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + //bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddNew(); } else @@ -306,7 +298,7 @@ } if (bResult) { - objJsonResult.code = "0"; + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); @@ -332,7 +324,52 @@ } } - + [Route("Gy_Material/SaveGy_MaterialListApi")] + [HttpPost] + public object SaveGy_MaterialListApi([FromBody] JObject msg) + { + var _value = msg["msg"].ToString(); + string msg3 = _value.ToString(); + string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg1 = sArray[0].ToString(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + ListModels oListModels = new ListModels(); + try + { + DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl(); + List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>(); + msg1 = msg1.Replace("\\", ""); + msg1 = msg1.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Gy_Material(msg1); + oBill.oModel = lsmain[0]; + //淇濆瓨 + bool bResult = oBill.AddNewApi(); + if (bResult) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = 1; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } /// <summary> /// 鐗╂枡璁剧疆鍒犻櫎鍔熻兘 @@ -340,11 +377,21 @@ /// <returns></returns> [Route("Gy_Material/Delete")] [HttpGet] - public object DeltetGy_Material(string HItemID,string user) + public object DeltetGy_Material(string HItemID, string user) { DataSet ds; try { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (user == "10000")//api鍚屾鏂瑰紡 + { + oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; ; + } //鍒犻櫎鏉冮檺 if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user)) { @@ -354,8 +401,6 @@ objJsonResult.data = null; return objJsonResult; } - - SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (string.IsNullOrWhiteSpace(HItemID)) { objJsonResult.code = "0"; @@ -521,7 +566,7 @@ /// </summary> [Route("Gy_BarCodeBillList/GetBarCodeBillList")] [HttpGet] - public object GetBarCodeBillList(string sWhere,string user) + public object GetBarCodeBillList(string sWhere, string user) { try { @@ -608,8 +653,8 @@ Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList"); if (Ds.Tables[0].Rows.Count != 0) { - oCN.BeginTran(); - oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString()); + oCN.BeginTran(); + oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString()); oCN.Commit(); objJsonResult.code = "1"; @@ -638,7 +683,7 @@ objJsonResult.data = null; return objJsonResult; } - + } #endregion @@ -736,8 +781,8 @@ string HMouldOWNER = mainList[0].HMouldOWNER; string HSaveLife = mainList[0].HSaveLife; int HCaveQty = mainList[0].HCaveQty; - int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID; - int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID; + int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID; + int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID; int HNowSupID = mainList[0].HNowSupID; int HNowSupTypeID = mainList[0].HNowSupTypeID; @@ -761,9 +806,9 @@ ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" + "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID + ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" + - "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+ - "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+ - ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"','"+ HBarCode+"'"+ + "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty + + "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" + + ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'" + ") "); @@ -932,7 +977,7 @@ ",HNowSupID=" + HNowSupID.ToString() + ",HNowSupTypeID=" + HNowSupTypeID.ToString() + ",HProdWeight=" + HProdWeight.ToString() + - ",HBarCode="+ HBarCode.ToString()+ + ",HBarCode=" + HBarCode.ToString() + " where HInterID=" + HInterID.ToString()); //淇敼瀛愰」鐩唬鐮� @@ -1049,7 +1094,7 @@ /// <returns></returns> [Route("Gy_Material/InitializeProdInBill")] [HttpGet] - public object InitializeProdInBill(long hmainid, string user,string userID) + public object InitializeProdInBill(long hmainid, string user, string userID) { DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile(); try @@ -1069,27 +1114,27 @@ " values('3801','3801'," + HInterID + ",'" + HBillNo + "',getdate()" + ", '" + user + "',getdate()" + ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" + - ", 0," + dr["HDeptID"].ToString() + ",' ',0" + + ", 0," + dr["HDeptID"].ToString() + ",' ',0" + ") "; string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID, HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID, HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID, - HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID+ ",1,'',getdate(),0,'',0,0,'','',"+ - "0,0,"+dr["HInterID"].ToString()+",0,0,0,"+ dr["HUnitID"].ToString()+",0,"+ dr["HProdQty"].ToString() +","+ dr["HProdQty"].ToString()+",0,"+ - "0,"+ dr["HDesignLife"].ToString()+","+ dr["HLeaveLife"].ToString() + ","+dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString()+",0,0" - + ",0,0,"+ userID + ",0,0,'')"); + HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," + + "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," + + "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0" + + ",0,0," + userID + ",0,0,'')"); //涓昏〃 oCN.RunProc(sql); oCN.RunProc(sql1); objJsonResult.code = "0"; objJsonResult.count = 1; - objJsonResult.Message = "鍒濆鍖栨垚鍔燂紝鍗曟嵁鍙蜂负"+ HBillNo; + objJsonResult.Message = "鍒濆鍖栨垚鍔燂紝鍗曟嵁鍙蜂负" + HBillNo; //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); objJsonResult.data = 1; return objJsonResult; - + } catch (Exception) { @@ -1099,7 +1144,7 @@ objJsonResult.data = null; } return objJsonResult; - + } #region [妯″叿妗f瀹℃牳銆佸弽瀹℃牳] @@ -1256,19 +1301,19 @@ ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain"); DataRow dr = ds.Tables[0].Rows[0]; string Num = dr["HBarCode"].ToString(); - string Num1 = Num.Substring(0,(Num.Length)-5); + string Num1 = Num.Substring(0, (Num.Length) - 5); oCN.BeginTran(); for (int i = StarNum1; i <= EndNum1; i++) { - if (i<10) + if (i < 10) { - j = "0000" + i; + j = "0000" + i; } - else if (i<100) + else if (i < 100) { j = "000" + i; } - else if (i<1000) + else if (i < 1000) { j = "00" + i; } @@ -1278,9 +1323,9 @@ } else { - j = ""+i; + j = "" + i; } - DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j)+"'", "Gy_MouldFileMain"); + DataSet ds1 = oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j) + "'", "Gy_MouldFileMain"); if (ds1.Tables[0].Rows.Count == 0 || ds1 == null) { long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo); @@ -1300,7 +1345,7 @@ "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + j + "','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" + ",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" + - "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] + + "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] + ",'" + dr["HOutComDate"] + "','" + dr["HOutComNo"] + "'," + dr["HDeptID"] + "," + dr["HSupID"] + ",'" + dr["HSupNumber"] + "'" + "," + dr["HPrintQty"] + ",'" + dr["HMouldStatus"] + "'," + dr["HWHID"] + "," + dr["HRoutingID"] + ",'" + dr["HCaveQty"] + "'," + dr["HBOMID"] + ",'" + dr["HVersion"] + "'," + dr["HSPGroupID"] + "," + dr["HSPID"] + ",'" + dr["HDesignLife"] + "','" + dr["HNowSupID"] + "','" + dr["HNowSupTypeID"] + "'" + @@ -1340,5 +1385,25 @@ } } #endregion + + public void cs(string msg) + { + var client = new RestSharp.RestClient("http://47.96.97.237/api/"); + var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialList", Method.POST); + Info info = new Info(); + info.msg = msg; + var json = JsonConvert.SerializeObject(info); + requestPost.AddParameter("application/json", json, ParameterType.RequestBody); + IRestResponse responsePost = client.Execute(requestPost); + var contentPost = responsePost.Content; + Console.WriteLine("POST鏂瑰紡鑾峰彇缁撴灉锛�" + contentPost); + Console.Read(); + } + + public class Info + { + public string msg { get; set; } //鏈骇鏍囧織 + + } } } \ No newline at end of file diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index eb1ec8f..2c35c3c 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -581,8 +581,9 @@ { try { + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); string sExpressNumber = ""; - WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); //oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); @@ -846,6 +847,44 @@ } + //閫変腑琛ㄤ綋 鏍规嵁鍗曟嵁涓籌D杩斿洖宸ュ簭姹囨姤鍗曚竴浜涗俊鎭� + [Route("SCStockInCheckBill/DisBillEntryList_Webs_New_Json2")] + [HttpGet] + public object DisBillEntryList_Webs_New_Json2(long HInterID, long HEntryID) + { + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBillList where HInterID = " + HInterID + " and HEntryID = " + HEntryID + "", "h_v_SCStockInCheckBillList"); + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //鍒锋柊琛ㄤ綋 杩斿洖鏉$爜搴撳瓨淇℃伅 [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")] [HttpGet] diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs index 1e612ef..f6586c8 100644 --- a/WebAPI/Controllers/MoveStockBillController.cs +++ b/WebAPI/Controllers/MoveStockBillController.cs @@ -542,8 +542,10 @@ WebS.WebService1 oWebs = new WebS.WebService1(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); string sExpressNumber = ""; + + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HStockOutOrgID, sBillNo,sMaker); //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - WebSoBar = oWebs.get_BarCode_MoveStock(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs index 28a23ae..09c64c7 100644 --- a/WebAPI/Controllers/OtherOutBillController.cs +++ b/WebAPI/Controllers/OtherOutBillController.cs @@ -88,12 +88,17 @@ // objJsonResult.data = oBar; // return objJsonResult; //} + + WebS.WebService1 oWebs = new WebS.WebService1(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); string sExpressNumber = ""; + + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); + SourceFlag = true; //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - WebSoBar = oWebs.get_CheckTypeByBarCode_New(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; @@ -378,6 +383,36 @@ } } + [Route("OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json1")] + [HttpGet] + public object set_SavePonderationBillMain_Temp_Source_Fast_Json1(Int64 sInterID, string SBillNo, string HBillType, string sSourceBillNo, string sSourceType,bool sRedBlue, string sMaker, Int64 sHOWNERID) + { + + WebS.WebService1 oWebs = new WebS.WebService1(); + WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); + string sExpressNumber = ""; + //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_CheckTypeBySource_New(sInterID, SBillNo, HBillType, sSourceBillNo, sSourceType,sRedBlue, sMaker, sHOWNERID, ref DBUtility.ClsPub.sErrInfo); + if (WebSoBar == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.data = WebSoBar; + return objJsonResult; + } + } + + + /// <summary> /// 鐢熸垚鍏朵粬鍏ュ簱鍗� /// </summary> diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs index 57446e2..2d5de67 100644 --- a/WebAPI/Controllers/POStockInBillController.cs +++ b/WebAPI/Controllers/POStockInBillController.cs @@ -82,8 +82,7 @@ { try { - - var sJXCode = POStockInBillController.JX_Json(sCode, HOWNERID); + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, HBillNo, sMaker); //if (sRedBlue == true) //{ // HBillType = "1239"; @@ -175,68 +174,535 @@ [Route("kf_PoStockInBill/JX_Json")] [HttpGet] - public static string JX_Json(string sBarCodeNew, Int64 HOrgID) + public static string JX_Json(string sBarCodeNew, Int64 hinterid, string HBillType,Int64 HOrgID,string HBillNo,string HMaker) { try { + //1.鍒ゆ柇绯荤粺鍙傛暟鏄惁瀹夌憺 涓嶆槸瀹夌憺 鐩存帴璺虫帀 + //濡傛灉鏄畨鐟� 璧颁笅闈� + + //瑙f瀽鏉$爜 + //濡傛灉鍦ㄦ潯鐮佹。妗堥噷闈� 涓嶅鐞� 娌℃湁鐨勮瘽 瀛樺叆鏉$爜妗f + + //鏍规嵁瑙f瀽鐨勭墿鏂� + 鎵规 鍒ゆ柇 鏉$爜涓存椂琛� 璁板綍鏄惁瀛樺湪 娌℃湁鐨勮瘽 杩涜鎵簮鍗曠殑鍔ㄤ綔 + + //鍔犱簡 鐢熶骇鏃ユ湡 鏈夋晥鏈熻嚦 淇濊川鏈熸爣蹇� - string[] sArray = sBarCodeNew.Split('@'); - string HMaterNumber = ""; - HMaterNumber = sArray[0]; - Int64 HQty = 0; - HQty = ClsPub.isInt(sArray[4]); - string HBarchNo = ""; - HBarchNo = sArray[6]; - - DateTime HSCRQ = ClsPub.isDate(sArray[3]); - DateTime HYXQZ = ClsPub.isDate(sArray[5]); - - - Int64 HMaterID = 0; - - SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); - DataSet Dss; - Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); - string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); - - DataSet Dss1; - Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); - HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); - string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); - string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); - Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); - + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + //if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") + //{ string HTM = ""; - HTM = HOrgNumber + HMaterID + HBarchNo; - string ModName = "85"; - var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); - Int64 HSupID = 0; - oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + - ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + - ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + - ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + - ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + - ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + - ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + - ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + - ") values (" - + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() - + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() - + ", 0,0,'','',0" - + ", 0,'',0,0,0,''" - + ",0,'',''," + HSCRQ.ToShortDateString() + "," + HYXQZ.ToShortDateString() + ",'',getdate()" - + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" - + ",0,0,0" - + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + //閲囪喘鍏ュ簱 + if (HBillType == "1201") + { + string[] sArray = sBarCodeNew.Split('@'); + string HMaterNumber = ""; + HMaterNumber = sArray[0]; + Int64 HQty = 0; + HQty = ClsPub.isInt(sArray[4]); + string HBarchNo = ""; + HBarchNo = sArray[6]; + + DateTime HSCRQ = ClsPub.isDate(sArray[3]); + DateTime HYXQZ = ClsPub.isDate(sArray[5]); + + //閲囪喘璁㈠崟鍙� + string HPOOrderBillNo = ""; + HPOOrderBillNo = ClsPub.isStrNull(sArray[8]); - string sExpressNumber = ""; + + Int64 HMaterID = 0; + + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + DataSet Dss; + Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + + DataSet Dss1; + Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + + + HTM = HOrgNumber + HMaterID + HBarchNo; + + //濡傛灉鏉$爜妗f涓嶅瓨鍦� 杩涜瀛樺叆鏉$爜妗f鐨勫姩浣� + //鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿 + DataSet Dss2; + Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery"); + HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]); + Int64 HSourceInterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["fid"]); + Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FENTRYID"]); + string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]); + //鍒ゆ柇鏉$爜妗f鏄惁瀛樺湪璇ユ潯鐮� + //濡傛灉瀛樺湪 鍐嶅垽鏂壂鐮佷复鏃惰〃鏄惁瀛樺湪璇ユ潯鐮� + //濡傛灉涓嶅瓨鍦� 杩涜鎵簮鍗曠殑鏂规硶 + DataSet Dss5; + Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + DataSet Dss6; + Dss6 = oCn.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp"); + if (Dss6.Tables[0].Rows.Count > 0) + { + + } + else + { + POStockInBillController POStockInBill = new POStockInBillController(); + POStockInBill.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", HSourceBillNo, hinterid, HBillNo); + + } + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','1103',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + DataSet Dss7; + Dss7 = oCn.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp"); + if (Dss7.Tables[0].Rows.Count > 0) + { + + } + else + { + POStockInBillController POStockInBill = new POStockInBillController(); + POStockInBill.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", HSourceBillNo, hinterid, HBillNo); + + } + + } + } + //浜у搧鍏ュ簱 + if(HBillType == "1202") + { + string HMaterNumber = ""; + HMaterNumber = sBarCodeNew.Substring(0, 10); + string HSCRQ = ""; + HSCRQ = "20" + sBarCodeNew.Substring(10, 6); + Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4)); + Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2)); + Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2)); + + string HBatchNo = ""; + HBatchNo = sBarCodeNew.Substring(16, 11); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + Int64 HMaterID = 0; + DataSet Dss1; + Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBill_Json where HYear =" + Year + " and HMonth = " + Month + " and HDay = " + Day + " and HMaterID = " + HMaterID.ToString() + "and 鎵规 = '" + HBatchNo.ToString() + "'", "h_v_SCStockInCheckBill_Json"); + Int64 HSourceInterID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]); + Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]); + string HSourceBillNo = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]); + DataSet Dss; + Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + HTM = HOrgNumber + HMaterID + HBatchNo; + + + DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day); + + + string HYXQZ = "20" + sBarCodeNew.Substring(27, 6); + Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4)); + Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2)); + Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2)); + DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1); + + Int64 HQty = 0; + HQty = ClsPub.isInt(sBarCodeNew.Substring(33,3)); + + DataSet Dss5; + Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + DataSet Dss6; + Dss6 = oCN.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp"); + if (Dss6.Tables[0].Rows.Count > 0) + { + + } + else + { + + WEBSController WEBS = new WEBSController(); + WEBS.get_SourceBarCode_ProductIn_Json(hinterid, HBillNo, HBillType, HSourceBillNo, "3714", HMaker,HOrgID); + + } + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','3714',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + DataSet Dss7; + Dss7 = oCN.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp"); + if (Dss7.Tables[0].Rows.Count > 0) + { + + } + else + { + WEBSController WEBS = new WEBSController(); + WEBS.get_SourceBarCode_ProductIn_Json(hinterid, HBillNo, HBillType, HSourceBillNo, "3714", HMaker, HOrgID); + + } + + } + + } + //鐢熶骇閫�鏂� + if (HBillType == "1244") + { + string HMaterNumber = ""; + HMaterNumber = sBarCodeNew.Substring(0, 10); + string HSCRQ = ""; + HSCRQ = "20" + sBarCodeNew.Substring(10, 6); + Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4)); + Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2)); + Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2)); + + string HBatchNo = ""; + HBatchNo = sBarCodeNew.Substring(16, 11); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + Int64 HMaterID = 0; + DataSet Dss1; + Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + DataSet Dss; + Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + HTM = HOrgNumber + HMaterID + HBatchNo; + + + DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day); + + + string HYXQZ = "20" + sBarCodeNew.Substring(27, 6); + Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4)); + Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2)); + Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2)); + DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1); + + Int64 HQty = 0; + HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3)); + + DataSet Dss5; + Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", 0,0,'','',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + + } + + } + //璋冩嫧鍗� + if (HBillType == "1207") + { + string HMaterNumber = ""; + HMaterNumber = sBarCodeNew.Substring(0, 10); + string HSCRQ = ""; + HSCRQ = "20" + sBarCodeNew.Substring(10, 6); + Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4)); + Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2)); + Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2)); + + string HBatchNo = ""; + HBatchNo = sBarCodeNew.Substring(16, 11); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + Int64 HMaterID = 0; + DataSet Dss1; + Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + DataSet Dss; + Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + HTM = HOrgNumber + HMaterID + HBatchNo; + + + DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day); + + + string HYXQZ = "20" + sBarCodeNew.Substring(27, 6); + Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4)); + Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2)); + Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2)); + DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1); + + Int64 HQty = 0; + HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3)); + + DataSet Dss5; + Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", 0,0,'','',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + + } + + } + //鍏朵粬鍑哄簱鍗� + if (HBillType == "1206") + { + string HMaterNumber = ""; + HMaterNumber = sBarCodeNew.Substring(0, 10); + string HSCRQ = ""; + HSCRQ = "20" + sBarCodeNew.Substring(10, 6); + Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4)); + Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2)); + Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2)); + + string HBatchNo = ""; + HBatchNo = sBarCodeNew.Substring(16, 11); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + Int64 HMaterID = 0; + DataSet Dss1; + Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + DataSet Dss; + Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + HTM = HOrgNumber + HMaterID + HBatchNo; + + + DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day); + + + string HYXQZ = "20" + sBarCodeNew.Substring(27, 6); + Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4)); + Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2)); + Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2)); + DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1); + + Int64 HQty = 0; + HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3)); + + DataSet Dss5; + Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", 0,0,'','',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + + } + + } + //棰嗘枡鍑哄簱鏍¢獙 + if (HBillType == "1204") + { + string[] sArray = sBarCodeNew.Split('@'); + string HMaterNumber = ""; + HMaterNumber = sArray[0]; + Int64 HQty = 0; + HQty = ClsPub.isInt(sArray[4]); + string HBarchNo = ""; + HBarchNo = sArray[6]; + + DateTime HSCRQ = ClsPub.isDate(sArray[3]); + DateTime HYXQZ = ClsPub.isDate(sArray[5]); + + //閲囪喘璁㈠崟鍙� + string HPOOrderBillNo = ""; + HPOOrderBillNo = ClsPub.isStrNull(sArray[8]); + + + + Int64 HMaterID = 0; + + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + DataSet Dss; + Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + + DataSet Dss1; + Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + + + HTM = HOrgNumber + HMaterID + HBarchNo; + + + DataSet Dss5; + Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + + } + else + { + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", " + 0 + "," + 0 + ",'','',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + + } + + } //objJsonResult.code = "0"; //objJsonResult.count = 1; //objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //objJsonResult.data = ; return HTM; + } catch (Exception e) { @@ -248,6 +714,10 @@ } } + + + + @@ -498,12 +968,206 @@ [Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")] [HttpGet] - public object BarCode_Json(string HBarCode) + public object BarCode_Json(string HBarCode,Int64 HOrgID) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 鏉$爜缂栧彿 ='" + HBarCode.ToString() + "'", "h_v_QCStockInCheckBill_Json"); + //string[] sArray = HBarCode.Split('@'); + //string HMaterNumber = ""; + //HMaterNumber = sArray[0]; + + ////閲囪喘璁㈠崟鍙� + //string HPOOrderBillNo = ""; + //HPOOrderBillNo = ClsPub.isStrNull(sArray[8]); + + + + //Int64 HMaterID = 0; + + + //DataSet Dss1; + //Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + //HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + + + ////鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿 + //DataSet Dss2; + //Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery"); + //HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]); + //string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]); + + + string HTM = ""; + string[] sArray = HBarCode.Split('@'); + string HMaterNumber = ""; + HMaterNumber = sArray[0]; + Int64 HQty = 0; + HQty = ClsPub.isInt(sArray[4]); + string HBarchNo = ""; + HBarchNo = sArray[6]; + + DateTime HSCRQ = ClsPub.isDate(sArray[3]); + DateTime HYXQZ = ClsPub.isDate(sArray[5]); + + //閲囪喘璁㈠崟鍙� + string HPOOrderBillNo = ""; + HPOOrderBillNo = ClsPub.isStrNull(sArray[8]); + + + + Int64 HMaterID = 0; + + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + DataSet Dss; + Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList"); + string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]); + + DataSet Dss1; + Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + + + HTM = HOrgNumber + HMaterID + HBarchNo; + + //濡傛灉鏉$爜妗f涓嶅瓨鍦� 杩涜瀛樺叆鏉$爜妗f鐨勫姩浣� + //鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿 + DataSet Dss2; + Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery"); + HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]); + Int64 HSourceInterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["fid"]); + Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FENTRYID"]); + string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]); + //鍒ゆ柇鏉$爜妗f鏄惁瀛樺湪璇ユ潯鐮� + //濡傛灉瀛樺湪 鍐嶅垽鏂壂鐮佷复鏃惰〃鏄惁瀛樺湪璇ユ潯鐮� + //濡傛灉涓嶅瓨鍦� 杩涜鎵簮鍗曠殑鏂规硶 + DataSet Dss5; + Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill"); + if (Dss5.Tables[0].Rows.Count > 0) + { + DataSet ds; + ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where HSourceBillNo ='" + HSourceBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json"); + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + else + { + + + + string ModName = "85"; + var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo); + Int64 HSupID = 0; + oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + + ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " + + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + + ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " + + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " + + ") values (" + + "'" + HTM + "','鎵规鏉$爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString() + + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString() + + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','1103',0" + + ", 0,'',0,0,0,''" + + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()" + + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1" + + ",0,0,0" + + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)"); + DataSet ds; + ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where HSourceBillNo ='" + HSourceBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json"); + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + //ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 鏉$爜缂栧彿 ='" + HBarCode.ToString() + "'", "h_v_QCStockInCheckBill_Json"); + + } + catch (Exception e) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + [Route("Kf_SCStockInCheckBill_Fast/BarCode_Json1")] + [HttpGet] + public object BarCode_Json1(string HBarCode,Int64 HOrgID) + { + try + { + + //鏍规嵁鎷嗗垎鐨勭墿鏂橧D + 鎵规 + 鐢熶骇鏃ユ湡 鑳芥壘鍒板敮涓�鐨勫伐搴忔眹鎶ュ崟 + string HMaterNumber = ""; + HMaterNumber = HBarCode.Substring(0, 10); + string HSCRQ = ""; + HSCRQ = "20" + HBarCode.Substring(10, 6); + Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4)); + Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2)); + Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2)); + + string HBatchNo = ""; + HBatchNo = HBarCode.Substring(16, 11); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + Int64 HMaterID = 0; + DataSet Dss1; + Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material"); + HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]); + string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]); + string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]); + Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]); + + + DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day); + + + + Int64 HQty = 0; + HQty = ClsPub.isInt(HBarCode.Substring(33, 3)); + + + ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBill_Json where HYear =" + Year.ToString() + "and HMonth = " + Month.ToString() + "and HDay = " + Day.ToString() + " and HMaterID = " + HMaterID.ToString() + "and 鎵规 = '" + HBatchNo.ToString() + "'", "h_v_SCStockInCheckBill_Json"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs index 2c655bb..d184a0a 100644 --- a/WebAPI/Controllers/ProductInController.cs +++ b/WebAPI/Controllers/ProductInController.cs @@ -332,8 +332,10 @@ WebS.WebService1 oWebs = new WebS.WebService1(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); string sExpressNumber = ""; + + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; @@ -363,9 +365,10 @@ { WebS.WebService1 oWebs = new WebS.WebService1(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); + var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); string sExpressNumber = ""; //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); - WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs index b4ec766..80c23d0 100644 --- a/WebAPI/Controllers/PublicPageMethodController.cs +++ b/WebAPI/Controllers/PublicPageMethodController.cs @@ -1481,6 +1481,47 @@ } #endregion + + + #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛� + [Route("OtherOutRequestBillList/CX")] + [HttpGet] + public object CX(string sWhere) + { + try + { + + string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 鏍规嵁鏍戝瀷id鏌ユ壘璁惧鍒楄〃 [Route("Gy_MaintenanceMode/EqpCX")] [HttpGet] diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 226e296..af39f81 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -1019,6 +1019,200 @@ } #endregion + + + + + /// <summary> + /// 鐢熸垚閲戣澏浜戜骇鍝佹楠屽崟 + /// </summary> + /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param> + /// <returns></returns> + [Route("SCStockInCheckBill/set_SaveSCStockInCheckBill_Json")] + [HttpGet] + public object set_SaveSCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber, + double HCheckQty, double HRightQty, double HBadQty, + string HCheckResult, string HSupNumber, string HWHNumber, + string HUseResult, Int64 HSeQ, Int64 HSourceInterID, + Int64 HSourceEntryID, string HSourceBillNo, string user, + Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID, + Int64 HMaterID, string HSourceBillType, Int64 HSLInterID, + Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ) + { + try + { + //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿 + Int64 HInterID = DBUtility.ClsPub.CreateBillID("7501", ref DBUtility.ClsPub.sExeReturnInfo); + string HBillNo = DBUtility.ClsPub.CreateBillCode("7501", ref DBUtility.ClsPub.sExeReturnInfo, true); + + //淇濆瓨 + oCN.BeginTran(); + //鐢熸垚浜у搧妫�楠屽崟 + //oCN.RunProc("Insert Into QC_POStockInCheckBillMain " + + //"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" + + //",HYear,HPeriod,HRemark,HSupID,HMaterID" + + //",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" + + //",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" + + //") " + + //" values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" + + //",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() + + //",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" + + //",'" + HCheckResult.ToString() + "','', '','',''" + + //") "); + ////鐢熶骇姹囨姤鍗曞瓙琛� + //oCN.RunProc("Insert into QC_POStockInCheckBillSub " + + // " (HInterID,HEntryID,HCloseMan,HCloseType" + + // ",HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + // ",HRelationQty,HRelationMoney,HQCCheckClassID,HQCCheckItemID,HQCStd," + + // "HResult,HQCRelValue,HProcCheckEmp,HProcCheckTime" + + // ") values(" + // + HInterID.ToString() + ",1,'',''" + + // ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" + + // ",0,0,0,0,''" + + // ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" + + // ") "); + //鍚屾閲戣澏 + //璁块棶閲戣澏 + var loginRet = InvokeHelper.Login(); + var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>(); + if (isSuccess == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet; + objJsonResult.data = null; + return objJsonResult; + } + + + JObject model = new JObject(); + model.Add("FBillTypeID", new JObject() { ["Fnumber"] = "JYD002_SYS" }); //鍗曟嵁绫诲瀷 浜у搧妫�楠屽崟JYD002_SYS + model.Add("FBusinessType", "3"); //涓氬姟绫诲瀷 + model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡 + model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐 + model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐 + model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝� + model.Add("FBillNo", HBillNo); + + JArray Fentity = new JArray(); + JObject FentityModel = new JObject(); + FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 + FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁¢噺鍗曚綅鍐呯爜 + FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲� + FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺 + FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋� + FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵�� + FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇� + FentityModel.Add("FSrcBillType0", "SFC_OperationReport");// 婧愬崟绫诲瀷 + FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅 + FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲� + //FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟� + FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 + FentityModel.Add("FInspectTimes", "1"); // 妫�楠屾鏁� + FentityModel.Add("FTimeUnit", "24");//鏃堕棿鍗曚綅 + FentityModel.Add("FSAMPLEDAMAGEBEARER", "2");//鏍锋湰鐮村潖鎵挎媴鏂� + FentityModel.Add("FISFIRSTINSPECT", false);//棣栨 + FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁� + FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆 + FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛� + + JArray Fentity2 = new JArray(); + JObject FentityModel2 = new JObject(); + FentityModel2.Add("FPolicyMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜 + FentityModel2.Add("FPolicyStatus", "1"); //鐘舵�� + FentityModel2.Add("FPolicyQty", HRightQty.ToString()); //鏁伴噺 + FentityModel2.Add("FBasePolicyQty", HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺 + FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥 + FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥 + FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊 + FentityModel2.Add("FCanSale", false); //鍙攢鍞� + FentityModel2.Add("FIsMRBReview", false); //MRP璇勫 + FentityModel2.Add("FIsReturn", false); //鍒ら�� + FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇� + Fentity2.Add(FentityModel2); + FentityModel.Add("FPolicyDetail", Fentity2); + + + + //JArray Fentity3 = new JArray(); + //JObject FentityModel3 = new JObject(); + //FentityModel3.Add("FSrcBillType", "SFC_OperationReport"); //婧愬崟绫诲瀷 + //FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //宸ュ簭姹囨姤鍗曞崟鍙� + //FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //宸ュ簭姹囨姤鍗曚富ID + //FentityModel3.Add("FSrcEntryId", HSLEntryID.ToString()); //宸ュ簭姹囨姤鍗曞瓙ID + //FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //宸ュ簭姹囨姤鍗曡鍙� + //FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PUR_PurchaseOrder" }); // 宸ュ簭璁″垝绫诲瀷 + //FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //宸ュ簭璁″垝鍗曞彿 + //FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //宸ュ簭璁″垝涓籌D + //FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //宸ュ簭璁″垝瀛怚D + //FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //宸ュ簭璁″垝琛屽彿 + //Fentity3.Add(FentityModel3); + //FentityModel.Add("FReferDetail", Fentity3); + Fentity.Add(FentityModel); + model.Add("FEntity", Fentity); //鏄庣粏淇℃伅 + JObject jsonRoot = new JObject() + { + ["Creator"] = "", + ["NeedUpDateFields"] = new JArray(), + ["NeedReturnFields"] = new JArray(), + ["IsDeleteEntry"] = "false", + ["SubSystemId"] = "", + ["IsVerifyBaseDataField"] = "false", + //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳� + ["Model"] = model + }; + + string result = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨 + //鍒ゆ柇淇濆瓨鏄惁鎴愬姛 + if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") + { + LogService.Write("鏉ユ枡妫�楠屽崟淇濆瓨閿欒jsonRoot:" + jsonRoot); + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + result; + objJsonResult.data = null; + return objJsonResult; + } + //鎻愪氦瀹℃牳 + string result1 = string.Empty; + string result2 = string.Empty; + var fID = JObject.Parse(result)["Result"]["Id"].ToString(); + var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString(); + var json = new + { + Ids = fID, + }; + result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 + result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 + if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.Commit(); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + /// <summary> /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛� ///鍙傛暟锛歴tring sql銆� diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" index aa7007f..802969b 100644 --- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" +++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" @@ -60,14 +60,109 @@ #endregion + #region 宸蹭笂浼犳煡璇㈢晫闈紝鏍规嵁鍗曟嵁鍙枫�佹簮鍗曞彿鏌ヨ宸蹭笂浼犲崟鎹俊鎭� + + /// <summary> + /// 宸蹭笂浼犳煡璇㈢晫闈紝鏍规嵁鍗曟嵁鍙枫�佹簮鍗曞彿鏌ヨ宸蹭笂浼犲崟鎹俊鎭� + /// </summary> + /// <returns></returns> + [Route("WEBSController/GetKf_ICStockBillQueryList_Json")] + [HttpGet] + public object GetKf_ICStockBillQueryList_Json(string HBillType, string HBillNo, string HSourceBillNo) + { + try + { + ds = oWebs.GetKf_ICStockBillQueryList(HBillType, HBillNo, HSourceBillNo); + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ涓嶅埌璇ュ崟鎹褰曪紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇宸蹭笂浼犲崟鎹俊鎭け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + + #region 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0 + + /// <summary> + /// 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0 + /// </summary> + /// <returns></returns> + [Route("WEBSController/DeleteICStockBillAndWMS_Json")] + [HttpGet] + public object DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType) + { + try + { + if (oWebs.DeleteICStockBillAndWMS(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo)) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛� + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛� + objJsonResult.data = null; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 鍒犻櫎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍 /// <summary> - /// 鍒犻櫎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍 + /// 鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰� /// </summary> /// <returns></returns> [Route("WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json")] - [HttpPost] + [HttpGet] public object set_DelPonderationBillMain_Temp_InterIDAndSource_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string HBillType) { try @@ -93,7 +188,86 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍒犻櫎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍澶辫触锛�" + e.ToString(); + objJsonResult.Message = "鍒犻櫎鎵�閫夎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 鏍规嵁鍗曟嵁ID,鍒犻櫎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍 + /// </summary> + /// <returns></returns> + [Route("WEBSController/DeleteBillList_Json")] + [HttpGet] + public object DeleteBillList_Json(long HInterID) + { + try + { + if (oWebs.DeleteBillList(HInterID, ref DBUtility.ClsPub.sErrInfo)) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛� + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛� + objJsonResult.data = null; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎鎵�閫夊崟鎹潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰曞け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + + #region 鍒犻櫎鍏堣繘鍏堝嚭涓存椂琛紙鏇存柊 HlineStatus =1锛� + + /// <summary> + /// 鍒犻櫎鍏堣繘鍏堝嚭涓存椂琛紙鏇存柊 HlineStatus =1锛� + /// </summary> + /// <returns></returns> + [Route("WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json")] + [HttpGet] + public object set_DelPonderationBillMain_Temp_FIFO_Json(long HInterID, string HBillType) + { + try + { + if (oWebs.set_DelPonderationBillMain_Temp_FIFO(HInterID, HBillType, ref DBUtility.ClsPub.sErrInfo)) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛� + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛� + objJsonResult.data = null; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏇存柊鍏堣繘鍏堝嚭涓存椂琛℉lineStatus鍊煎け璐ワ紒" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -323,8 +497,87 @@ #endregion + #region 鍏朵粬鍑哄簱 鎵弿婧愬崟鏉$爜 + + /// <summary> + /// 鍏朵粬鍑哄簱 鎵弿婧愬崟鏉$爜 + /// </summary> + /// <returns></returns> + [Route("WEBSController/get_SourceBarCode_OtherOut_Json")] + [HttpGet] + public object get_SourceBarCode_OtherOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID) + { + try + { + WebSoBar = oWebs.get_SourceBarCode_OtherOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + if (WebSoBar == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛"; + objJsonResult.data = WebSoBar; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵弿婧愬崟鏉$爜澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + #region 鐩存帴璋冩嫧 鎵弿婧愬崟鏉$爜 + /// <summary> + /// 鐩存帴璋冩嫧 鎵弿婧愬崟鏉$爜 + /// </summary> + /// <returns></returns> + [Route("WEBSController/get_SourceBarCode_MoveStock_Json")] + [HttpGet] + public object get_SourceBarCode_MoveStock_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID) + { + try + { + WebSoBar = oWebs.get_SourceBarCode_MoveStock(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, ref DBUtility.ClsPub.sErrInfo); + if (WebSoBar == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛"; + objJsonResult.data = WebSoBar; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵弿婧愬崟鏉$爜澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } #endregion @@ -341,7 +594,7 @@ #endregion - #region 鐗╂枡鏉$爜澶勭悊鏂规硶 + #region 鐗╂枡鏉$爜澶勭悊鏂规硶 鍏朵粬鍑哄簱搴撴ā鍧� /// <summary> /// 鐗╂枡鏉$爜鏂囨湰妗� 鎵爜璋冪敤 @@ -353,7 +606,51 @@ { try { - WebSoBar = oWebs.get_BarCode(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo); + var sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo,HMaker); + SourceFlag = true; + WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo); + if (WebSoBar == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛"; + objJsonResult.data = WebSoBar; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵弿鏉$爜澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 鐗╂枡鏉$爜澶勭悊鏂规硶 璋冩嫧妯″潡 + + /// <summary> + /// 鐗╂枡鏉$爜鏂囨湰妗� 鎵爜璋冪敤 + /// </summary> + /// <returns></returns> + [Route("WEBSController/get_BarCode_MoveStock_Json")] + [HttpGet] + public Object get_BarCode_MoveStock_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle) + { + try + { + WebSoBar = oWebs.get_BarCode_MoveStock(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; @@ -392,86 +689,46 @@ /// <returns></returns> [Route("WEBSController/GetBillEntryTmpList_Json")] [HttpGet] - public object GetBillEntryTmpList(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID, string sMouldManagerCtl, string sFIFOCtl) + public object GetBillEntryTmpList(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID) { try { - string sSimpleMode = "N"; //鏄惁鍚敤鎵爜绠�鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N) - string sReturn = ""; - - //鑾峰彇绯荤粺鍙傛暟 - if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sReturn) == true) + string sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠$悊 + string sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊 + ds = oWebs.GetBillEntryTmpList(HInterID, HBillNo, HBillType, HStockOrgID, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo); + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) { - //鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠$悊(Y,N) - if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //鍚敤妯℃不鍏风鐞� - { - sMouldManagerCtl = "Y"; - } + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } - //鍒ゆ柇鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊(Y,N)锛屾槸鍚﹀惎鐢ㄦ壂鐮佺畝鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N) - if (HBillType == "1204") //鐢熶骇棰嗘枡鍗� - { - if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MateOutBill_FIFOList == "Y") //鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗 - { - sFIFOCtl = "Y"; - } - if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //鐢熶骇棰嗘枡鍗�-鎵爜绠�鏄撴ā寮� - { - sSimpleMode = "Y"; - } - } - else if (HBillType == "1205" && (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_SellOutBill_FIFOList == "Y")) //閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗 - { - sFIFOCtl = "Y"; - } - else if (HBillType == "1211" && (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList == "Y")) //濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗 - { - sFIFOCtl = "Y"; - } - else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y")) //鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗 - { - sFIFOCtl = "Y"; - } - else if (HBillType == "1250" && (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList == "Y")) //鍒嗘寮忚皟鍑哄崟-鍏堣繘鍏堝嚭鎺у埗 - { - sFIFOCtl = "Y"; - } - - DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList_LayUI " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList_LayUI"); - - List<object> columnNameList = new List<object>(); - //娣诲姞鍒楀悕 - foreach (DataColumn col in ds.Tables[0].Columns) - { - Type dataType = col.DataType; - string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; - columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 - } - - if (ds == null || ds.Tables[0].Rows.Count <= 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds; - objJsonResult.list = columnNameList; - return objJsonResult; - } + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; } else { objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涜繑鍥炵墿鏂欐槑缁嗗垪琛ㄦ椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sReturn; - objJsonResult.data = null; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.data = new + { + Materlist = ds.Tables[0], //杩斿洖鐗╂枡鏄庣粏鍒楄〃淇℃伅锛�0锛� + Mouldlist = ds.Tables[1], //杩斿洖妯℃不鍏峰垪琛ㄤ俊鎭紙1锛� + FIFOlist = ds.Tables[2], //杩斿洖鍏堣繘鍏堝嚭鍒楄〃淇℃伅锛�2锛� + BarCodelist = ds.Tables[3], //杩斿洖鏉$爜鏄庣粏鍒楄〃淇℃伅锛�3锛� + ICMOReportlist = ds.Tables[4], //杩斿洖婧愬崟鐢熶骇姹囨姤鍗曟潯鐮佹槑缁嗗垪琛ㄤ俊鎭紙4锛� + BarCodeDetailslist = ds.Tables[5] //杩斿洖褰撳墠鎵�鎵弿鏉$爜鏄庣粏淇℃伅锛�5锛� + }; + objJsonResult.list = columnNameList; return objJsonResult; } } @@ -616,8 +873,107 @@ #endregion - #region 澶勭悊鏂规硶 + #region 杩斿洖鍗曟嵁鍒楄〃淇℃伅 + /// <summary> + /// 杩斿洖鍗曟嵁鍒楄〃淇℃伅 鏍¢獙妯″紡 + /// </summary> + /// <returns></returns> + [Route("WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json")] + [HttpGet] + public object GetKf_PonderationBillMain_Temp_BillCheck_Json(long HInterID, string HBillType, string sWhere) + { + try + { + ds = oWebs.GetKf_PonderationBillMain_Temp_BillCheck(HInterID, HBillType, sWhere); + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇鍒楄〃淇℃伅澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 杩斿洖缂撳瓨鍒楄〃淇℃伅 + + /// <summary> + /// 杩斿洖缂撳瓨鍒楄〃淇℃伅 鏍¢獙妯″紡 + /// </summary> + /// <returns></returns> + [Route("WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json")] + [HttpGet] + public object GetKf_PonderationBillMain_TempList_BillCheck_Json(string HBillType, string HMaker, Int64 HStockOrgID) + { + try + { + ds = oWebs.GetKf_PonderationBillMain_TempList_BillCheck(HBillType, HMaker, HStockOrgID); + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏃犵紦瀛樿褰曪紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇缂撳瓨淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } #endregion diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs index 395ca0e..088733c 100644 --- a/WebAPI/DLL/ClsGy_Material_Ctl.cs +++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs @@ -24,14 +24,14 @@ ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" + ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" + ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" + - ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID) " + + ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID) " + " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" + ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() + ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() + ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" + ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() + - ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo); + ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCn.Commit(); @@ -43,7 +43,44 @@ throw (e); } } - + public bool AddNewApi() + { + try + { + string sql = string.Empty; + oCn.BeginTran(); + sql = $"delete Gy_Material where hitemid ={oModel.HItemID}"; + oCn.RunProc(sql); + sql = "set identity_insert gy_material on"; + oCn.RunProc(sql); + oCn.RunProc("Insert into Gy_Material (" + + "HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" + + ",HLevel,HEndFlag,HStopflag,HRemark" + + ",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" + + ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" + + ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" + + ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" + + ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID) " + + " Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + + ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" + + ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() + + ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() + + ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" + + ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() + + ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo); + sql = "set identity_insert gy_material off"; + oCn.RunProc(sql); + //淇敼涓婄骇涓洪潪鏈骇浠g爜 + oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + oCn.Commit(); + return true; + } + catch (Exception e) + { + oCn.RollBack(); + throw (e); + } + } //淇敼 public override bool ModifyByID(Int64 sItemID) { diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs index be5f606..0a5a831 100644 --- a/WebAPI/Models/ClsGy_Material_Model.cs +++ b/WebAPI/Models/ClsGy_Material_Model.cs @@ -40,5 +40,7 @@ public long HMaterTypeID; public double HPlanPrice; public int HUSEORGID; + public int HERPItemID; + public int HCREATEORGID; } } \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml index 9250916..3f2fe11 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,7 @@ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedPlatform>x86</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> - <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl> + <PublishUrl>E:\缃戦〉鍙戝竷\WEBAPI</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> <SiteUrlToLaunchAfterPublish /> </PropertyGroup> diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 6ad12ef..dbef529 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,84 +4,84 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2022-11-22T12:24:39.7324815Z;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;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> + <_PublishTargetUrl>E:\缃戦〉鍙戝竷\WEBAPI</_PublishTargetUrl> + <History>True|2022-11-27T06:40:28.4784748Z;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;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/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>11/22/2022 20:23:50</publishTime> + <publishTime>11/27/2022 17:40:44</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/09/2022 16:02:08</publishTime> <publishTime>11/02/2022 22:03:01</publishTime> - <publishTime>11/22/2022 20:23:50</publishTime> + <publishTime>11/27/2022 17:40:44</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> - <publishTime>12/17/2020 21:32:28</publishTime> + <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>11/22/2022 20:23:46</publishTime> + <publishTime>11/27/2022 17:40:41</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/09/2022 16:02:06</publishTime> <publishTime>11/02/2022 22:02:58</publishTime> - <publishTime>11/22/2022 20:23:46</publishTime> + <publishTime>11/27/2022 17:40:41</publishTime> </File> <File Include="bin/Dapper.dll"> - <publishTime>07/22/2016 14:52:40</publishTime> + <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>11/02/2022 22:02:56</publishTime> <publishTime>11/15/2022 13:55:23</publishTime> - <publishTime>11/22/2022 20:23:20</publishTime> + <publishTime>11/27/2022 17:40:37</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/09/2022 16:01:58</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/22/2022 20:23:20</publishTime> + <publishTime>11/27/2022 17:40:37</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> - <publishTime>03/22/2022 05:17:26</publishTime> + <publishTime>03/22/2022 13:17:26</publishTime> </File> <File Include="bin/Grpc.Core.Api.pdb"> - <publishTime>03/18/2022 23:39:42</publishTime> + <publishTime>03/19/2022 07:39:42</publishTime> </File> <File Include="bin/Grpc.Core.dll"> - <publishTime>03/22/2022 05:17:20</publishTime> + <publishTime>03/22/2022 13:17:20</publishTime> </File> <File Include="bin/Grpc.Core.pdb"> - <publishTime>03/18/2022 23:39:48</publishTime> + <publishTime>03/19/2022 07:39:48</publishTime> </File> <File Include="bin/grpc_csharp_ext.x64.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/grpc_csharp_ext.x86.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.dll"> - <publishTime>05/08/2021 17:08:30</publishTime> + <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.pdb"> - <publishTime>05/08/2021 17:08:30</publishTime> + <publishTime>05/09/2021 01:08:30</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/19/2021 09:43:58</publishTime> + <publishTime>11/27/2022 14:21:58</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -90,96 +90,96 @@ <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> - <publishTime>03/18/2022 23:38:44</publishTime> + <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.so"> - <publishTime>03/18/2022 23:38:42</publishTime> + <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> - <publishTime>03/18/2015 17:02:50</publishTime> + <publishTime>03/19/2015 01:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> - <publishTime>07/25/2012 11:48:56</publishTime> + <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/22/2022 20:23:21</publishTime> + <publishTime>11/27/2022 17:40:38</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/09/2022 16:02:01</publishTime> <publishTime>11/02/2022 22:02:56</publishTime> - <publishTime>11/22/2022 20:23:21</publishTime> + <publishTime>11/27/2022 17:40:38</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> - <publishTime>08/03/2014 20:33:56</publishTime> + <publishTime>08/04/2014 04:33:56</publishTime> </File> <File Include="bin/NPOI.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OOXML.dll"> - <publishTime>10/23/2021 01:07:56</publishTime> - </File> - <File Include="bin/NPOI.OOXML.pdb"> <publishTime>10/23/2021 09:07:56</publishTime> </File> + <File Include="bin/NPOI.OOXML.pdb"> + <publishTime>10/23/2021 17:07:56</publishTime> + </File> <File Include="bin/NPOI.OpenXml4Net.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.dll"> - <publishTime>10/23/2021 01:07:54</publishTime> + <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.pdb"> - <publishTime>10/23/2021 09:07:54</publishTime> + <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>11/22/2022 20:23:00</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/09/2022 16:01:56</publishTime> <publishTime>11/02/2022 22:02:54</publishTime> - <publishTime>11/22/2022 20:23:00</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/22/2022 20:23:02</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/22/2022 20:23:02</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>11/22/2022 20:23:19</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/09/2022 16:01:57</publishTime> <publishTime>11/02/2022 22:02:55</publishTime> - <publishTime>11/22/2022 20:23:19</publishTime> + <publishTime>11/27/2022 17:40:36</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> - <publishTime>02/15/2015 17:57:08</publishTime> + <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/System.Buffers.dll"> - <publishTime>07/19/2017 10:01:28</publishTime> + <publishTime>07/19/2017 18:01:28</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -203,19 +203,19 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> - <publishTime>08/19/2014 10:03:34</publishTime> + <publishTime>08/19/2014 18:03:34</publishTime> </File> <File Include="bin/System.Memory.dll"> - <publishTime>04/17/2019 16:24:34</publishTime> + <publishTime>04/18/2019 00:24:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> - <publishTime>11/28/2018 13:00:36</publishTime> + <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll"> - <publishTime>09/18/2018 19:38:10</publishTime> + <publishTime>09/19/2018 03:38:10</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -224,7 +224,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> - <publishTime>11/28/2018 12:58:44</publishTime> + <publishTime>11/28/2018 20:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -239,37 +239,37 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> - <publishTime>11/28/2018 13:01:26</publishTime> + <publishTime>11/28/2018 21:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> - <publishTime>11/28/2018 13:01:00</publishTime> + <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> - <publishTime>01/28/2015 04:02:18</publishTime> + <publishTime>01/28/2015 12:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> - <publishTime>02/11/2014 15:26:04</publishTime> + <publishTime>02/11/2014 23:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> - <publishTime>01/28/2015 04:02:32</publishTime> + <publishTime>01/28/2015 12:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -278,12 +278,12 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> - <publishTime>11/24/2014 11:18:48</publishTime> + <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>11/22/2022 20:24:13</publishTime> + <publishTime>11/27/2022 20:29:24</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/15/2021 17:59:43</publishTime> @@ -291,196 +291,196 @@ <File Include="bin/WebAPI.pdb"> <publishTime>11/14/2022 11:23:59</publishTime> <publishTime>11/02/2022 22:03:04</publishTime> - <publishTime>11/22/2022 20:24:13</publishTime> + <publishTime>11/27/2022 20:29:24</publishTime> </File> <File Include="bin/WebGrease.dll"> - <publishTime>07/17/2013 17:03:52</publishTime> + <publishTime>07/18/2013 01: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="Config/kdapi.config"> - <publishTime>08/19/2022 08:17:39</publishTime> + <publishTime>11/27/2022 14:22:07</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:07</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:07</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:07</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:08</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>11/01/2021 09:26:33</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Global.asax"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="grpc_csharp_ext.x86.dll"> - <publishTime>03/22/2022 05:17:22</publishTime> + <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> - <publishTime>03/18/2022 23:38:44</publishTime> + <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.so"> - <publishTime>03/18/2022 23:38:42</publishTime> + <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:09</publishTime> </File> <File Include="packages.config"> - <publishTime>05/09/2022 11:30:19</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/web.config"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>08/19/2021 09:44:01</publishTime> + <publishTime>11/27/2022 14:22:10</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>11/22/2022 10:33:25</publishTime> + <publishTime>11/27/2022 17:36:16</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>11/22/2022 10:33:24</publishTime> + <publishTime>11/27/2022 17:36:14</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>11/22/2022 10:33:25</publishTime> + <publishTime>11/27/2022 17:36:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>11/22/2022 10:33:24</publishTime> + <publishTime>11/27/2022 17:36:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>11/22/2022 10:33:25</publishTime> + <publishTime>11/27/2022 17:36:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>11/22/2022 10:33:24</publishTime> + <publishTime>11/27/2022 17:36:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>11/22/2022 10:33:26</publishTime> + <publishTime>11/27/2022 17:36:18</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>11/22/2022 10:33:29</publishTime> + <publishTime>11/27/2022 17:36:25</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>11/22/2022 10:33:27</publishTime> + <publishTime>11/27/2022 17:36:22</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>11/22/2022 10:33:26</publishTime> + <publishTime>11/27/2022 17:36:20</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>11/22/2022 10:33:28</publishTime> + <publishTime>11/27/2022 17:36:24</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>11/22/2022 10:33:27</publishTime> + <publishTime>11/27/2022 17:36:21</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>11/22/2022 10:33:26</publishTime> + <publishTime>11/27/2022 17:36:19</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>11/22/2022 10:33:28</publishTime> + <publishTime>11/27/2022 17:36:24</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>11/22/2022 10:33:27</publishTime> + <publishTime>11/27/2022 17:36:22</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>11/22/2022 10:33:28</publishTime> + <publishTime>11/27/2022 17:36:23</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>11/22/2022 10:33:26</publishTime> + <publishTime>11/27/2022 17:36:20</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> - <publishTime>11/22/2022 10:33:23</publishTime> + <publishTime>11/27/2022 17:36:13</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>11/22/2022 10:33:29</publishTime> + <publishTime>11/27/2022 17:36:26</publishTime> </File> <File Include="Web References/WebS/Reference.cs"> <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/Reference.map"> - <publishTime>11/22/2022 10:33:18</publishTime> + <publishTime>11/27/2022 17:36:04</publishTime> </File> <File Include="Web References/WebS/WebService1.disco"> <publishTime>12/20/2021 13:19:56</publishTime> @@ -491,7 +491,7 @@ <File Include="Web.config"> <publishTime>11/14/2022 11:24:08</publishTime> <publishTime>11/02/2022 22:03:20</publishTime> - <publishTime>11/22/2022 20:24:36</publishTime> + <publishTime>11/27/2022 17:42:05</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs index 5d9a852..69b9adb 100644 --- a/WebAPI/Properties/Settings.Designer.cs +++ b/WebAPI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -26,7 +26,7 @@ [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("http://192.168.63.195/WEBS-WMS/WebService1.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS/WebService1.asmx")] public string WebAPI_WebS_WebService1 { get { return ((string)(this["WebAPI_WebS_WebService1"])); diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings index 99860db..9ee11bf 100644 --- a/WebAPI/Properties/Settings.settings +++ b/WebAPI/Properties/Settings.settings @@ -3,7 +3,7 @@ <Profiles /> <Settings> <Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application"> - <Value Profile="(Default)">http://192.168.63.195/WEBS-WMS/WebService1.asmx</Value> + <Value Profile="(Default)">http://localhost/WEBS/WebService1.asmx</Value> </Setting> </Settings> </SettingsFile> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs index 074ab60..2aabd55 100644 --- a/WebAPI/Web References/WebS/Reference.cs +++ b/WebAPI/Web References/WebS/Reference.cs @@ -35,6 +35,8 @@ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsGy_BarCodeBill_WMS_Model))] public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol { + private System.Threading.SendOrPostCallback getDataSetBySQLOperationCompleted; + private System.Threading.SendOrPostCallback getRunProcOperationCompleted; private System.Threading.SendOrPostCallback getRunProcByMulOperationCompleted; @@ -124,6 +126,8 @@ private System.Threading.SendOrPostCallback get_SourceBarCode_SellOutOperationCompleted; private System.Threading.SendOrPostCallback get_SourceBarCode_EntrustOutOperationCompleted; + + private System.Threading.SendOrPostCallback get_SourceBarCode_OtherOutOperationCompleted; private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockOperationCompleted; @@ -220,8 +224,6 @@ private System.Threading.SendOrPostCallback getCheckCzymcOperationCompleted; private System.Threading.SendOrPostCallback getSub_GetCurPeriodOperationCompleted; - - private System.Threading.SendOrPostCallback getDataSetBySQLOperationCompleted; private System.Threading.SendOrPostCallback set_CheckPOInStockBill_NewOperationCompleted; @@ -1077,8 +1079,7 @@ /// <remarks/> public WebService1() { - //this.Url = global::WebAPI.Properties.Settings.Default.WebAPI_WebS_WebService1; - this.Url = System.Configuration.ConfigurationManager.AppSettings["sUrl"]; + this.Url = global::WebAPI.Properties.Settings.Default.WebAPI_WebS_WebService1; if ((this.IsLocalFileSystemWebService(this.Url) == true)) { this.UseDefaultCredentials = true; this.useDefaultCredentialsSetExplicitly = false; @@ -1111,6 +1112,9 @@ this.useDefaultCredentialsSetExplicitly = true; } } + + /// <remarks/> + public event getDataSetBySQLCompletedEventHandler getDataSetBySQLCompleted; /// <remarks/> public event getRunProcCompletedEventHandler getRunProcCompleted; @@ -1246,6 +1250,9 @@ /// <remarks/> public event get_SourceBarCode_EntrustOutCompletedEventHandler get_SourceBarCode_EntrustOutCompleted; + + /// <remarks/> + public event get_SourceBarCode_OtherOutCompletedEventHandler get_SourceBarCode_OtherOutCompleted; /// <remarks/> public event get_SourceBarCode_MoveStockCompletedEventHandler get_SourceBarCode_MoveStockCompleted; @@ -1390,9 +1397,6 @@ /// <remarks/> public event getSub_GetCurPeriodCompletedEventHandler getSub_GetCurPeriodCompleted; - - /// <remarks/> - public event getDataSetBySQLCompletedEventHandler getDataSetBySQLCompleted; /// <remarks/> public event set_CheckPOInStockBill_NewCompletedEventHandler set_CheckPOInStockBill_NewCompleted; @@ -2668,6 +2672,40 @@ /// <remarks/> public event GetSc_ICMOBillListCompletedEventHandler GetSc_ICMOBillListCompleted; + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getDataSetBySQL", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public System.Data.DataSet getDataSetBySQL(string sSQL, string sTable, ref string sErrMsg) { + object[] results = this.Invoke("getDataSetBySQL", new object[] { + sSQL, + sTable, + sErrMsg}); + sErrMsg = ((string)(results[1])); + return ((System.Data.DataSet)(results[0])); + } + + /// <remarks/> + public void getDataSetBySQLAsync(string sSQL, string sTable, string sErrMsg) { + this.getDataSetBySQLAsync(sSQL, sTable, sErrMsg, null); + } + + /// <remarks/> + public void getDataSetBySQLAsync(string sSQL, string sTable, string sErrMsg, object userState) { + if ((this.getDataSetBySQLOperationCompleted == null)) { + this.getDataSetBySQLOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetDataSetBySQLOperationCompleted); + } + this.InvokeAsync("getDataSetBySQL", new object[] { + sSQL, + sTable, + sErrMsg}, this.getDataSetBySQLOperationCompleted, userState); + } + + private void OngetDataSetBySQLOperationCompleted(object arg) { + if ((this.getDataSetBySQLCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.getDataSetBySQLCompleted(this, new getDataSetBySQLCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } /// <remarks/> [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getRunProc", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] @@ -5584,6 +5622,52 @@ } /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_OtherOut", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public ClsKf_ICStockBill_WMS get_SourceBarCode_OtherOut(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, ref string sErrMsg) { + object[] results = this.Invoke("get_SourceBarCode_OtherOut", new object[] { + HInterID, + HBillNo, + HBillType, + HSourceBillNo, + HSourceBillType, + HMaker, + HFIFOWhID, + HOWNERID, + sErrMsg}); + sErrMsg = ((string)(results[1])); + return ((ClsKf_ICStockBill_WMS)(results[0])); + } + + /// <remarks/> + public void get_SourceBarCode_OtherOutAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, string sErrMsg) { + this.get_SourceBarCode_OtherOutAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, sErrMsg, null); + } + + /// <remarks/> + public void get_SourceBarCode_OtherOutAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, string sErrMsg, object userState) { + if ((this.get_SourceBarCode_OtherOutOperationCompleted == null)) { + this.get_SourceBarCode_OtherOutOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_OtherOutOperationCompleted); + } + this.InvokeAsync("get_SourceBarCode_OtherOut", new object[] { + HInterID, + HBillNo, + HBillType, + HSourceBillNo, + HSourceBillType, + HMaker, + HFIFOWhID, + HOWNERID, + sErrMsg}, this.get_SourceBarCode_OtherOutOperationCompleted, userState); + } + + private void Onget_SourceBarCode_OtherOutOperationCompleted(object arg) { + if ((this.get_SourceBarCode_OtherOutCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.get_SourceBarCode_OtherOutCompleted(this, new get_SourceBarCode_OtherOutCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MoveStock", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStock(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, ref string sErrMsg) { object[] results = this.Invoke("get_SourceBarCode_MoveStock", new object[] { @@ -7941,40 +8025,6 @@ if ((this.getSub_GetCurPeriodCompleted != null)) { System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); this.getSub_GetCurPeriodCompleted(this, new getSub_GetCurPeriodCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); - } - } - - /// <remarks/> - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getDataSetBySQL", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public System.Data.DataSet getDataSetBySQL(string sSQL, string sTable, ref string sErrMsg) { - object[] results = this.Invoke("getDataSetBySQL", new object[] { - sSQL, - sTable, - sErrMsg}); - sErrMsg = ((string)(results[1])); - return ((System.Data.DataSet)(results[0])); - } - - /// <remarks/> - public void getDataSetBySQLAsync(string sSQL, string sTable, string sErrMsg) { - this.getDataSetBySQLAsync(sSQL, sTable, sErrMsg, null); - } - - /// <remarks/> - public void getDataSetBySQLAsync(string sSQL, string sTable, string sErrMsg, object userState) { - if ((this.getDataSetBySQLOperationCompleted == null)) { - this.getDataSetBySQLOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetDataSetBySQLOperationCompleted); - } - this.InvokeAsync("getDataSetBySQL", new object[] { - sSQL, - sTable, - sErrMsg}, this.getDataSetBySQLOperationCompleted, userState); - } - - private void OngetDataSetBySQLOperationCompleted(object arg) { - if ((this.getDataSetBySQLCompleted != null)) { - System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); - this.getDataSetBySQLCompleted(this, new getDataSetBySQLCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); } } @@ -40138,6 +40188,10 @@ private bool hStopflagField; + private System.DateTime hProduceDateField; + + private System.DateTime hExpiryDateField; + /// <remarks/> public long HItemID { get { @@ -40345,6 +40399,26 @@ } set { this.hStopflagField = value; + } + } + + /// <remarks/> + public System.DateTime HProduceDate { + get { + return this.hProduceDateField; + } + set { + this.hProduceDateField = value; + } + } + + /// <remarks/> + public System.DateTime HExpiryDate { + get { + return this.hExpiryDateField; + } + set { + this.hExpiryDateField = value; } } } @@ -40763,6 +40837,10 @@ private string hSubBillTypeField; private long hMulSourceBillField; + + private string hBeginDateField; + + private string hEndDateField; /// <remarks/> public long HItemID { @@ -41253,6 +41331,26 @@ this.hMulSourceBillField = value; } } + + /// <remarks/> + public string HBeginDate { + get { + return this.hBeginDateField; + } + set { + this.hBeginDateField = value; + } + } + + /// <remarks/> + public string HEndDate { + get { + return this.hEndDateField; + } + set { + this.hEndDateField = value; + } + } } /// <remarks/> @@ -41466,6 +41564,10 @@ private string kf_OtherOutBill_MaterWHSPCtlField; private string kf_OtherOutBill_SourceWHSPCtlField; + + private string kf_OtherOutBill_FIFOListField; + + private string kf_OtherOutBill_FIFOCtlField; private string kf_OtherOutBillCheck_MustQtyCtlField; @@ -42884,6 +42986,26 @@ } set { this.kf_OtherOutBill_SourceWHSPCtlField = value; + } + } + + /// <remarks/> + public string Kf_OtherOutBill_FIFOList { + get { + return this.kf_OtherOutBill_FIFOListField; + } + set { + this.kf_OtherOutBill_FIFOListField = value; + } + } + + /// <remarks/> + public string Kf_OtherOutBill_FIFOCtl { + get { + return this.kf_OtherOutBill_FIFOCtlField; + } + set { + this.kf_OtherOutBill_FIFOCtlField = value; } } @@ -45319,6 +45441,40 @@ /// <remarks/> [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + public delegate void getDataSetBySQLCompletedEventHandler(object sender, getDataSetBySQLCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class getDataSetBySQLCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal getDataSetBySQLCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public System.Data.DataSet Result { + get { + this.RaiseExceptionIfNecessary(); + return ((System.Data.DataSet)(this.results[0])); + } + } + + /// <remarks/> + public string sErrMsg { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[1])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getRunProcCompletedEventHandler(object sender, getRunProcCompletedEventArgs e); /// <remarks/> @@ -47145,6 +47301,40 @@ /// <remarks/> [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + public delegate void get_SourceBarCode_OtherOutCompletedEventHandler(object sender, get_SourceBarCode_OtherOutCompletedEventArgs e); + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class get_SourceBarCode_OtherOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal get_SourceBarCode_OtherOutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// <remarks/> + public ClsKf_ICStockBill_WMS Result { + get { + this.RaiseExceptionIfNecessary(); + return ((ClsKf_ICStockBill_WMS)(this.results[0])); + } + } + + /// <remarks/> + public string sErrMsg { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[1])); + } + } + } + + /// <remarks/> + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void get_SourceBarCode_MoveStockCompletedEventHandler(object sender, get_SourceBarCode_MoveStockCompletedEventArgs e); /// <remarks/> @@ -48843,40 +49033,6 @@ get { this.RaiseExceptionIfNecessary(); return ((int)(this.results[2])); - } - } - } - - /// <remarks/> - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] - public delegate void getDataSetBySQLCompletedEventHandler(object sender, getDataSetBySQLCompletedEventArgs e); - - /// <remarks/> - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class getDataSetBySQLCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - - private object[] results; - - internal getDataSetBySQLCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) { - this.results = results; - } - - /// <remarks/> - public System.Data.DataSet Result { - get { - this.RaiseExceptionIfNecessary(); - return ((System.Data.DataSet)(this.results[0])); - } - } - - /// <remarks/> - public string sErrMsg { - get { - this.RaiseExceptionIfNecessary(); - return ((string)(this.results[1])); } } } diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map index 0e75f26..9cbccab 100644 --- a/WebAPI/Web References/WebS/Reference.map +++ b/WebAPI/Web References/WebS/Reference.map @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Results> - <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://192.168.63.195/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" /> - <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://192.168.63.195/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> + <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS/WebService1.asmx?disco" filename="WebService1.disco" /> </Results> </DiscoveryClientResultsFile> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco index 04daac3..34b53d6 100644 --- a/WebAPI/Web References/WebS/WebService1.disco +++ b/WebAPI/Web References/WebS/WebService1.disco @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/"> - <contractRef ref="http://192.168.63.195/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://192.168.63.195/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> - <soap address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> - <soap address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <contractRef ref="http://localhost/WEBS/WebService1.asmx?wsdl" docRef="http://localhost/WEBS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> + <soap address="http://localhost/WEBS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> + <soap address="http://localhost/WEBS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> </discovery> \ No newline at end of file diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl index 824a2a6..8d6f402 100644 --- a/WebAPI/Web References/WebS/WebService1.wsdl +++ b/WebAPI/Web References/WebS/WebService1.wsdl @@ -2,6 +2,30 @@ <wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <wsdl:types> <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> + <s:element name="getDataSetBySQL"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="sSQL" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="sTable" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="getDataSetBySQLResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="getDataSetBySQLResult"> + <s:complexType> + <s:sequence> + <s:element ref="s:schema" /> + <s:any /> + </s:sequence> + </s:complexType> + </s:element> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> <s:element name="getRunProc"> <s:complexType> <s:sequence> @@ -561,6 +585,8 @@ <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBill_MultilineCtl" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBill_MaterWHSPCtl" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBill_SourceWHSPCtl" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBill_FIFOList" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBill_FIFOCtl" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBillCheck_MustQtyCtl" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBillCheck_WHSPCtl" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Kf_OtherOutBillCheck_MultilineCtl" type="s:string" /> @@ -1159,6 +1185,8 @@ <s:element minOccurs="0" maxOccurs="1" name="HCusBarCode" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="HSubBillType" type="s:string" /> <s:element minOccurs="1" maxOccurs="1" name="HMulSourceBill" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HBeginDate" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HEndDate" type="s:string" /> </s:sequence> </s:complexType> <s:element name="set_SaveDoorOutCheck_BarCodeResponse"> @@ -1614,6 +1642,29 @@ </s:sequence> </s:complexType> </s:element> + <s:element name="get_SourceBarCode_OtherOut"> + <s:complexType> + <s:sequence> + <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" /> + <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" /> + <s:element minOccurs="1" maxOccurs="1" name="HFIFOWhID" type="s:long" /> + <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" /> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="get_SourceBarCode_OtherOutResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_OtherOutResult" type="tns:ClsKf_ICStockBill_WMS" /> + <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> + </s:sequence> + </s:complexType> + </s:element> <s:element name="get_SourceBarCode_MoveStock"> <s:complexType> <s:sequence> @@ -1858,6 +1909,8 @@ <s:element minOccurs="1" maxOccurs="1" name="HinitQty" type="s:double" /> <s:element minOccurs="0" maxOccurs="1" name="HMTONo" type="s:string" /> <s:element minOccurs="1" maxOccurs="1" name="HStopflag" type="s:boolean" /> + <s:element minOccurs="1" maxOccurs="1" name="HProduceDate" type="s:dateTime" /> + <s:element minOccurs="1" maxOccurs="1" name="HExpiryDate" type="s:dateTime" /> </s:sequence> </s:complexType> <s:element name="get_SavePonderationBillMain_Temp_BarCodeResponse"> @@ -2833,30 +2886,6 @@ <s:element minOccurs="1" maxOccurs="1" name="getSub_GetCurPeriodResult" type="s:boolean" /> <s:element minOccurs="1" maxOccurs="1" name="sYear" type="s:int" /> <s:element minOccurs="1" maxOccurs="1" name="sPeriod" type="s:int" /> - </s:sequence> - </s:complexType> - </s:element> - <s:element name="getDataSetBySQL"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" maxOccurs="1" name="sSQL" type="s:string" /> - <s:element minOccurs="0" maxOccurs="1" name="sTable" type="s:string" /> - <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> - </s:sequence> - </s:complexType> - </s:element> - <s:element name="getDataSetBySQLResponse"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" maxOccurs="1" name="getDataSetBySQLResult"> - <s:complexType> - <s:sequence> - <s:element ref="s:schema" /> - <s:any /> - </s:sequence> - </s:complexType> - </s:element> - <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> @@ -12820,6 +12849,12 @@ </s:element> </s:schema> </wsdl:types> + <wsdl:message name="getDataSetBySQLSoapIn"> + <wsdl:part name="parameters" element="tns:getDataSetBySQL" /> + </wsdl:message> + <wsdl:message name="getDataSetBySQLSoapOut"> + <wsdl:part name="parameters" element="tns:getDataSetBySQLResponse" /> + </wsdl:message> <wsdl:message name="getRunProcSoapIn"> <wsdl:part name="parameters" element="tns:getRunProc" /> </wsdl:message> @@ -13089,6 +13124,12 @@ </wsdl:message> <wsdl:message name="get_SourceBarCode_EntrustOutSoapOut"> <wsdl:part name="parameters" element="tns:get_SourceBarCode_EntrustOutResponse" /> + </wsdl:message> + <wsdl:message name="get_SourceBarCode_OtherOutSoapIn"> + <wsdl:part name="parameters" element="tns:get_SourceBarCode_OtherOut" /> + </wsdl:message> + <wsdl:message name="get_SourceBarCode_OtherOutSoapOut"> + <wsdl:part name="parameters" element="tns:get_SourceBarCode_OtherOutResponse" /> </wsdl:message> <wsdl:message name="get_SourceBarCode_MoveStockSoapIn"> <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStock" /> @@ -13377,12 +13418,6 @@ </wsdl:message> <wsdl:message name="getSub_GetCurPeriodSoapOut"> <wsdl:part name="parameters" element="tns:getSub_GetCurPeriodResponse" /> - </wsdl:message> - <wsdl:message name="getDataSetBySQLSoapIn"> - <wsdl:part name="parameters" element="tns:getDataSetBySQL" /> - </wsdl:message> - <wsdl:message name="getDataSetBySQLSoapOut"> - <wsdl:part name="parameters" element="tns:getDataSetBySQLResponse" /> </wsdl:message> <wsdl:message name="set_CheckPOInStockBill_NewSoapIn"> <wsdl:part name="parameters" element="tns:set_CheckPOInStockBill_New" /> @@ -15935,6 +15970,10 @@ <wsdl:part name="parameters" element="tns:GetSc_ICMOBillListResponse" /> </wsdl:message> <wsdl:portType name="WebService1Soap"> + <wsdl:operation name="getDataSetBySQL"> + <wsdl:input message="tns:getDataSetBySQLSoapIn" /> + <wsdl:output message="tns:getDataSetBySQLSoapOut" /> + </wsdl:operation> <wsdl:operation name="getRunProc"> <wsdl:input message="tns:getRunProcSoapIn" /> <wsdl:output message="tns:getRunProcSoapOut" /> @@ -16114,6 +16153,10 @@ <wsdl:operation name="get_SourceBarCode_EntrustOut"> <wsdl:input message="tns:get_SourceBarCode_EntrustOutSoapIn" /> <wsdl:output message="tns:get_SourceBarCode_EntrustOutSoapOut" /> + </wsdl:operation> + <wsdl:operation name="get_SourceBarCode_OtherOut"> + <wsdl:input message="tns:get_SourceBarCode_OtherOutSoapIn" /> + <wsdl:output message="tns:get_SourceBarCode_OtherOutSoapOut" /> </wsdl:operation> <wsdl:operation name="get_SourceBarCode_MoveStock"> <wsdl:input message="tns:get_SourceBarCode_MoveStockSoapIn" /> @@ -16306,10 +16349,6 @@ <wsdl:operation name="getSub_GetCurPeriod"> <wsdl:input message="tns:getSub_GetCurPeriodSoapIn" /> <wsdl:output message="tns:getSub_GetCurPeriodSoapOut" /> - </wsdl:operation> - <wsdl:operation name="getDataSetBySQL"> - <wsdl:input message="tns:getDataSetBySQLSoapIn" /> - <wsdl:output message="tns:getDataSetBySQLSoapOut" /> </wsdl:operation> <wsdl:operation name="set_CheckPOInStockBill_New"> <wsdl:input message="tns:set_CheckPOInStockBill_NewSoapIn" /> @@ -18014,6 +18053,15 @@ </wsdl:portType> <wsdl:binding name="WebService1Soap" type="tns:WebService1Soap"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="getDataSetBySQL"> + <soap:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getRunProc"> <soap:operation soapAction="http://tempuri.org/getRunProc" style="document" /> <wsdl:input> @@ -18412,6 +18460,15 @@ </wsdl:operation> <wsdl:operation name="get_SourceBarCode_EntrustOut"> <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_EntrustOut" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="get_SourceBarCode_OtherOut"> + <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_OtherOut" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> @@ -18844,15 +18901,6 @@ </wsdl:operation> <wsdl:operation name="getSub_GetCurPeriod"> <soap:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getDataSetBySQL"> - <soap:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> @@ -22688,6 +22736,15 @@ </wsdl:binding> <wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="getDataSetBySQL"> + <soap12:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getRunProc"> <soap12:operation soapAction="http://tempuri.org/getRunProc" style="document" /> <wsdl:input> @@ -23086,6 +23143,15 @@ </wsdl:operation> <wsdl:operation name="get_SourceBarCode_EntrustOut"> <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_EntrustOut" style="document" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="get_SourceBarCode_OtherOut"> + <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_OtherOut" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> @@ -23518,15 +23584,6 @@ </wsdl:operation> <wsdl:operation name="getSub_GetCurPeriod"> <soap12:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" /> - <wsdl:input> - <soap12:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getDataSetBySQL"> - <soap12:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> @@ -27362,10 +27419,10 @@ </wsdl:binding> <wsdl:service name="WebService1"> <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap"> - <soap:address location="http://192.168.63.195/WEBS-WMS/WebService1.asmx" /> + <soap:address location="http://localhost/WEBS/WebService1.asmx" /> </wsdl:port> <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12"> - <soap12:address location="http://192.168.63.195/WEBS-WMS/WebService1.asmx" /> + <soap12:address location="http://localhost/WEBS/WebService1.asmx" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file diff --git a/WebAPI/Web.config b/WebAPI/Web.config index 681abba..6c1e60b 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -8,9 +8,9 @@ - <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > - <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> - </sectionGroup> + <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > + <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + </sectionGroup> </configSections> <connectionStrings> <add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" /> @@ -22,13 +22,13 @@ <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>--> <add key="FileIP" value="http://localhost:8080/" /> <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> --> - <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満--> + <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> --> <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧--> <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�--> <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ--> - <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> 鍏徃浜戞湇鍔″櫒--> + <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�--> <add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Enabled" value="false" /> @@ -96,7 +96,7 @@ </basicHttpBinding> </bindings> <client> - <endpoint address="http://192.168.80.90:9090/WEBS/WebService1.asmx" binding="basicHttpBinding" + <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> @@ -105,7 +105,7 @@ <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> - <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value> + <value>http://localhost/WEBS/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 6cfa500..0de35ea 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -91,6 +91,9 @@ <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath> </Reference> + <Reference Include="RestSharp, Version=104.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\RestSharp.104.0\lib\net4\RestSharp.dll</HintPath> + </Reference> <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL"> <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath> <Private>True</Private> @@ -956,10 +959,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <WebReferenceUrl Include="http://192.168.80.90:9090/WEBS/WebService1.asmx"> + <WebReferenceUrl Include="http://localhost/WEBS/WebService1.asmx"> <UrlBehavior>Dynamic</UrlBehavior> <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://192.168.80.90:9090/WEBS/WebService1.asmx</UpdateFromURL> + <UpdateFromURL>http://localhost/WEBS/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index b5bf336..75a0f3c 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>E:\GIT浠撳簱\ZYLMESWEBAPI\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> diff --git a/WebAPI/packages.config b/WebAPI/packages.config index 185dd60..bdf24fe 100644 --- a/WebAPI/packages.config +++ b/WebAPI/packages.config @@ -27,6 +27,7 @@ <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" /> <package id="NPOI" version="2.5.5" targetFramework="net45" /> <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net45" /> + <package id="RestSharp" version="104.0" targetFramework="net45" /> <package id="SharpZipLib" version="1.3.2" targetFramework="net45" /> <package id="Swashbuckle" version="5.0.0" targetFramework="net45" /> <package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" /> -- Gitblit v1.9.1