From 43ff921605507b117b6d2b57eb4b5633bd8f2a41 Mon Sep 17 00:00:00 2001 From: bobwang <8205347@qq.com> Date: Sat, 2 Nov 2024 21:03:22 +0800 Subject: [PATCH] add stock maintain to android interface --- Model/wms/data/WmsStockMaintain_Imp.cs | 25 +- Model/wms/tables/WmsStockMaintain.cs | 14 +- Utils/WmsConstants.cs | 2 + WcfService1/Android.svc.cs | 34 ++- WcfService1/BLL/lWmsStockPandian.cs | 37 ++- WcfService1/BLL/lbase.cs | 27 ++ WcfService1/IAndroid.cs | 10 + .../PublishProfiles/IISProfile1.pubxml.user | 2 +- winform/在库/StockMaintainQueryForm.resx | 2 +- winform/基础资料/DeskSetup.cs | 7 +- winform/基础资料/DeskSetup.designer.cs | 258 +++++++++++------- winform/基础资料/DeskSetup.resx | 122 ++++----- 12 files changed, 359 insertions(+), 181 deletions(-) diff --git a/Model/wms/data/WmsStockMaintain_Imp.cs b/Model/wms/data/WmsStockMaintain_Imp.cs index 97c6319..26ee9d9 100644 --- a/Model/wms/data/WmsStockMaintain_Imp.cs +++ b/Model/wms/data/WmsStockMaintain_Imp.cs @@ -5,6 +5,7 @@ ///on 06/21/2017 /// +using DeiNiu.Utils; using System; using System.Data.SqlClient; namespace DeiNiu.wms.Data.Model @@ -61,6 +62,8 @@ namespace DeiNiu.wms.Data.Model break; + + case 300: //issue data for maintain @@ -78,9 +81,15 @@ namespace DeiNiu.wms.Data.Model case 400: // 待维护商品列表[v_stockMaintainRecord] - _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo FROM v_stockgoodsMaintain WHERE (ISNULL(maintainDate ,getdate()-1)< getdate()) " + mObj.CmdParameters[0].ToString(); + _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo FROM v_stockgoodsMaintain WHERE " + + // " (ISNULL(maintainDate ,getdate()-1)< getdate()) " + + " nextMainTainDate < getdate() + " + WmsConstants.MAINTAIN_TASK_DAYS + + mObj.CmdParameters[0].ToString(); _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY [nextMainTainDate],part,locationId DESC"; - _strSql += ";SELECT COUNT(*) FROM v_stockgoods WHERE ( (ISNULL(maintainDate ,getdate()-1)< getdate())) " + mObj.CmdParameters[0].ToString(); + _strSql += ";SELECT COUNT(*) FROM v_stockgoodsMaintain WHERE " + + //"( (ISNULL(maintainDate ,getdate()-1)< getdate())) " + " nextMainTainDate < getdate() + " + WmsConstants.MAINTAIN_TASK_DAYS + + mObj.CmdParameters[0].ToString(); sqlCmd.CommandText = _strSql; sqlCmd.Parameters.AddWithValue("@START", this._rownumStart); sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd); @@ -125,7 +134,17 @@ namespace DeiNiu.wms.Data.Model sqlCmd.CommandText = _strSql; break; - + case 500: //根据货位的分区、巷道获取待养护的任务 + _strSql = "SELECT top 50 * FROM [v_stockGoodsMaintain] " + + " where nextMainTainDate < getdate() +" + WmsConstants.MAINTAIN_TASK_DAYS + + " and part=@part" + + " and channel =@channel" + + " order by shelf,layer,col "; ; + sqlCmd.CommandText = _strSql; + sqlCmd.Parameters.AddWithValue("@part", mObj.CmdParameters[0]); + sqlCmd.Parameters.AddWithValue("@channel", mObj.CmdParameters[1]); + sqlCmd.CommandText = _strSql; + break; } } } diff --git a/Model/wms/tables/WmsStockMaintain.cs b/Model/wms/tables/WmsStockMaintain.cs index e77be48..4cf4cc3 100644 --- a/Model/wms/tables/WmsStockMaintain.cs +++ b/Model/wms/tables/WmsStockMaintain.cs @@ -110,14 +110,12 @@ namespace DeiNiu.wms.Data.Model return CustQuery(440); } - - - - - - - - + public DataTable getMaintainTasksByLoc(int part, int channel, int shelf) + { + cmdParameters[0] = part; + cmdParameters[1] = channel; + return CustQuery(500).Tables[0]; + } } } \ No newline at end of file diff --git a/Utils/WmsConstants.cs b/Utils/WmsConstants.cs index 647226a..c663680 100644 --- a/Utils/WmsConstants.cs +++ b/Utils/WmsConstants.cs @@ -472,6 +472,8 @@ namespace DeiNiu.Utils public static string CURRENT_PANDIAN_ORDER=""; public static bool ERP_NOTICE_STOCK_OUT_DOING; + //--保养 + public static int MAINTAIN_TASK_DAYS = 20; //----light seeds diff --git a/WcfService1/Android.svc.cs b/WcfService1/Android.svc.cs index c54d8f3..9a7417a 100644 --- a/WcfService1/Android.svc.cs +++ b/WcfService1/Android.svc.cs @@ -921,7 +921,39 @@ namespace DeiNiu.Wcf return new FormatedResult(e); } } - + + //----保养 + public FormatedResult getMaintainTasksByLoc(string locationId) + { + try + { + + var result = pandian.getMaintainTasksByLoc(locationId); + + return new FormatedResult(JsonConvert.SerializeObject(result)); + + + } + catch (Exception e) + { + log.Error(e); + return new FormatedResult(e); + } + } + + public FormatedResult newMaintain(int stockId, decimal mCount, decimal issueCount, string details ) + { + try + { + var result = lstock.newMaintain(stockId, mCount, issueCount, details); + return new FormatedResult(JsonConvert.SerializeObject(result)); + } + catch (Exception e) + { + log.Error(e); + return new FormatedResult(e); + } + } //------------------------- stock In Request begin ------------------------------------------------------------------------------------------ diff --git a/WcfService1/BLL/lWmsStockPandian.cs b/WcfService1/BLL/lWmsStockPandian.cs index e346c3d..a2f2220 100644 --- a/WcfService1/BLL/lWmsStockPandian.cs +++ b/WcfService1/BLL/lWmsStockPandian.cs @@ -39,6 +39,23 @@ namespace DeiNiu.wms.Logical } } + WmsStockMaintain _maintainObj; + public WmsStockMaintain getWmsStockMaintain + { + get + { + if (_maintainObj == null) + { + _maintainObj = new WmsStockMaintain(); + + } + _maintainObj.operater = operId; + return _maintainObj; + } + } + + + WmsStockPandianResult _pandianItem; public WmsStockPandianResult getWmsStockPandianResult { @@ -597,6 +614,15 @@ namespace DeiNiu.wms.Logical } + public DataTable getMaintainTasksByLoc(string locationId) + { + WmsLocation loc = new WmsLocation(locationId); + + + return getWmsStockMaintain.getMaintainTasksByLoc(loc.part, loc.channel, loc.shelf); + + } + public DataTable getPandianTasksByLoc(string locationId) { WmsLocation loc = new WmsLocation(locationId); @@ -607,7 +633,7 @@ namespace DeiNiu.wms.Logical _obj = getWmsStockPandian.getCurrentPandianOrder(); - if(_obj.ID == 0) + if (_obj.ID == 0) { return new DataTable("noItems"); } @@ -616,7 +642,7 @@ namespace DeiNiu.wms.Logical DataTable dt = new DataTable("noItems"); - if(_obj.adjustStatus == (int)enumPandianAdjustStatus.已校正) + if (_obj.adjustStatus == (int)enumPandianAdjustStatus.已校正) { return dt; } @@ -624,7 +650,8 @@ namespace DeiNiu.wms.Logical if (status == enumPandianStatus.开始采集) { dt = getWmsStockPandian.getPandianTasksByLoc(loc.part, loc.channel, loc.shelf); - }else if(status == enumPandianStatus.采集结束) + } + else if (status == enumPandianStatus.采集结束) { dt = getWmsStockPandian.getPandianRunningDiff(loc.part); } @@ -632,7 +659,7 @@ namespace DeiNiu.wms.Logical { return dt; } - + if (!WmsConstants.PANDIAN_SHOW_CNT) { dt.Columns.Remove("avCount"); @@ -642,6 +669,8 @@ namespace DeiNiu.wms.Logical } + + void flowTaskCount(string panOrder,string goodsId,decimal count) { try diff --git a/WcfService1/BLL/lbase.cs b/WcfService1/BLL/lbase.cs index b874bc2..20d3a90 100644 --- a/WcfService1/BLL/lbase.cs +++ b/WcfService1/BLL/lbase.cs @@ -628,6 +628,33 @@ namespace DeiNiu.wms.Logical break; } } + + // dtSetup = new Node().QueryByFlag(2031); //保养 + dv.RowFilter = "parentId=" + 16899; + foreach (DataRowView dr in dv) + { + Node n = new Node(dr.Row); + int v = 1; + try + { + v = Convert.ToInt32(n.value); + } + catch (Exception er) + { + log.Error(er); + continue; + } + switch (n.flag) + { + case 1: + WmsConstants.MAINTAIN_TASK_DAYS = v; + break; + + } + } + + + dv.RowFilter = "parentId=" + 16669; WmsConstants.GOODS_WEIGHT_UNITS = new List(); foreach (DataRowView dr in dv) diff --git a/WcfService1/IAndroid.cs b/WcfService1/IAndroid.cs index e473985..337085d 100644 --- a/WcfService1/IAndroid.cs +++ b/WcfService1/IAndroid.cs @@ -316,6 +316,16 @@ namespace DeiNiu.Wcf UriTemplate = "stock/newPandianItem")] FormatedResult newPandianItem(string orderNo, string locationId, int mirrroId, string goodsId, string prdDate, string batch, decimal count); + [OperationContract] + [WebInvoke(Method = "GET", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, + UriTemplate = "stock/getMaintainTasksByLoc?locationId={locationId}")] + FormatedResult getMaintainTasksByLoc(string locationId); + + [OperationContract] + [WebInvoke(Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped, + UriTemplate = "stock/newMaintain")] + FormatedResult newMaintain(int stockId, decimal mCount, decimal issueCount, string details); + [OperationContract] diff --git a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user index cedd0c1..2377a91 100644 --- a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user +++ b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user @@ -7,7 +7,7 @@ - True|2024-11-01T14:49:02.9367010Z||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;True|2024-03-25T12:01:37.4878288+08:00||;True|2024-03-25T10:10:10.4413746+08:00||;True|2024-03-24T23:57:03.5029554+08:00||;False|2024-03-24T23:56:43.7721505+08:00||;True|2024-03-24T18:10:49.6225565+08:00||;True|2024-03-24T15:29:14.9321731+08:00||;True|2024-03-24T14:49:41.1781462+08:00||;True|2024-03-24T14:49:04.1910017+08:00||;True|2024-03-24T11:22:38.8056231+08:00||;True|2024-03-24T11:22:01.3920738+08:00||;True|2024-03-24T09:46:25.4088667+08:00||;True|2024-03-23T19:05:28.3426176+08:00||;True|2024-03-23T16:34:07.5416741+08:00||; + True|2024-11-02T12:34:37.6850648Z||;True|2024-11-02T20:33:22.3223896+08:00||;True|2024-11-02T19:45:31.8188247+08:00||;True|2024-11-02T18:39:44.9569699+08:00||;True|2024-11-02T18:34:57.3571628+08:00||;True|2024-11-01T22:49:02.9367010+08:00||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;True|2024-03-25T12:01:37.4878288+08:00||;True|2024-03-25T10:10:10.4413746+08:00||;True|2024-03-24T23:57:03.5029554+08:00||;False|2024-03-24T23:56:43.7721505+08:00||;True|2024-03-24T18:10:49.6225565+08:00||;True|2024-03-24T15:29:14.9321731+08:00||;True|2024-03-24T14:49:41.1781462+08:00||;True|2024-03-24T14:49:04.1910017+08:00||; \ No newline at end of file diff --git a/winform/在库/StockMaintainQueryForm.resx b/winform/在库/StockMaintainQueryForm.resx index fb5c040..37bcbc1 100644 --- a/winform/在库/StockMaintainQueryForm.resx +++ b/winform/在库/StockMaintainQueryForm.resx @@ -121,7 +121,7 @@ 17, 17 - 275, 17 + 274, 17 diff --git a/winform/基础资料/DeskSetup.cs b/winform/基础资料/DeskSetup.cs index d05891f..d55368b 100644 --- a/winform/基础资料/DeskSetup.cs +++ b/winform/基础资料/DeskSetup.cs @@ -835,7 +835,10 @@ namespace DeiNiu.wms.win query(); } - - + + private void btquery_Click(object sender, EventArgs e) + { + queryGoods(); + } } } \ No newline at end of file diff --git a/winform/基础资料/DeskSetup.designer.cs b/winform/基础资料/DeskSetup.designer.cs index 39246dc..029bd39 100644 --- a/winform/基础资料/DeskSetup.designer.cs +++ b/winform/基础资料/DeskSetup.designer.cs @@ -34,6 +34,7 @@ this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.btquery = new DevExpress.XtraEditors.SimpleButton(); this.gridControl2 = new DevExpress.XtraGrid.GridControl(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.btnUpdateOwner = new DevExpress.XtraEditors.SimpleButton(); @@ -55,13 +56,15 @@ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem(); this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem(); - this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.simpleSeparator1 = new DevExpress.XtraLayout.SimpleSeparator(); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); @@ -86,13 +89,15 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).BeginInit(); this.SuspendLayout(); // @@ -103,11 +108,12 @@ this.ribbon.ExpandCollapseItem, this.bbQuery}); this.ribbon.Location = new System.Drawing.Point(0, 0); + this.ribbon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ribbon.MaxItemId = 4; this.ribbon.Name = "ribbon"; this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { this.ribbonPage1}); - this.ribbon.Size = new System.Drawing.Size(1122, 147); + this.ribbon.Size = new System.Drawing.Size(1603, 225); // // bbQuery // @@ -133,6 +139,7 @@ // // layoutControl1 // + this.layoutControl1.Controls.Add(this.btquery); this.layoutControl1.Controls.Add(this.gridControl2); this.layoutControl1.Controls.Add(this.btnUpdateOwner); this.layoutControl1.Controls.Add(this.pager1); @@ -146,21 +153,35 @@ this.layoutControlGroup10, this.layoutControlGroup12, this.layoutControlGroup13}); - this.layoutControl1.Location = new System.Drawing.Point(0, 147); + this.layoutControl1.Location = new System.Drawing.Point(0, 225); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1689, 510, 450, 400); this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1122, 636); + this.layoutControl1.Size = new System.Drawing.Size(1603, 1005); this.layoutControl1.TabIndex = 2; this.layoutControl1.Text = "layoutControl1"; // + // btquery + // + this.btquery.Location = new System.Drawing.Point(41, 919); + this.btquery.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btquery.Name = "btquery"; + this.btquery.Size = new System.Drawing.Size(190, 32); + this.btquery.StyleController = this.layoutControl1; + this.btquery.TabIndex = 66; + this.btquery.Text = "刷新"; + this.btquery.Click += new System.EventHandler(this.btquery_Click); + // // gridControl2 // - this.gridControl2.Location = new System.Drawing.Point(645, 118); + this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.gridControl2.Location = new System.Drawing.Point(921, 185); this.gridControl2.MainView = this.gridView2; + this.gridControl2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.gridControl2.MenuManager = this.ribbon; this.gridControl2.Name = "gridControl2"; - this.gridControl2.Size = new System.Drawing.Size(663, 565); + this.gridControl2.Size = new System.Drawing.Size(947, 888); this.gridControl2.TabIndex = 65; this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView2}); @@ -172,9 +193,10 @@ // // btnUpdateOwner // - this.btnUpdateOwner.Location = new System.Drawing.Point(26, 573); + this.btnUpdateOwner.Location = new System.Drawing.Point(237, 919); + this.btnUpdateOwner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnUpdateOwner.Name = "btnUpdateOwner"; - this.btnUpdateOwner.Size = new System.Drawing.Size(75, 25); + this.btnUpdateOwner.Size = new System.Drawing.Size(189, 32); this.btnUpdateOwner.StyleController = this.layoutControl1; this.btnUpdateOwner.TabIndex = 61; this.btnUpdateOwner.Text = "修改"; @@ -182,22 +204,25 @@ // // pager1 // - this.pager1.Location = new System.Drawing.Point(14, 420); + this.pager1.Location = new System.Drawing.Point(22, 785); + this.pager1.Margin = new System.Windows.Forms.Padding(6); this.pager1.Name = "pager1"; this.pager1.NMax = 0; this.pager1.PageCount = 0; this.pager1.PageCurrent = 0; this.pager1.PageSize = 100; - this.pager1.Size = new System.Drawing.Size(1094, 20); + this.pager1.Size = new System.Drawing.Size(1559, 20); this.pager1.TabIndex = 22; // // gridControl1 // - this.gridControl1.Location = new System.Drawing.Point(14, 33); + this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.gridControl1.Location = new System.Drawing.Point(22, 52); this.gridControl1.MainView = this.gridView1; + this.gridControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.gridControl1.MenuManager = this.ribbon; this.gridControl1.Name = "gridControl1"; - this.gridControl1.Size = new System.Drawing.Size(1094, 383); + this.gridControl1.Size = new System.Drawing.Size(1559, 727); this.gridControl1.TabIndex = 21; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -210,38 +235,42 @@ // // comType // - this.comType.Location = new System.Drawing.Point(101, 475); + this.comType.Location = new System.Drawing.Point(152, 860); + this.comType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comType.MenuManager = this.ribbon; this.comType.Name = "comType"; this.comType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.comType.Size = new System.Drawing.Size(104, 20); + this.comType.Size = new System.Drawing.Size(66, 28); this.comType.StyleController = this.layoutControl1; this.comType.TabIndex = 64; // // comStatus // - this.comStatus.Location = new System.Drawing.Point(101, 499); + this.comStatus.Location = new System.Drawing.Point(360, 860); + this.comStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comStatus.Name = "comStatus"; this.comStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.comStatus.Size = new System.Drawing.Size(104, 20); + this.comStatus.Size = new System.Drawing.Size(66, 28); this.comStatus.StyleController = this.layoutControl1; this.comStatus.TabIndex = 64; // // txtSeedsCnt // - this.txtSeedsCnt.Location = new System.Drawing.Point(101, 523); + this.txtSeedsCnt.Location = new System.Drawing.Point(360, 884); + this.txtSeedsCnt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtSeedsCnt.Name = "txtSeedsCnt"; - this.txtSeedsCnt.Size = new System.Drawing.Size(104, 20); + this.txtSeedsCnt.Size = new System.Drawing.Size(66, 28); this.txtSeedsCnt.StyleController = this.layoutControl1; this.txtSeedsCnt.TabIndex = 64; // // txtMin // - this.txtMin.Location = new System.Drawing.Point(101, 548); + this.txtMin.Location = new System.Drawing.Point(152, 884); + this.txtMin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtMin.Name = "txtMin"; - this.txtMin.Size = new System.Drawing.Size(104, 20); + this.txtMin.Size = new System.Drawing.Size(66, 28); this.txtMin.StyleController = this.layoutControl1; this.txtMin.TabIndex = 64; // @@ -284,7 +313,7 @@ this.layoutControlGroup4}); this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup1.Name = "Root"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1122, 636); + this.layoutControlGroup1.Size = new System.Drawing.Size(1603, 1005); this.layoutControlGroup1.TextVisible = false; // // layoutControlGroup4 @@ -296,7 +325,7 @@ this.simpleSeparator1}); this.layoutControlGroup4.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup4.Name = "layoutControlGroup4"; - this.layoutControlGroup4.Size = new System.Drawing.Size(1122, 636); + this.layoutControlGroup4.Size = new System.Drawing.Size(1603, 1005); this.layoutControlGroup4.Text = "复核台列表"; // // layoutControlGroup6 @@ -308,15 +337,15 @@ this.layoutControlGroup8}); this.layoutControlGroup6.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup6.Name = "layoutControlGroup6"; - this.layoutControlGroup6.Size = new System.Drawing.Size(1098, 591); + this.layoutControlGroup6.Size = new System.Drawing.Size(1565, 934); this.layoutControlGroup6.TextVisible = false; // // layoutControlItem19 // this.layoutControlItem19.Control = this.pager1; - this.layoutControlItem19.Location = new System.Drawing.Point(0, 387); + this.layoutControlItem19.Location = new System.Drawing.Point(0, 733); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(1098, 24); + this.layoutControlItem19.Size = new System.Drawing.Size(1565, 26); this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem19.TextVisible = false; // @@ -325,7 +354,7 @@ this.layoutControlItem18.Control = this.gridControl1; this.layoutControlItem18.Location = new System.Drawing.Point(0, 0); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.Size = new System.Drawing.Size(1098, 387); + this.layoutControlItem18.Size = new System.Drawing.Size(1565, 733); this.layoutControlItem18.Text = "待入库订单"; this.layoutControlItem18.TextLocation = DevExpress.Utils.Locations.Top; this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); @@ -335,16 +364,18 @@ // this.layoutControlGroup8.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem14, - this.emptySpaceItem8, this.emptySpaceItem4, - this.emptySpaceItem1, - this.layoutControlItem5, this.layoutControlItem3, + this.layoutControlItem1, this.layoutControlItem9, - this.layoutControlItem1}); - this.layoutControlGroup8.Location = new System.Drawing.Point(0, 411); + this.emptySpaceItem1, + this.emptySpaceItem3, + this.emptySpaceItem2, + this.layoutControlItem4, + this.layoutControlItem5}); + this.layoutControlGroup8.Location = new System.Drawing.Point(0, 759); this.layoutControlGroup8.Name = "layoutControlGroup8"; - this.layoutControlGroup8.Size = new System.Drawing.Size(1098, 180); + this.layoutControlGroup8.Size = new System.Drawing.Size(1565, 175); this.layoutControlGroup8.Text = "更新"; // // layoutControlItem14 @@ -354,55 +385,25 @@ this.layoutControlItem14.MaxSize = new System.Drawing.Size(183, 24); this.layoutControlItem14.MinSize = new System.Drawing.Size(183, 24); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(287, 24); + this.layoutControlItem14.Size = new System.Drawing.Size(183, 24); this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem14.Text = "类型"; this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Left; - this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14); - // - // emptySpaceItem8 - // - this.emptySpaceItem8.AllowHotTrack = false; - this.emptySpaceItem8.Location = new System.Drawing.Point(183, 24); - this.emptySpaceItem8.MinSize = new System.Drawing.Size(104, 24); - this.emptySpaceItem8.Name = "emptySpaceItem8"; - this.emptySpaceItem8.Size = new System.Drawing.Size(104, 103); - this.emptySpaceItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22); // // emptySpaceItem4 // this.emptySpaceItem4.AllowHotTrack = false; - this.emptySpaceItem4.Location = new System.Drawing.Point(287, 0); + this.emptySpaceItem4.Location = new System.Drawing.Point(391, 0); this.emptySpaceItem4.Name = "emptySpaceItem4"; - this.emptySpaceItem4.Size = new System.Drawing.Size(787, 137); + this.emptySpaceItem4.Size = new System.Drawing.Size(1136, 107); this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0); // - // emptySpaceItem1 - // - this.emptySpaceItem1.AllowHotTrack = false; - this.emptySpaceItem1.Location = new System.Drawing.Point(0, 127); - this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(287, 10); - this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.btnUpdateOwner; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 98); - this.layoutControlItem5.MaxSize = new System.Drawing.Size(79, 29); - this.layoutControlItem5.MinSize = new System.Drawing.Size(79, 29); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(183, 29); - this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem5.TextVisible = false; - // // layoutControlItem3 // this.layoutControlItem3.Control = this.comStatus; this.layoutControlItem3.CustomizationFormText = "类型"; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem3.Location = new System.Drawing.Point(208, 0); this.layoutControlItem3.MaxSize = new System.Drawing.Size(183, 24); this.layoutControlItem3.MinSize = new System.Drawing.Size(183, 24); this.layoutControlItem3.Name = "layoutControlItem3"; @@ -410,27 +411,13 @@ this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem3.Text = "状态"; this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Left; - this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txtSeedsCnt; - this.layoutControlItem9.CustomizationFormText = "类型"; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 48); - this.layoutControlItem9.MaxSize = new System.Drawing.Size(183, 25); - this.layoutControlItem9.MinSize = new System.Drawing.Size(183, 25); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(183, 25); - this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem9.Text = "最大分播数量"; - this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Left; - this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14); + this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22); // // layoutControlItem1 // this.layoutControlItem1.Control = this.txtMin; this.layoutControlItem1.CustomizationFormText = "类型"; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 73); + this.layoutControlItem1.Location = new System.Drawing.Point(0, 24); this.layoutControlItem1.MaxSize = new System.Drawing.Size(183, 25); this.layoutControlItem1.MinSize = new System.Drawing.Size(183, 25); this.layoutControlItem1.Name = "layoutControlItem1"; @@ -438,22 +425,88 @@ this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem1.Text = "最小分播数量"; this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Left; - this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14); + this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txtSeedsCnt; + this.layoutControlItem9.CustomizationFormText = "类型"; + this.layoutControlItem9.Location = new System.Drawing.Point(208, 24); + this.layoutControlItem9.MaxSize = new System.Drawing.Size(183, 25); + this.layoutControlItem9.MinSize = new System.Drawing.Size(183, 25); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.Size = new System.Drawing.Size(183, 25); + this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem9.Text = "最大分播数量"; + this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Left; + this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22); + // + // emptySpaceItem1 + // + this.emptySpaceItem1.AllowHotTrack = false; + this.emptySpaceItem1.Location = new System.Drawing.Point(183, 0); + this.emptySpaceItem1.MaxSize = new System.Drawing.Size(25, 49); + this.emptySpaceItem1.MinSize = new System.Drawing.Size(25, 49); + this.emptySpaceItem1.Name = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(25, 49); + this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); + // + // emptySpaceItem3 + // + this.emptySpaceItem3.AllowHotTrack = false; + this.emptySpaceItem3.Location = new System.Drawing.Point(0, 97); + this.emptySpaceItem3.Name = "emptySpaceItem3"; + this.emptySpaceItem3.Size = new System.Drawing.Size(391, 10); + this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.btnUpdateOwner; + this.layoutControlItem5.Location = new System.Drawing.Point(196, 59); + this.layoutControlItem5.MaxSize = new System.Drawing.Size(195, 38); + this.layoutControlItem5.MinSize = new System.Drawing.Size(195, 38); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(195, 38); + this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem5.TextVisible = false; + // + // emptySpaceItem2 + // + this.emptySpaceItem2.AllowHotTrack = false; + this.emptySpaceItem2.Location = new System.Drawing.Point(0, 49); + this.emptySpaceItem2.Name = "emptySpaceItem2"; + this.emptySpaceItem2.Size = new System.Drawing.Size(391, 10); + this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.btquery; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 59); + this.layoutControlItem4.MaxSize = new System.Drawing.Size(196, 38); + this.layoutControlItem4.MinSize = new System.Drawing.Size(196, 38); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(196, 38); + this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem4.TextVisible = false; // // simpleSeparator1 // this.simpleSeparator1.AllowHotTrack = false; - this.simpleSeparator1.Location = new System.Drawing.Point(0, 591); + this.simpleSeparator1.Location = new System.Drawing.Point(0, 934); this.simpleSeparator1.Name = "simpleSeparator1"; - this.simpleSeparator1.Size = new System.Drawing.Size(1098, 2); + this.simpleSeparator1.Size = new System.Drawing.Size(1565, 3); // // DeskSetup // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1122, 783); + this.ClientSize = new System.Drawing.Size(1603, 1230); this.Controls.Add(this.layoutControl1); this.Controls.Add(this.ribbon); + this.Margin = new System.Windows.Forms.Padding(10, 14, 10, 14); this.Name = "DeskSetup"; this.Ribbon = this.ribbon; this.Text = "OwnerSetup"; @@ -481,13 +534,15 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -522,7 +577,6 @@ private DevExpress.XtraEditors.TextEdit txtSeedsCnt; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem8; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; @@ -530,5 +584,9 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraEditors.TextEdit txtMin; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraEditors.SimpleButton btquery; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; } } \ No newline at end of file diff --git a/winform/基础资料/DeskSetup.resx b/winform/基础资料/DeskSetup.resx index a883725..2f715b2 100644 --- a/winform/基础资料/DeskSetup.resx +++ b/winform/基础资料/DeskSetup.resx @@ -118,77 +118,77 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 205, 17 + 17, 17 - 17, 17 + 274, 17 - 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