diff --git a/Model/base/BaseOperModel.cs b/Model/base/BaseOperModel.cs index 73e8ca2..70e77c6 100644 --- a/Model/base/BaseOperModel.cs +++ b/Model/base/BaseOperModel.cs @@ -13,7 +13,7 @@ namespace DeiNiu.Data.BaseObject internal int _operater; internal string _create_time = String.Empty; internal string _lastmodified = String.Empty; - + protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon"); public Object[] CmdParameters { get diff --git a/Model/wms/data/WmsGoods_Imp.cs b/Model/wms/data/WmsGoods_Imp.cs index cc7f509..b3fe6a9 100644 --- a/Model/wms/data/WmsGoods_Imp.cs +++ b/Model/wms/data/WmsGoods_Imp.cs @@ -78,7 +78,7 @@ namespace DeiNiu.wms.Data.Model case 610: // select goods packing by barcode - _strSql = "select * from v_wmsgoods g where barcode = @barcode or exists ( SELECT 1 FROM v_erpGoodsBarcods WHERE goodsId =g.goodsId and barcode = @barcode)"; + _strSql = "select * from v_wmsgoods g where ( barcode = @barcode or goodsid =@barcode) or exists ( SELECT 1 FROM v_erpGoodsBarcods WHERE goodsId =g.goodsId and barcode = @barcode)"; sqlCmd.CommandText = _strSql; sqlCmd.Parameters.AddWithValue("@barcode", mObj.CmdParameters[0]); diff --git a/Model/wms/data/WmsInRequest_Imp.cs b/Model/wms/data/WmsInRequest_Imp.cs index db757e0..683bea5 100644 --- a/Model/wms/data/WmsInRequest_Imp.cs +++ b/Model/wms/data/WmsInRequest_Imp.cs @@ -209,14 +209,14 @@ namespace DeiNiu.wms.Data.Model break; case 1000: // 验收结果货位分配明细 col = "[分区] ,[商品名称] ,[货位] ,[应上数] ,box,[实上数] ,[sku] ,[inPreOrder] ,[上架码] " + - ",state ,[diffCount] ,[portId] ,[partionEmpId],[partion], [unit] ,[typeName] ,[batch],[spec],bigCount,[manufacturer] ,[validDate],[productDate] ,vender,orderNo"; + ",state ,[diffCount] ,[portId] ,[partionEmpId],[partion], [unit] ,[typeName] ,[batch],[spec],bigCount,[manufacturer] ,[validDate],[productDate] ,vender,orderNo,goodsId,barcode "; _strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 " + - " and flowType=@flowType " + + // " and flowType=@flowType " + " and (state =@state or state =@statepart) " + " and partion is not null " + // " and stackState=@taskState "; " and stackState<@taskState "; - sqlCmd.Parameters.AddWithValue("@flowType",(int)EnumFlowTaskType.入库上架); + // sqlCmd.Parameters.AddWithValue("@flowType",(int)EnumFlowTaskType.入库上架); sqlCmd.Parameters.AddWithValue("@state", (int)enumInStockDetailStatus.已分配货位); sqlCmd.Parameters.AddWithValue("@statepart", (int)enumInStockDetailStatus.部分上架); // _strSql = " SELECT distinct * FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 "; diff --git a/Model/wms/data/WmsOutPickPort_Imp.cs b/Model/wms/data/WmsOutPickPort_Imp.cs index de45017..4845db6 100644 --- a/Model/wms/data/WmsOutPickPort_Imp.cs +++ b/Model/wms/data/WmsOutPickPort_Imp.cs @@ -477,6 +477,22 @@ namespace DeiNiu.wms.Data.Model break; + case 1130: //getFreeTasks by jobNo + _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] WHERE " + + " jobNo =@jobNo" + + // " and elabId =0 " + + " and isnull(takeBy,0) =0 " + + + // " order by priority desc,lineId,lineorder, pickorderNo , virtialCnt," + + " order by warehouse,partion,channel,shelf,col,layer,goodsid"; + sqlCmd.CommandText = _strSql; + // LogHelper.debug(GetType(), _strSql); + //sqlCmd.Parameters.AddWithValue("@takeBy", 5000); + // sqlCmd.Parameters.AddWithValue("@cnt", 5000); + sqlCmd.Parameters.AddWithValue("@jobNo", mObj.CmdParameters[0]); + + break; + case 1200: //getAssignedTasks by takeby _strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] WHERE 1=1 "; 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/data/Wmslocation_Imp.cs b/Model/wms/data/Wmslocation_Imp.cs index 1d36a46..322f541 100644 --- a/Model/wms/data/Wmslocation_Imp.cs +++ b/Model/wms/data/Wmslocation_Imp.cs @@ -57,9 +57,8 @@ namespace DeiNiu.wms.Data.Model string locationId = mObj.CmdParameters[0].ToString(); _strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC with(nolock) WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationStatus.正常 + " and (isnull(ownerCode,@ownerCode) =@ownerCode or ownerCode ='') " - + " AND ( goodsType =@GOODTYPE or goodstype=0 ) " - + " AND (LOC.WHTYPE>0 or warehouse =@warehouse) " + - // +" AND (LOC.WHTYPE>0 or goodsType =@GOODTYPE) " + + + " AND ( goodsType =@GOODTYPE or isnull(GOODSTYPE,0)=0 ) " + + " AND (LOC.WHTYPE>0 or warehouse =@warehouse) " + " AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE " + " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK with(nolock) WHERE " + " LOCATIONID = LOC.LOCATIONID" + diff --git a/Model/wms/tables/WmsOutPickPort.cs b/Model/wms/tables/WmsOutPickPort.cs index 35a2b0e..b454e51 100644 --- a/Model/wms/tables/WmsOutPickPort.cs +++ b/Model/wms/tables/WmsOutPickPort.cs @@ -250,6 +250,19 @@ namespace DeiNiu.wms.Data.Model return CustQuery(1120).Tables[0]; } + /// + /// 根据任务编号获取任务明显 + /// + /// + /// + public DataTable getFreeTasksByJob(string jobNo) + { + cmdParameters[0] = jobNo; + + return CustQuery(1130).Tables[0]; + } + + /// /// /// @@ -430,16 +443,16 @@ namespace DeiNiu.wms.Data.Model string viewName = "[v_stockOutPortSumLight]"; if (isLight) { - viewName = "[v_stockOutPortSumLight]";//按jobNo亮灯摘果 + viewName = "[v_stockOutPortSumLight]";//按jobNo亮灯摘果, 打印的条码为jobNo } else if (wareHouse > 0) { - viewName = "[v_stockOutPortSumNoLightByJobNo]";//分区按jobNo 获取任务 + viewName = "[v_stockOutPortSumNoLightByJobNo]";//分区按jobNo 获取任务, 打印的条码为jobNo } else { - viewName = "[v_stockOutPortSumNoLightByPickOrder]"; //按pickOrder 全仓按单拣选 + viewName = "[v_stockOutPortSumNoLightByPickOrder]"; //按pickOrder 全仓按单拣选, 打印的条码为pickorderNo } cmdParameters[6] = viewName; return CustQuery(2230).Tables[0]; 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/Model/wms/tables/Wmslocation.cs b/Model/wms/tables/Wmslocation.cs index 9a9ee17..045799a 100644 --- a/Model/wms/tables/Wmslocation.cs +++ b/Model/wms/tables/Wmslocation.cs @@ -12,6 +12,7 @@ using System.Text; using System.Data; using System.Data.SqlClient; using DeiNiu.Utils; +using System.Collections; namespace DeiNiu.wms.Data.Model { @@ -119,7 +120,7 @@ namespace DeiNiu.wms.Data.Model { // throw new Exception( string .Format("没有库位，请创建库位,库位类型 {0}, part {1}, abc {2} ", volType.ToString(),part,abc)); - return new WmsLocation("11.01.01.11"); + return new WmsLocation(WmsConstants.TMP_BULK_LOCATION); } @@ -204,6 +205,7 @@ namespace DeiNiu.wms.Data.Model { List newLocs = new List(); + decimal goodsMaxcnt = goods.getMaxCount((int)volType); if (count > 0) @@ -220,7 +222,7 @@ namespace DeiNiu.wms.Data.Model try { - newLocs = nearLocation.getFreeLocation(nearLocation, enumWhType.合格库, locCnt); + newLocs = nearLocation.getFreeLocation(nearLocation, goods.goodsId, 0, enumWhType.合格库, locCnt); } catch (DeiNiuNoFreeLocationkException er) //大小整货位不足 @@ -240,8 +242,9 @@ namespace DeiNiu.wms.Data.Model return CustOper(720) ; } - public List getFreeLocation(WmsLocation nearLocation,enumWhType whType,int count =1 ) + public List getFreeLocation(WmsLocation nearLocation,string goodsId,int skuId,enumWhType whType,int count =1 ) { + log.Debug(string.Format("to get new locations, goodsid:{0},skuId:{1},whType:{2}, location count{3},nearlocationId:{4}", goodsId, skuId, count, nearLocation.locationId)); List locations = new List(); if (nearLocation != null && nearLocation.warehouse == 0 ) @@ -252,11 +255,24 @@ namespace DeiNiu.wms.Data.Model throw new DeiNiuException("请设置商品的默认库房存储分区信息"); } } + if (String.IsNullOrEmpty(nearLocation.locationId)) + { + DataTable dt = new WmsStock().querySameGoodsLocations(goodsId, (enumWhLocVol)nearLocation.volType, skuId, "", whType); + if (skuId > 0 && dt.Rows.Count == 0) // 无相关批次库存， 找其他批次 + { + dt = new WmsStock().querySameGoodsLocations(goodsId, enumWhLocVol.零库, 0, "", whType); + + } + foreach (DataRow dr in dt.Rows) // + { + nearLocation.locationId = new WmsStock(dr).locationId; + break; + } + } + - LogHelper.debug(GetType(), "start to get locations...>"); - - LogHelper.debug(GetType(), Util.getJson(nearLocation)); + log.Debug("start to get locations......." + nearLocation); cmdParameters[0] = nearLocation.locationId; cmdParameters[1] = nearLocation.goodsType; @@ -283,7 +299,7 @@ namespace DeiNiu.wms.Data.Model } if (freeCnt < count) { - LogHelper.debug(this.GetType(), "1 to free location in stock , whtype? " + whType); + log.Debug( "1 to free location in stock , whtype? " + whType); freeLocations(); ds = CustQuery(300); } @@ -299,7 +315,7 @@ namespace DeiNiu.wms.Data.Model if (freeCnt >= count) { - LogHelper.debug(GetType(), " end get locations...<<"); + log.Debug( " end get locations...<<"); return locations; } } @@ -308,19 +324,19 @@ namespace DeiNiu.wms.Data.Model if (freeCnt > 0 ) //未找到足够空货位 { - LogHelper.debug(this.GetType(), "2 to free location in stock , whtype? " + whType); + log.Debug("2 to free location in stock , whtype? " + whType); freeLocations(); string error = string.Format("货区 {3} volType {2} 空货位不足，需要{0}个，找到{1}个。", count, locations.Count,nearLocation.volType,nearLocation.warehouse); - LogHelper.debug(GetType(),error); + log.Error(error); } else - { - LogHelper.debug(GetType(), " end get locations...<<"); + { + log.Debug(" end get locations...<<"); throw new DeiNiuNoFreeLocationkException(); } - LogHelper.debug(GetType(), " end get locations...<<"); + log.Debug(" end get locations...<<"); return locations; } diff --git a/Utils/WmsConstants.cs b/Utils/WmsConstants.cs index 647226a..f758f92 100644 --- a/Utils/WmsConstants.cs +++ b/Utils/WmsConstants.cs @@ -379,8 +379,8 @@ namespace DeiNiu.Utils public static bool PDA_LOC_GOODTYPE_VALIDATION=true; public static bool NO_FREE_LOCATION_USE_TMP=true; - public static string TMP_BULK_LOCATION="11.01.01.11"; - public static string TMP_BATCH_LOCATION = "11.01.01.11"; + public static string TMP_BULK_LOCATION="临时库位"; + public static string TMP_BATCH_LOCATION = "临时库位"; public static string TMP_LACK_DEBIT_LOCATION = "缺货虚拟货位";//拣货时系统库存不足，但未进系统的待入货物从此周转，借用 public static bool BOX_BULK_IN_SINGLE_LOC=true; //拆箱入零库，一箱上单个货位，减少分拆上货花费成本。 public static bool VALID_LOC_CAPICITY = false;//是否验证货位库容 @@ -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/lWmsInRequest.cs b/WcfService1/BLL/lWmsInRequest.cs index a949c58..ff3f2b8 100644 --- a/WcfService1/BLL/lWmsInRequest.cs +++ b/WcfService1/BLL/lWmsInRequest.cs @@ -691,7 +691,7 @@ namespace DeiNiu.wms.Logical logIn.Debug(string.Format("需 {0} 型新库位 {1}", enumWhLocVol.不合格区, cnt)); try { - locs = nearLoc.getFreeLocation(nearLoc, (enumWhType)requestDetail.whType, cnt); + locs = nearLoc.getFreeLocation(nearLoc, goodsId, skuId, (enumWhType)requestDetail.whType, cnt); logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.不合格区, locs.Count)); foreach (WmsLocation loc in locs) { @@ -1198,7 +1198,7 @@ namespace DeiNiu.wms.Logical List locs = null; try { - locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt); + locs = nearLocation.getFreeLocation(nearLocation,goodsId,skuId, (enumWhType)requestDetail.whType, locCnt); logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.大整, locs.Count)); foreach (WmsLocation loc in locs) { @@ -1239,7 +1239,7 @@ namespace DeiNiu.wms.Logical List locs = null; try { - locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt); + locs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt); logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.中整, locs.Count)); foreach (WmsLocation loc in locs) { @@ -1278,7 +1278,7 @@ namespace DeiNiu.wms.Logical logIn.Debug(string.Format("需 {0} 型新库位 {1}", enumWhLocVol.小整, locCnt)); try { - locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt); + locs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt); logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.小整, locs.Count)); foreach (WmsLocation loc in locs) { @@ -1320,7 +1320,7 @@ namespace DeiNiu.wms.Logical try { - locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt); + locs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt); foreach (WmsLocation loc in locs) { decimal c2 = batch2Cnt > batchMax2 ? batchMax2 : batch2Cnt; @@ -1399,7 +1399,7 @@ namespace DeiNiu.wms.Logical logIn.Debug(string.Format("需 {0} 型新库位 {1}", enumWhLocVol.零库, locCnt)); try { - locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt); + locs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt); logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.零库, locs.Count)); foreach (WmsLocation loc in locs) { @@ -2353,18 +2353,14 @@ namespace DeiNiu.wms.Logical logIn.Debug("to check all jobs in validin detail " + inPort.detailId); - if (inPort.isDoneByDetailId(inPort.detailId) ) + if (inPort.recType != (int)enumStockRecordType.补零入库 && inPort.isDoneByDetailId(inPort.detailId) ) { - logIn.Debug(" isDoneByDetailId ? " + true); - - + logIn.Debug(" isDoneByDetailId ? " + true); - getWmsInRequest.finishUpShelf(inPort.orderNo, inPort.detailId, operId); //更新订单及明细状态 + getWmsInRequest.finishUpShelf(inPort.orderNo, inPort.detailId, operId); //更新订单及明细状态 //更新ERP 上架数据 - updateErpDetail(inPort.detailId); - - + updateErpDetail(inPort.detailId); } // if (inPort.isDoneByOrderNo(inPort.orderNo)) diff --git a/WcfService1/BLL/lWmsOutPickPort.cs b/WcfService1/BLL/lWmsOutPickPort.cs index b4e869c..ca7f878 100644 --- a/WcfService1/BLL/lWmsOutPickPort.cs +++ b/WcfService1/BLL/lWmsOutPickPort.cs @@ -1138,12 +1138,15 @@ namespace DeiNiu.wms.Logical DataTable dtFreeTasks = new DataTable(); - bool isWholePickOrder = locationId.StartsWith("PK"); + bool isWholePickOrder = (locationId.StartsWith("PK") || locationId.StartsWith("RP"))&& new WmsOutPickRequest(locationId).ID>0; if (isWholePickOrder) { dtFreeTasks = getWmsOutPickPort.getFreeTasksByPickOrder(locationId); + }else if (locationId.StartsWith("JOB") && new WmsFlow(locationId).ID > 0) + { + dtFreeTasks = getWmsOutPickPort.getFreeTasksByJob(locationId); } else { diff --git a/WcfService1/BLL/lWmsOutPickRequest.cs b/WcfService1/BLL/lWmsOutPickRequest.cs index 010d066..d4f587d 100644 --- a/WcfService1/BLL/lWmsOutPickRequest.cs +++ b/WcfService1/BLL/lWmsOutPickRequest.cs @@ -3745,7 +3745,7 @@ namespace DeiNiu.wms.Logical using (TransactionScope scope = new TransactionScope()) { - if (outPickPort.recType != (int)enumStockRecordType.集货拣货) + if (is4OutStockTran((enumStockRecordType)outPickPort.recType)) //(outPickPort.recType != (int)enumStockRecordType.集货拣货) { wopr.createLoadTruckJob(operId); //创建装车任务 } @@ -3789,7 +3789,7 @@ namespace DeiNiu.wms.Logical if (WmsConstants.AUTO_LOAD_TRUCK) { - if (outPickPort.recType != (int)enumStockRecordType.集货拣货) + if (is4OutStockTran((enumStockRecordType)outPickPort.recType)) //(outPickPort.recType != (int)enumStockRecordType.集货拣货 ) { string truck = "000"; //+ stk.locationId.Substring(0,1); new lWmsPlate(operId).loadTruck(plateStock.plateId, string.IsNullOrEmpty( wopr.seedsPickNo) ? wopr.pickOrderNo: truck);//有总拣任务的分拣单集中装车 @@ -3912,6 +3912,18 @@ namespace DeiNiu.wms.Logical } + /// + /// 是否创建出库运输 + /// + /// + /// + bool is4OutStockTran(enumStockRecordType recType) + { + return recType == enumStockRecordType.销售出库 || recType == enumStockRecordType.销售退仓 || + recType == enumStockRecordType.领用出库 || recType == enumStockRecordType.退供应商出库 + || recType == enumStockRecordType.报废出库; + } + private void addRepUpTasks(WmsStockRecord rec,string flowNo,decimal count, enumWhType whType) { @@ -4010,6 +4022,24 @@ namespace DeiNiu.wms.Logical } } + WmsFlow wmsflow = new WmsFlow(rec.orderNo); + if (wmsflow.ID == 0) + { + wmsflow.operater = operId; + wmsflow.orderNo = rec.orderNo; + wmsflow.flowNo = flowNo; + wmsflow.type = (int)EnumFlowTaskType.补货上架; + wmsflow.typeName = EnumFlowTaskType.补货上架.ToString(); + wmsflow.task = rec.orderNo;// Util.getOrderNo(enumCreateOrderType.pickJobNo, wmsflow.getNextSeq(enumCreateOrderType.pickJobNo)); + wmsflow.Add(); + } + else + { + wmsflow.taskCnt++; + wmsflow.Update(); + } + + } @@ -4049,7 +4079,7 @@ namespace DeiNiu.wms.Logical try { - locs = nearLoc.getFreeLocation(nearLoc, whType, 1); + locs = nearLoc.getFreeLocation(nearLoc, goodsId, skuId, whType, 1); } catch (Exception er) { @@ -4061,7 +4091,7 @@ namespace DeiNiu.wms.Logical if (locs.Count == 0) { - nearLoc.locationId = "临时货位"; + nearLoc.locationId = WmsConstants.TMP_BULK_LOCATION; locs.Add(nearLoc); } diff --git a/WcfService1/BLL/lWmsStock.cs b/WcfService1/BLL/lWmsStock.cs index 85cdbd0..a3798ac 100644 --- a/WcfService1/BLL/lWmsStock.cs +++ b/WcfService1/BLL/lWmsStock.cs @@ -1065,11 +1065,24 @@ namespace DeiNiu.wms.Logical }*/ } + + - if (count > 0) //新货位 - { - WmsLocation nearLocation = new WmsLocation(); - nearLocation.goodsType = goods.goodsType; + if (count > 0) //需要新货位 + { + WmsLocation nearLocation = new WmsLocation(); + + if (skuId > 0 && dt.Rows.Count == 0) // 零库无相关批次库存， 找其他批次 + { + dt = stock.querySameGoodsLocations(goodsId, enumWhLocVol.零库, 0, ""); + foreach (DataRow dr in dt.Rows) // + { + lastBulkLocation = new WmsStock(dr).locationId; + break; + } + } + + nearLocation.goodsType = goods.goodsType; nearLocation.whType = (int)enumWhType.合格库; nearLocation.volType = (int)enumWhLocVol.零库; nearLocation.locationId = lastBulkLocation; @@ -1080,7 +1093,7 @@ namespace DeiNiu.wms.Logical try { - List newLocs = nearLocation.getFreeLocation(nearLocation, enumWhType.合格库, locCnt); + List newLocs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, enumWhType.合格库, locCnt); foreach (WmsLocation loc in newLocs) { if (count <= 0) @@ -1230,7 +1243,30 @@ namespace DeiNiu.wms.Logical stk.recordMaintain(stk.locationId,operId); - scope.Complete(); + try + { + string task = "maintain" + operId + Utils.Util.getShortDateString(this.wmsStock.getDateTime());// this.wmsStock.getDateTime + WmsFlow wmsFlow = new WmsFlow(task); + if (wmsFlow.ID == 0) + { + wmsFlow.type = (int)EnumFlowTaskType.日常理货; // ; (int)EnumFlowTaskType.日常理货; + wmsFlow.typeName = EnumFlowTaskType.日常理货.ToString(); + wmsFlow.task = task; + wmsFlow.orderNo = task; + wmsFlow.state = (int)enumFlowTaskStatus.进行中; + wmsFlow.Add(); + } + + wmsFlow.finishedTasksPlus(operId, mCount / new WmsGoods(stk.goodsId).minOperateCount, true); + } + catch (Exception er) + { + log.Error(er); + } + + + + scope.Complete(); } } catch(Exception e) 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..dcc8081 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-03T13:34:43.5638618Z||;True|2024-11-03T18:48:46.3810583+08:00||;True|2024-11-03T18:33:09.1693025+08:00||;True|2024-11-03T18:07:14.9554943+08:00||;True|2024-11-03T17:33:33.9400438+08:00||;True|2024-11-03T15:57:22.7762130+08:00||;True|2024-11-03T13:42:26.2482526+08:00||;False|2024-11-03T13:42:08.2682676+08:00||;True|2024-11-02T20:34:37.6850648+08:00||;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||; \ No newline at end of file diff --git a/winform/service/GoodsOutPickOrderPrint.Designer.cs b/winform/service/GoodsOutPickOrderPrint.Designer.cs index aafb254..de00b3c 100644 --- a/winform/service/GoodsOutPickOrderPrint.Designer.cs +++ b/winform/service/GoodsOutPickOrderPrint.Designer.cs @@ -35,6 +35,7 @@ this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.chkRep = new DevExpress.XtraEditors.CheckEdit(); this.comWarehouseQuery = new DevExpress.XtraEditors.ComboBoxEdit(); this.gridControl2 = new DevExpress.XtraGrid.GridControl(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -68,13 +69,13 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.chkRep = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.comWarehouseQuery.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); @@ -104,7 +105,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); this.SuspendLayout(); // @@ -162,12 +162,24 @@ 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(1509, 529, 450, 400); + this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(184, 529, 450, 400); this.layoutControl1.Root = this.layoutControlGroup1; this.layoutControl1.Size = new System.Drawing.Size(1976, 830); this.layoutControl1.TabIndex = 2; this.layoutControl1.Text = "layoutControl1"; // + // chkRep + // + this.chkRep.Location = new System.Drawing.Point(554, 108); + this.chkRep.MenuManager = this.ribbon; + this.chkRep.Name = "chkRep"; + this.chkRep.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F); + this.chkRep.Properties.Appearance.Options.UseFont = true; + this.chkRep.Properties.Caption = "补货调拨"; + this.chkRep.Size = new System.Drawing.Size(160, 38); + this.chkRep.StyleController = this.layoutControl1; + this.chkRep.TabIndex = 113; + // // comWarehouseQuery // this.comWarehouseQuery.Location = new System.Drawing.Point(407, 108); @@ -555,27 +567,9 @@ this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem17.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0); this.layoutControlItem17.Text = "选择日期"; + this.layoutControlItem17.TextLocation = DevExpress.Utils.Locations.Left; this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22); // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "correct.jpg"); - this.imageList1.Images.SetKeyName(1, "wrong.png"); - // - // chkRep - // - this.chkRep.Location = new System.Drawing.Point(554, 108); - this.chkRep.MenuManager = this.ribbon; - this.chkRep.Name = "chkRep"; - this.chkRep.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F); - this.chkRep.Properties.Appearance.Options.UseFont = true; - this.chkRep.Properties.Caption = "补货调拨"; - this.chkRep.Size = new System.Drawing.Size(160, 38); - this.chkRep.StyleController = this.layoutControl1; - this.chkRep.TabIndex = 113; - // // layoutControlItem1 // this.layoutControlItem1.Control = this.chkRep; @@ -588,6 +582,13 @@ this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "correct.jpg"); + this.imageList1.Images.SetKeyName(1, "wrong.png"); + // // GoodsOutPickOrderPrint // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); @@ -603,6 +604,7 @@ ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.comWarehouseQuery.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); @@ -632,7 +634,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/winform/service/GoodsOutPickOrderPrint.resx b/winform/service/GoodsOutPickOrderPrint.resx index 503072d..1494be0 100644 --- a/winform/service/GoodsOutPickOrderPrint.resx +++ b/winform/service/GoodsOutPickOrderPrint.resx @@ -308,7 +308,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - CQAAAk1TRnQBSQFMAgEBAgEAARgBCQEYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAASABCQEgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA 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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 diff --git a/winform/基础资料/LocationmgrForm.designer.cs b/winform/基础资料/LocationmgrForm.designer.cs index 53b606b..2a2fe25 100644 --- a/winform/基础资料/LocationmgrForm.designer.cs +++ b/winform/基础资料/LocationmgrForm.designer.cs @@ -233,6 +233,9 @@ this.emptySpaceItem14 = new DevExpress.XtraLayout.EmptySpaceItem(); this.txtLocation = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.emptySpaceItem17 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.emptySpaceItem18 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.emptySpaceItem19 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); @@ -417,6 +420,9 @@ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtLocation.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem19)).BeginInit(); this.SuspendLayout(); // // ribbon @@ -597,7 +603,7 @@ this.chkJobCrossQ.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.chkJobCrossQ.Properties.Appearance.Options.UseFont = true; this.chkJobCrossQ.Properties.Caption = "任务跨区"; - this.chkJobCrossQ.Size = new System.Drawing.Size(139, 33); + this.chkJobCrossQ.Size = new System.Drawing.Size(118, 33); this.chkJobCrossQ.StyleController = this.layoutControl1; this.chkJobCrossQ.TabIndex = 96; // @@ -702,12 +708,12 @@ // gridControl2 // this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); - this.gridControl2.Location = new System.Drawing.Point(37, 341); + this.gridControl2.Location = new System.Drawing.Point(37, 302); 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(1891, 577); + this.gridControl2.Size = new System.Drawing.Size(1891, 616); this.gridControl2.TabIndex = 85; this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView2}); @@ -791,7 +797,7 @@ // // pager1 // - this.pager1.Location = new System.Drawing.Point(37, 891); + this.pager1.Location = new System.Drawing.Point(37, 889); this.pager1.Margin = new System.Windows.Forms.Padding(6); this.pager1.MaximumSize = new System.Drawing.Size(0, 31); this.pager1.Name = "pager1"; @@ -799,18 +805,18 @@ this.pager1.PageCount = 0; this.pager1.PageCurrent = 0; this.pager1.PageSize = 50; - this.pager1.Size = new System.Drawing.Size(1891, 27); + this.pager1.Size = new System.Drawing.Size(1891, 29); this.pager1.TabIndex = 40; // // gridControl1 // this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); - this.gridControl1.Location = new System.Drawing.Point(37, 341); + this.gridControl1.Location = new System.Drawing.Point(37, 302); 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(1891, 544); + this.gridControl1.Size = new System.Drawing.Size(1891, 581); this.gridControl1.TabIndex = 39; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -1076,7 +1082,7 @@ this.btnUpdateSize.Location = new System.Drawing.Point(712, 126); this.btnUpdateSize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnUpdateSize.Name = "btnUpdateSize"; - this.btnUpdateSize.Size = new System.Drawing.Size(1196, 47); + this.btnUpdateSize.Size = new System.Drawing.Size(742, 47); this.btnUpdateSize.StyleController = this.layoutControl1; this.btnUpdateSize.TabIndex = 60; this.btnUpdateSize.Text = "更新"; @@ -1085,10 +1091,10 @@ // btnCreate // this.btnCreate.Image = ((System.Drawing.Image)(resources.GetObject("btnCreate.Image"))); - this.btnCreate.Location = new System.Drawing.Point(56, 200); + this.btnCreate.Location = new System.Drawing.Point(1480, 180); this.btnCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnCreate.Name = "btnCreate"; - this.btnCreate.Size = new System.Drawing.Size(352, 42); + this.btnCreate.Size = new System.Drawing.Size(448, 42); this.btnCreate.StyleController = this.layoutControl1; this.btnCreate.TabIndex = 63; this.btnCreate.Text = "新建"; @@ -1097,7 +1103,7 @@ // btnQuery // this.btnQuery.Image = ((System.Drawing.Image)(resources.GetObject("btnQuery.Image"))); - this.btnQuery.Location = new System.Drawing.Point(37, 219); + this.btnQuery.Location = new System.Drawing.Point(1447, 180); this.btnQuery.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnQuery.Name = "btnQuery"; this.btnQuery.Size = new System.Drawing.Size(81, 42); @@ -1182,7 +1188,7 @@ this.txtColumToQ.Name = "txtColumToQ"; this.txtColumToQ.Properties.Mask.EditMask = "f0"; this.txtColumToQ.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric; - this.txtColumToQ.Size = new System.Drawing.Size(1528, 28); + this.txtColumToQ.Size = new System.Drawing.Size(1041, 28); this.txtColumToQ.StyleController = this.layoutControl1; this.txtColumToQ.TabIndex = 5; // @@ -1204,7 +1210,7 @@ this.txtLayerToQ.Name = "txtLayerToQ"; this.txtLayerToQ.Properties.Mask.EditMask = "f0"; this.txtLayerToQ.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric; - this.txtLayerToQ.Size = new System.Drawing.Size(1528, 28); + this.txtLayerToQ.Size = new System.Drawing.Size(1041, 28); this.txtLayerToQ.StyleController = this.layoutControl1; this.txtLayerToQ.TabIndex = 6; // @@ -1221,7 +1227,7 @@ // // comWhVoTypeQuery // - this.comWhVoTypeQuery.Location = new System.Drawing.Point(1803, 165); + this.comWhVoTypeQuery.Location = new System.Drawing.Point(1316, 165); this.comWhVoTypeQuery.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comWhVoTypeQuery.Name = "comWhVoTypeQuery"; this.comWhVoTypeQuery.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { @@ -1487,7 +1493,7 @@ this.tabbedControlGroup4.Name = "tabbedControlGroup4"; this.tabbedControlGroup4.SelectedTabPage = this.lcgQuery; this.tabbedControlGroup4.SelectedTabPageIndex = 0; - this.tabbedControlGroup4.Size = new System.Drawing.Size(1936, 269); + this.tabbedControlGroup4.Size = new System.Drawing.Size(1936, 230); this.tabbedControlGroup4.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.lcgQuery, this.lcgSetup}); @@ -1497,21 +1503,23 @@ this.lcgQuery.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); this.lcgQuery.AppearanceGroup.Options.UseFont = true; this.lcgQuery.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.tabbedControlGroup2, + this.emptySpaceItem17, this.layoutControlItem42, - this.tabbedControlGroup2}); + this.emptySpaceItem18}); this.lcgQuery.Location = new System.Drawing.Point(0, 0); this.lcgQuery.Name = "lcgQuery"; - this.lcgQuery.Size = new System.Drawing.Size(1897, 195); + this.lcgQuery.Size = new System.Drawing.Size(1897, 156); this.lcgQuery.Text = "货位查询"; // // layoutControlItem42 // this.layoutControlItem42.Control = this.btnQuery; - this.layoutControlItem42.Location = new System.Drawing.Point(0, 147); + this.layoutControlItem42.Location = new System.Drawing.Point(1410, 108); this.layoutControlItem42.MaxSize = new System.Drawing.Size(87, 48); this.layoutControlItem42.MinSize = new System.Drawing.Size(87, 48); this.layoutControlItem42.Name = "layoutControlItem42"; - this.layoutControlItem42.Size = new System.Drawing.Size(1897, 48); + this.layoutControlItem42.Size = new System.Drawing.Size(87, 48); this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem42.TextVisible = false; @@ -1522,7 +1530,7 @@ this.tabbedControlGroup2.Name = "tabbedControlGroup2"; this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup17; this.tabbedControlGroup2.SelectedTabPageIndex = 0; - this.tabbedControlGroup2.Size = new System.Drawing.Size(1897, 147); + this.tabbedControlGroup2.Size = new System.Drawing.Size(1410, 156); this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup17, this.layoutControlGroup13, @@ -1555,7 +1563,7 @@ this.emptySpaceItem15}); this.layoutControlGroup17.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup17.Name = "layoutControlGroup17"; - this.layoutControlGroup17.Size = new System.Drawing.Size(1858, 73); + this.layoutControlGroup17.Size = new System.Drawing.Size(1371, 82); this.layoutControlGroup17.Text = "基本信息"; // // layoutControlItem55 @@ -1565,7 +1573,7 @@ this.layoutControlItem55.Location = new System.Drawing.Point(0, 24); this.layoutControlItem55.MinSize = new System.Drawing.Size(107, 24); this.layoutControlItem55.Name = "layoutControlItem55"; - this.layoutControlItem55.Size = new System.Drawing.Size(170, 49); + this.layoutControlItem55.Size = new System.Drawing.Size(170, 58); this.layoutControlItem55.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem55.Text = "库房分区"; this.layoutControlItem55.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1594,7 +1602,7 @@ this.layoutControlItem49.Location = new System.Drawing.Point(180, 26); this.layoutControlItem49.MinSize = new System.Drawing.Size(107, 24); this.layoutControlItem49.Name = "layoutControlItem49"; - this.layoutControlItem49.Size = new System.Drawing.Size(208, 47); + this.layoutControlItem49.Size = new System.Drawing.Size(208, 56); this.layoutControlItem49.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem49.Text = "货位分区"; this.layoutControlItem49.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1623,7 +1631,7 @@ this.emptySpaceItem10.MaxSize = new System.Drawing.Size(10, 50); this.emptySpaceItem10.MinSize = new System.Drawing.Size(10, 50); this.emptySpaceItem10.Name = "emptySpaceItem10"; - this.emptySpaceItem10.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem10.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0); // @@ -1646,7 +1654,7 @@ this.emptySpaceItem13.MaxSize = new System.Drawing.Size(10, 50); this.emptySpaceItem13.MinSize = new System.Drawing.Size(10, 50); this.emptySpaceItem13.Name = "emptySpaceItem13"; - this.emptySpaceItem13.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem13.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem13.TextSize = new System.Drawing.Size(0, 0); // @@ -1658,7 +1666,7 @@ this.layoutControlItem50.MaxSize = new System.Drawing.Size(188, 26); this.layoutControlItem50.MinSize = new System.Drawing.Size(188, 26); this.layoutControlItem50.Name = "layoutControlItem50"; - this.layoutControlItem50.Size = new System.Drawing.Size(188, 49); + this.layoutControlItem50.Size = new System.Drawing.Size(188, 58); this.layoutControlItem50.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem50.Text = "货物类别"; this.layoutControlItem50.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1699,7 +1707,7 @@ this.layoutControlItem57.MaxSize = new System.Drawing.Size(180, 24); this.layoutControlItem57.MinSize = new System.Drawing.Size(180, 24); this.layoutControlItem57.Name = "layoutControlItem57"; - this.layoutControlItem57.Size = new System.Drawing.Size(180, 47); + this.layoutControlItem57.Size = new System.Drawing.Size(180, 56); this.layoutControlItem57.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem57.Text = "货位状态"; this.layoutControlItem57.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1713,7 +1721,7 @@ this.emptySpaceItem7.MaxSize = new System.Drawing.Size(10, 50); this.emptySpaceItem7.MinSize = new System.Drawing.Size(10, 50); this.emptySpaceItem7.Name = "emptySpaceItem7"; - this.emptySpaceItem7.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem7.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0); // @@ -1724,7 +1732,7 @@ this.emptySpaceItem11.MaxSize = new System.Drawing.Size(10, 50); this.emptySpaceItem11.MinSize = new System.Drawing.Size(10, 50); this.emptySpaceItem11.Name = "emptySpaceItem11"; - this.emptySpaceItem11.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem11.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem11.TextSize = new System.Drawing.Size(0, 0); // @@ -1735,7 +1743,7 @@ this.emptySpaceItem20.MaxSize = new System.Drawing.Size(10, 50); this.emptySpaceItem20.MinSize = new System.Drawing.Size(10, 50); this.emptySpaceItem20.Name = "emptySpaceItem20"; - this.emptySpaceItem20.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem20.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem20.TextSize = new System.Drawing.Size(0, 0); // @@ -1756,11 +1764,11 @@ // this.layoutControlItem48.Control = this.comWhVoTypeQuery; this.layoutControlItem48.CustomizationFormText = "货位容积"; - this.layoutControlItem48.Location = new System.Drawing.Point(1670, 39); + this.layoutControlItem48.Location = new System.Drawing.Point(1183, 39); this.layoutControlItem48.MaxSize = new System.Drawing.Size(188, 26); this.layoutControlItem48.MinSize = new System.Drawing.Size(188, 26); this.layoutControlItem48.Name = "layoutControlItem48"; - this.layoutControlItem48.Size = new System.Drawing.Size(188, 34); + this.layoutControlItem48.Size = new System.Drawing.Size(188, 43); this.layoutControlItem48.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem48.Text = "存储分类"; this.layoutControlItem48.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1775,7 +1783,7 @@ this.layoutControlItem53.MaxSize = new System.Drawing.Size(188, 26); this.layoutControlItem53.MinSize = new System.Drawing.Size(188, 26); this.layoutControlItem53.Name = "layoutControlItem53"; - this.layoutControlItem53.Size = new System.Drawing.Size(188, 49); + this.layoutControlItem53.Size = new System.Drawing.Size(188, 58); this.layoutControlItem53.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem53.Text = "ABC类别 "; this.layoutControlItem53.TextSize = new System.Drawing.Size(75, 22); @@ -1787,7 +1795,7 @@ this.layoutControlItem66.MaxSize = new System.Drawing.Size(189, 34); this.layoutControlItem66.MinSize = new System.Drawing.Size(189, 34); this.layoutControlItem66.Name = "layoutControlItem66"; - this.layoutControlItem66.Size = new System.Drawing.Size(189, 34); + this.layoutControlItem66.Size = new System.Drawing.Size(189, 43); this.layoutControlItem66.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem66.Text = "库容倍数"; this.layoutControlItem66.TextSize = new System.Drawing.Size(75, 22); @@ -1797,7 +1805,7 @@ this.emptySpaceItem9.AllowHotTrack = false; this.emptySpaceItem9.Location = new System.Drawing.Point(1173, 39); this.emptySpaceItem9.Name = "emptySpaceItem9"; - this.emptySpaceItem9.Size = new System.Drawing.Size(497, 34); + this.emptySpaceItem9.Size = new System.Drawing.Size(10, 43); this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem71 @@ -1805,7 +1813,7 @@ this.layoutControlItem71.Control = this.chkJobCrossQ; this.layoutControlItem71.Location = new System.Drawing.Point(1172, 0); this.layoutControlItem71.Name = "layoutControlItem71"; - this.layoutControlItem71.Size = new System.Drawing.Size(145, 39); + this.layoutControlItem71.Size = new System.Drawing.Size(124, 39); this.layoutControlItem71.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem71.TextVisible = false; this.layoutControlItem71.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; @@ -1813,9 +1821,9 @@ // emptySpaceItem15 // this.emptySpaceItem15.AllowHotTrack = false; - this.emptySpaceItem15.Location = new System.Drawing.Point(1317, 0); + this.emptySpaceItem15.Location = new System.Drawing.Point(1296, 0); this.emptySpaceItem15.Name = "emptySpaceItem15"; - this.emptySpaceItem15.Size = new System.Drawing.Size(541, 39); + this.emptySpaceItem15.Size = new System.Drawing.Size(75, 39); this.emptySpaceItem15.TextSize = new System.Drawing.Size(0, 0); // // layoutControlGroup13 @@ -1832,7 +1840,7 @@ this.emptySpaceItem25}); this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup13.Name = "layoutControlGroup13"; - this.layoutControlGroup13.Size = new System.Drawing.Size(1858, 73); + this.layoutControlGroup13.Size = new System.Drawing.Size(1371, 82); this.layoutControlGroup13.Text = "货位坐标"; // // layoutControlItem37 @@ -1858,7 +1866,7 @@ this.layoutControlItem38.MaxSize = new System.Drawing.Size(125, 26); this.layoutControlItem38.MinSize = new System.Drawing.Size(125, 26); this.layoutControlItem38.Name = "layoutControlItem38"; - this.layoutControlItem38.Size = new System.Drawing.Size(125, 49); + this.layoutControlItem38.Size = new System.Drawing.Size(125, 58); this.layoutControlItem38.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem38.Text = "货架起止"; this.layoutControlItem38.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1888,7 +1896,7 @@ this.layoutControlItem40.MaxSize = new System.Drawing.Size(64, 26); this.layoutControlItem40.MinSize = new System.Drawing.Size(64, 26); this.layoutControlItem40.Name = "layoutControlItem40"; - this.layoutControlItem40.Size = new System.Drawing.Size(64, 49); + this.layoutControlItem40.Size = new System.Drawing.Size(64, 58); this.layoutControlItem40.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem40.Text = "--"; this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0); @@ -1917,7 +1925,7 @@ this.layoutControlItem46.MaxSize = new System.Drawing.Size(64, 24); this.layoutControlItem46.MinSize = new System.Drawing.Size(64, 24); this.layoutControlItem46.Name = "layoutControlItem46"; - this.layoutControlItem46.Size = new System.Drawing.Size(1534, 24); + this.layoutControlItem46.Size = new System.Drawing.Size(1047, 24); this.layoutControlItem46.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem46.Text = "--"; this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0); @@ -1931,7 +1939,7 @@ this.layoutControlItem43.MaxSize = new System.Drawing.Size(125, 24); this.layoutControlItem43.MinSize = new System.Drawing.Size(125, 24); this.layoutControlItem43.Name = "layoutControlItem43"; - this.layoutControlItem43.Size = new System.Drawing.Size(125, 49); + this.layoutControlItem43.Size = new System.Drawing.Size(125, 58); this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem43.Text = "列号起止"; this.layoutControlItem43.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -1946,7 +1954,7 @@ this.layoutControlItem44.MaxSize = new System.Drawing.Size(63, 24); this.layoutControlItem44.MinSize = new System.Drawing.Size(63, 24); this.layoutControlItem44.Name = "layoutControlItem44"; - this.layoutControlItem44.Size = new System.Drawing.Size(1534, 49); + this.layoutControlItem44.Size = new System.Drawing.Size(1047, 58); this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem44.Text = "--"; this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0); @@ -1959,7 +1967,7 @@ this.emptySpaceItem25.MaxSize = new System.Drawing.Size(10, 48); this.emptySpaceItem25.MinSize = new System.Drawing.Size(10, 48); this.emptySpaceItem25.Name = "emptySpaceItem25"; - this.emptySpaceItem25.Size = new System.Drawing.Size(10, 73); + this.emptySpaceItem25.Size = new System.Drawing.Size(10, 82); this.emptySpaceItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem25.TextSize = new System.Drawing.Size(0, 0); // @@ -1973,7 +1981,7 @@ this.emptySpaceItem22}); this.layoutControlGroup18.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup18.Name = "layoutControlGroup18"; - this.layoutControlGroup18.Size = new System.Drawing.Size(1858, 73); + this.layoutControlGroup18.Size = new System.Drawing.Size(1371, 82); this.layoutControlGroup18.Text = "标签编号"; // // layoutControlItem52 @@ -2013,7 +2021,7 @@ this.layoutControlItem9.MaxSize = new System.Drawing.Size(179, 24); this.layoutControlItem9.MinSize = new System.Drawing.Size(179, 24); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(179, 49); + this.layoutControlItem9.Size = new System.Drawing.Size(179, 58); this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem9.Text = "标签端口"; this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2026,7 +2034,7 @@ this.emptySpaceItem22.Location = new System.Drawing.Point(179, 0); this.emptySpaceItem22.MinSize = new System.Drawing.Size(104, 24); this.emptySpaceItem22.Name = "emptySpaceItem22"; - this.emptySpaceItem22.Size = new System.Drawing.Size(1679, 73); + this.emptySpaceItem22.Size = new System.Drawing.Size(1192, 82); this.emptySpaceItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.emptySpaceItem22.TextSize = new System.Drawing.Size(0, 0); // @@ -2036,10 +2044,12 @@ this.lcgSetup.AppearanceGroup.Options.UseFont = true; this.lcgSetup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.tabbedControlGroup3, - this.layoutControlGroup14}); + this.layoutControlGroup14, + this.layoutControlItem41, + this.emptySpaceItem19}); this.lcgSetup.Location = new System.Drawing.Point(0, 0); this.lcgSetup.Name = "lcgSetup"; - this.lcgSetup.Size = new System.Drawing.Size(1897, 195); + this.lcgSetup.Size = new System.Drawing.Size(1897, 156); this.lcgSetup.Text = "新增修改"; this.lcgSetup.CustomButtonUnchecked += new DevExpress.XtraBars.Docking2010.BaseButtonEventHandler(this.lcgSetup_CustomButtonUnchecked); this.lcgSetup.CustomButtonChecked += new DevExpress.XtraBars.Docking2010.BaseButtonEventHandler(this.lcgSetup_CustomButtonChecked); @@ -2051,7 +2061,7 @@ this.tabbedControlGroup3.Name = "tabbedControlGroup3"; this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup5; this.tabbedControlGroup3.SelectedTabPageIndex = 0; - this.tabbedControlGroup3.Size = new System.Drawing.Size(1501, 195); + this.tabbedControlGroup3.Size = new System.Drawing.Size(1047, 156); this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup5, this.layoutControlGroup11, @@ -2072,7 +2082,7 @@ this.layoutControlItem22}); this.layoutControlGroup5.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup5.Name = "layoutControlGroup5"; - this.layoutControlGroup5.Size = new System.Drawing.Size(1462, 121); + this.layoutControlGroup5.Size = new System.Drawing.Size(1008, 82); this.layoutControlGroup5.Text = "基本属性"; // // layoutControlItem27 @@ -2097,7 +2107,7 @@ this.layoutcomWarehouse.MaxSize = new System.Drawing.Size(227, 24); this.layoutcomWarehouse.MinSize = new System.Drawing.Size(227, 24); this.layoutcomWarehouse.Name = "layoutcomWarehouse"; - this.layoutcomWarehouse.Size = new System.Drawing.Size(227, 97); + this.layoutcomWarehouse.Size = new System.Drawing.Size(227, 58); this.layoutcomWarehouse.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutcomWarehouse.Text = "库房分区"; this.layoutcomWarehouse.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2141,7 +2151,7 @@ this.layoutControlItem16.MaxSize = new System.Drawing.Size(240, 24); this.layoutControlItem16.MinSize = new System.Drawing.Size(240, 24); this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(240, 97); + this.layoutControlItem16.Size = new System.Drawing.Size(240, 58); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "货位类型"; this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2156,7 +2166,7 @@ this.layoutControlItem19.MaxSize = new System.Drawing.Size(240, 24); this.layoutControlItem19.MinSize = new System.Drawing.Size(240, 24); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(240, 97); + this.layoutControlItem19.Size = new System.Drawing.Size(240, 58); this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem19.Text = "零库整库"; this.layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2169,7 +2179,7 @@ this.emptySpaceItem2.AllowHotTrack = false; this.emptySpaceItem2.Location = new System.Drawing.Point(800, 0); this.emptySpaceItem2.Name = "emptySpaceItem2"; - this.emptySpaceItem2.Size = new System.Drawing.Size(662, 121); + this.emptySpaceItem2.Size = new System.Drawing.Size(208, 82); this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem22 @@ -2179,7 +2189,7 @@ this.layoutControlItem22.MaxSize = new System.Drawing.Size(93, 59); this.layoutControlItem22.MinSize = new System.Drawing.Size(93, 59); this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(93, 121); + this.layoutControlItem22.Size = new System.Drawing.Size(93, 82); this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem22.TextVisible = false; @@ -2205,7 +2215,7 @@ this.emptySpaceItem26}); this.layoutControlGroup11.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup11.Name = "layoutControlGroup11"; - this.layoutControlGroup11.Size = new System.Drawing.Size(1462, 121); + this.layoutControlGroup11.Size = new System.Drawing.Size(1008, 82); this.layoutControlGroup11.Text = "其它属性"; // // layoutControlItem20 @@ -2229,7 +2239,7 @@ this.layoutControlItem28.MinSize = new System.Drawing.Size(172, 38); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 2, 2); - this.layoutControlItem28.Size = new System.Drawing.Size(172, 83); + this.layoutControlItem28.Size = new System.Drawing.Size(172, 44); this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem28.Text = "线路编号"; this.layoutControlItem28.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2255,7 +2265,7 @@ this.layoutControlItem13.MaxSize = new System.Drawing.Size(77, 38); this.layoutControlItem13.MinSize = new System.Drawing.Size(77, 38); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(77, 83); + this.layoutControlItem13.Size = new System.Drawing.Size(77, 44); this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; @@ -2293,7 +2303,7 @@ this.layoutControlItem60.MinSize = new System.Drawing.Size(172, 38); this.layoutControlItem60.Name = "layoutControlItem60"; this.layoutControlItem60.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 2, 2); - this.layoutControlItem60.Size = new System.Drawing.Size(172, 83); + this.layoutControlItem60.Size = new System.Drawing.Size(172, 44); this.layoutControlItem60.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem60.Text = "货主专用"; this.layoutControlItem60.TextSize = new System.Drawing.Size(75, 22); @@ -2305,7 +2315,7 @@ this.layoutControlItem62.MaxSize = new System.Drawing.Size(77, 38); this.layoutControlItem62.MinSize = new System.Drawing.Size(77, 38); this.layoutControlItem62.Name = "layoutControlItem62"; - this.layoutControlItem62.Size = new System.Drawing.Size(77, 83); + this.layoutControlItem62.Size = new System.Drawing.Size(77, 44); this.layoutControlItem62.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem62.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem62.TextVisible = false; @@ -2369,7 +2379,7 @@ this.layoutControlItem70.MaxSize = new System.Drawing.Size(85, 38); this.layoutControlItem70.MinSize = new System.Drawing.Size(85, 38); this.layoutControlItem70.Name = "layoutControlItem70"; - this.layoutControlItem70.Size = new System.Drawing.Size(85, 83); + this.layoutControlItem70.Size = new System.Drawing.Size(85, 44); this.layoutControlItem70.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem70.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem70.TextVisible = false; @@ -2381,7 +2391,7 @@ this.layoutControlItem69.MaxSize = new System.Drawing.Size(165, 44); this.layoutControlItem69.MinSize = new System.Drawing.Size(165, 44); this.layoutControlItem69.Name = "layoutControlItem69"; - this.layoutControlItem69.Size = new System.Drawing.Size(165, 83); + this.layoutControlItem69.Size = new System.Drawing.Size(165, 44); this.layoutControlItem69.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem69.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem69.TextVisible = false; @@ -2391,7 +2401,7 @@ this.emptySpaceItem12.AllowHotTrack = false; this.emptySpaceItem12.Location = new System.Drawing.Point(748, 38); this.emptySpaceItem12.Name = "emptySpaceItem12"; - this.emptySpaceItem12.Size = new System.Drawing.Size(714, 83); + this.emptySpaceItem12.Size = new System.Drawing.Size(260, 44); this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0); // // emptySpaceItem26 @@ -2399,7 +2409,7 @@ this.emptySpaceItem26.AllowHotTrack = false; this.emptySpaceItem26.Location = new System.Drawing.Point(998, 0); this.emptySpaceItem26.Name = "emptySpaceItem26"; - this.emptySpaceItem26.Size = new System.Drawing.Size(464, 38); + this.emptySpaceItem26.Size = new System.Drawing.Size(10, 38); this.emptySpaceItem26.TextSize = new System.Drawing.Size(0, 0); // // layoutControlGroup3 @@ -2412,7 +2422,7 @@ this.layoutControlItem11}); this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup3.Name = "layoutControlGroup3"; - this.layoutControlGroup3.Size = new System.Drawing.Size(1462, 121); + this.layoutControlGroup3.Size = new System.Drawing.Size(1008, 82); this.layoutControlGroup3.Text = "货位尺寸"; // // f @@ -2436,7 +2446,7 @@ this.layoutControlItem24.MaxSize = new System.Drawing.Size(129, 29); this.layoutControlItem24.MinSize = new System.Drawing.Size(129, 29); this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.Size = new System.Drawing.Size(129, 97); + this.layoutControlItem24.Size = new System.Drawing.Size(129, 58); this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem24.Text = "宽(cm)"; this.layoutControlItem24.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2465,7 +2475,7 @@ this.layoutControlItem23.MaxSize = new System.Drawing.Size(131, 29); this.layoutControlItem23.MinSize = new System.Drawing.Size(131, 29); this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.Size = new System.Drawing.Size(131, 97); + this.layoutControlItem23.Size = new System.Drawing.Size(131, 58); this.layoutControlItem23.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem23.Text = "承重(kg)"; this.layoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; @@ -2479,7 +2489,7 @@ this.layoutControlItem11.MaxSize = new System.Drawing.Size(59, 53); this.layoutControlItem11.MinSize = new System.Drawing.Size(59, 53); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(1202, 121); + this.layoutControlItem11.Size = new System.Drawing.Size(748, 82); this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -2494,7 +2504,7 @@ this.layoutControlItem14}); this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup2.Name = "layoutControlGroup2"; - this.layoutControlGroup2.Size = new System.Drawing.Size(1462, 121); + this.layoutControlGroup2.Size = new System.Drawing.Size(1008, 82); this.layoutControlGroup2.Text = "电子标签布局"; // // layoutControlItem15 @@ -2504,7 +2514,7 @@ this.layoutControlItem15.MaxSize = new System.Drawing.Size(54, 0); this.layoutControlItem15.MinSize = new System.Drawing.Size(54, 41); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(54, 121); + this.layoutControlItem15.Size = new System.Drawing.Size(54, 82); this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem15.Text = "层"; this.layoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top; @@ -2517,7 +2527,7 @@ this.layoutControlItem21.MaxSize = new System.Drawing.Size(54, 0); this.layoutControlItem21.MinSize = new System.Drawing.Size(54, 41); this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.Size = new System.Drawing.Size(54, 121); + this.layoutControlItem21.Size = new System.Drawing.Size(54, 82); this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem21.Text = "列"; this.layoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top; @@ -2528,7 +2538,7 @@ this.emptySpaceItem8.AllowHotTrack = false; this.emptySpaceItem8.Location = new System.Drawing.Point(253, 0); this.emptySpaceItem8.Name = "emptySpaceItem8"; - this.emptySpaceItem8.Size = new System.Drawing.Size(1209, 121); + this.emptySpaceItem8.Size = new System.Drawing.Size(755, 82); this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem54 @@ -2538,7 +2548,7 @@ this.layoutControlItem54.MaxSize = new System.Drawing.Size(91, 59); this.layoutControlItem54.MinSize = new System.Drawing.Size(91, 59); this.layoutControlItem54.Name = "layoutControlItem54"; - this.layoutControlItem54.Size = new System.Drawing.Size(91, 121); + this.layoutControlItem54.Size = new System.Drawing.Size(91, 82); this.layoutControlItem54.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem54.Text = "起始编号"; this.layoutControlItem54.TextLocation = DevExpress.Utils.Locations.Top; @@ -2552,7 +2562,7 @@ this.layoutControlItem14.MaxSize = new System.Drawing.Size(54, 0); this.layoutControlItem14.MinSize = new System.Drawing.Size(54, 41); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(54, 121); + this.layoutControlItem14.Size = new System.Drawing.Size(54, 82); this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem14.Text = "端口"; this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top; @@ -2568,7 +2578,7 @@ this.layoutControlGroup21.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup21.Name = "layoutControlGroup21"; this.layoutControlGroup21.OptionsItemText.TextToControlDistance = 5; - this.layoutControlGroup21.Size = new System.Drawing.Size(1462, 121); + this.layoutControlGroup21.Size = new System.Drawing.Size(1008, 82); this.layoutControlGroup21.Text = "电子标签修改"; // // layoutControlItem18 @@ -2590,7 +2600,7 @@ this.layoutControlItem34.MaxSize = new System.Drawing.Size(130, 24); this.layoutControlItem34.MinSize = new System.Drawing.Size(130, 24); this.layoutControlItem34.Name = "layoutControlItem34"; - this.layoutControlItem34.Size = new System.Drawing.Size(130, 97); + this.layoutControlItem34.Size = new System.Drawing.Size(130, 58); this.layoutControlItem34.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem34.Text = "货位地址"; this.layoutControlItem34.TextSize = new System.Drawing.Size(75, 22); @@ -2602,7 +2612,7 @@ this.layoutControlItem33.MaxSize = new System.Drawing.Size(86, 56); this.layoutControlItem33.MinSize = new System.Drawing.Size(86, 56); this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(86, 121); + this.layoutControlItem33.Size = new System.Drawing.Size(86, 82); this.layoutControlItem33.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem33.TextVisible = false; @@ -2612,7 +2622,7 @@ this.emptySpaceItem6.AllowHotTrack = false; this.emptySpaceItem6.Location = new System.Drawing.Point(216, 0); this.emptySpaceItem6.Name = "emptySpaceItem6"; - this.emptySpaceItem6.Size = new System.Drawing.Size(1246, 121); + this.emptySpaceItem6.Size = new System.Drawing.Size(792, 82); this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0); // // layoutControlGroup14 @@ -2626,11 +2636,10 @@ this.layoutControlItem3, this.layoutControlItem1, this.layoutControlItem2, - this.layoutControlItem41, this.emptySpaceItem16}); this.layoutControlGroup14.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup14.Name = "layoutControlGroup14"; - this.layoutControlGroup14.Size = new System.Drawing.Size(396, 195); + this.layoutControlGroup14.Size = new System.Drawing.Size(396, 156); this.layoutControlGroup14.Text = "货位坐标"; // // layoutControlItem7 @@ -2745,11 +2754,11 @@ // layoutControlItem41 // this.layoutControlItem41.Control = this.btnCreate; - this.layoutControlItem41.Location = new System.Drawing.Point(0, 79); + this.layoutControlItem41.Location = new System.Drawing.Point(1443, 108); this.layoutControlItem41.MaxSize = new System.Drawing.Size(89, 48); this.layoutControlItem41.MinSize = new System.Drawing.Size(89, 48); this.layoutControlItem41.Name = "layoutControlItem41"; - this.layoutControlItem41.Size = new System.Drawing.Size(358, 48); + this.layoutControlItem41.Size = new System.Drawing.Size(454, 48); this.layoutControlItem41.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem41.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem41.TextVisible = false; @@ -2759,16 +2768,16 @@ this.emptySpaceItem16.AllowHotTrack = false; this.emptySpaceItem16.Location = new System.Drawing.Point(0, 48); this.emptySpaceItem16.Name = "emptySpaceItem16"; - this.emptySpaceItem16.Size = new System.Drawing.Size(358, 31); + this.emptySpaceItem16.Size = new System.Drawing.Size(358, 40); this.emptySpaceItem16.TextSize = new System.Drawing.Size(0, 0); // // tabbedControlGroup5 // - this.tabbedControlGroup5.Location = new System.Drawing.Point(0, 269); + this.tabbedControlGroup5.Location = new System.Drawing.Point(0, 230); this.tabbedControlGroup5.Name = "tabbedControlGroup5"; this.tabbedControlGroup5.SelectedTabPage = this.layoutControlGroup19; this.tabbedControlGroup5.SelectedTabPageIndex = 0; - this.tabbedControlGroup5.Size = new System.Drawing.Size(1936, 657); + this.tabbedControlGroup5.Size = new System.Drawing.Size(1936, 696); this.tabbedControlGroup5.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup19, this.layoutControlGroup20}); @@ -2780,15 +2789,15 @@ this.layoutControlItem31}); this.layoutControlGroup19.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup19.Name = "layoutControlGroup19"; - this.layoutControlGroup19.Size = new System.Drawing.Size(1897, 583); + this.layoutControlGroup19.Size = new System.Drawing.Size(1897, 622); this.layoutControlGroup19.Text = "货位列表"; // // layoutControlItem32 // this.layoutControlItem32.Control = this.pager1; - this.layoutControlItem32.Location = new System.Drawing.Point(0, 550); + this.layoutControlItem32.Location = new System.Drawing.Point(0, 587); this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.Size = new System.Drawing.Size(1897, 33); + this.layoutControlItem32.Size = new System.Drawing.Size(1897, 35); this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem32.TextVisible = false; // @@ -2800,7 +2809,7 @@ this.layoutControlItem31.Location = new System.Drawing.Point(0, 0); this.layoutControlItem31.MinSize = new System.Drawing.Size(104, 24); this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.Size = new System.Drawing.Size(1897, 550); + this.layoutControlItem31.Size = new System.Drawing.Size(1897, 587); this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem31.Text = "货位列表"; this.layoutControlItem31.TextLocation = DevExpress.Utils.Locations.Top; @@ -2813,7 +2822,7 @@ this.layoutControlItem59}); this.layoutControlGroup20.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup20.Name = "layoutControlGroup20"; - this.layoutControlGroup20.Size = new System.Drawing.Size(1897, 583); + this.layoutControlGroup20.Size = new System.Drawing.Size(1897, 622); this.layoutControlGroup20.Text = "使用汇总"; // // layoutControlItem59 @@ -2822,7 +2831,7 @@ this.layoutControlItem59.Location = new System.Drawing.Point(0, 0); this.layoutControlItem59.MinSize = new System.Drawing.Size(104, 24); this.layoutControlItem59.Name = "layoutControlItem59"; - this.layoutControlItem59.Size = new System.Drawing.Size(1897, 583); + this.layoutControlItem59.Size = new System.Drawing.Size(1897, 622); this.layoutControlItem59.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem59.Text = "使用汇总"; this.layoutControlItem59.TextLocation = DevExpress.Utils.Locations.Top; @@ -2954,6 +2963,30 @@ this.layoutControlGroup15.Name = "layoutControlGroup15"; this.layoutControlGroup15.Size = new System.Drawing.Size(229, 139); // + // emptySpaceItem17 + // + this.emptySpaceItem17.AllowHotTrack = false; + this.emptySpaceItem17.Location = new System.Drawing.Point(1497, 0); + this.emptySpaceItem17.Name = "emptySpaceItem17"; + this.emptySpaceItem17.Size = new System.Drawing.Size(400, 156); + this.emptySpaceItem17.TextSize = new System.Drawing.Size(0, 0); + // + // emptySpaceItem18 + // + this.emptySpaceItem18.AllowHotTrack = false; + this.emptySpaceItem18.Location = new System.Drawing.Point(1410, 0); + this.emptySpaceItem18.Name = "emptySpaceItem18"; + this.emptySpaceItem18.Size = new System.Drawing.Size(87, 108); + this.emptySpaceItem18.TextSize = new System.Drawing.Size(0, 0); + // + // emptySpaceItem19 + // + this.emptySpaceItem19.AllowHotTrack = false; + this.emptySpaceItem19.Location = new System.Drawing.Point(1443, 0); + this.emptySpaceItem19.Name = "emptySpaceItem19"; + this.emptySpaceItem19.Size = new System.Drawing.Size(454, 108); + this.emptySpaceItem19.TextSize = new System.Drawing.Size(0, 0); + // // LocationmgrForm // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); @@ -3152,6 +3185,9 @@ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtLocation.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem19)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -3363,5 +3399,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem71; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem15; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem16; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem17; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem18; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem19; } } \ No newline at end of file diff --git a/winform/基础资料/LocationmgrForm.resx b/winform/基础资料/LocationmgrForm.resx index e5fefff..492c482 100644 --- a/winform/基础资料/LocationmgrForm.resx +++ b/winform/基础资料/LocationmgrForm.resx @@ -121,7 +121,7 @@ 17, 17 - 275, 17 + 274, 17