root
/
ldj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: root:255e37a45cc17d95a7691ce8ff15e76c072f552d
Branches Tags
root:main
root:ldjO
root:ldjadv
root:medicine
root:ldj
..
compare: root:43ff921605507b117b6d2b57eb4b5633bd8f2a41
Branches Tags
root:ldjO
root:ldjadv
root:medicine
root:ldj
root:main

No commits in common. "255e37a45cc17d95a7691ce8ff15e76c072f552d" and "43ff921605507b117b6d2b57eb4b5633bd8f2a41" have entirely different histories.
255e37a45c ... 43ff921605

17 changed files with 171 additions and 320 deletions
Show Stats Expand all files Collapse all files

2
Model/base/BaseOperModel.cs
View File

@ -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

2
Model/wms/data/WmsGoods_Imp.cs
View File

@ -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 goodsid =@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 exists ( SELECT 1 FROM v_erpGoodsBarcods WHERE goodsId =g.goodsId and barcode = @barcode)";
sqlCmd.CommandText = _strSql;
sqlCmd.Parameters.AddWithValue("@barcode", mObj.CmdParameters[0]);

6
Model/wms/data/WmsInRequest_Imp.cs
View File

@ -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,goodsId,barcode ";
",state ,[diffCount] ,[portId] ,[partionEmpId],[partion], [unit] ,[typeName] ,[batch],[spec],bigCount,[manufacturer] ,[validDate],[productDate] ,vender,orderNo";
_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 ";

16
Model/wms/data/WmsOutPickPort_Imp.cs
View File

@ -477,22 +477,6 @@ 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 ";

3
Model/wms/data/Wmslocation_Imp.cs
View File

@ -57,8 +57,9 @@ 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 isnull(GOODSTYPE,0)=0 ) "
+ " AND ( goodsType =@GOODTYPE or goodstype=0 ) "
+ " AND (LOC.WHTYPE>0 or warehouse =@warehouse) " +
// +" AND (LOC.WHTYPE>0 or goodsType =@GOODTYPE) " +
" AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE "
+ " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK with(nolock) WHERE " +
" LOCATIONID = LOC.LOCATIONID" +

19
Model/wms/tables/WmsOutPickPort.cs
View File

@ -250,19 +250,6 @@ namespace DeiNiu.wms.Data.Model
return CustQuery(1120).Tables[0];
}
/// <summary>
/// 根据任务编号获取任务明显
/// </summary>
/// <param name="jobNo"></param>
/// <returns></returns>
public DataTable getFreeTasksByJob(string jobNo)
{
cmdParameters[0] = jobNo;
return CustQuery(1130).Tables[0];
}
/// <summary>
///
/// </summary>
@ -443,16 +430,16 @@ namespace DeiNiu.wms.Data.Model
string viewName = "[v_stockOutPortSumLight]";
if (isLight)
{
viewName = "[v_stockOutPortSumLight]";//按jobNo亮灯摘果, 打印的条码为jobNo
viewName = "[v_stockOutPortSumLight]";//按jobNo亮灯摘果
} else
if (wareHouse > 0)
{
viewName = "[v_stockOutPortSumNoLightByJobNo]";//分区按jobNo 获取任务, 打印的条码为jobNo
viewName = "[v_stockOutPortSumNoLightByJobNo]";//分区按jobNo 获取任务
}
else
{
viewName = "[v_stockOutPortSumNoLightByPickOrder]"; //按pickOrder 全仓按单拣选, 打印的条码为pickorderNo
viewName = "[v_stockOutPortSumNoLightByPickOrder]"; //按pickOrder 全仓按单拣选
}
cmdParameters[6] = viewName;
return CustQuery(2230).Tables[0];

40
Model/wms/tables/Wmslocation.cs
View File

@ -12,7 +12,6 @@ using System.Text;
using System.Data;
using System.Data.SqlClient;
using DeiNiu.Utils;
using System.Collections;
namespace DeiNiu.wms.Data.Model
{
@ -120,7 +119,7 @@ namespace DeiNiu.wms.Data.Model
{
// throw new Exception( string .Format("没有库位，请创建库位,库位类型 {0}, part {1}, abc {2} ", volType.ToString(),part,abc));
return new WmsLocation(WmsConstants.TMP_BULK_LOCATION);
return new WmsLocation("11.01.01.11");
}
@ -206,7 +205,6 @@ namespace DeiNiu.wms.Data.Model
List<WmsLocation> newLocs = new List<WmsLocation>();
decimal goodsMaxcnt = goods.getMaxCount((int)volType);
if (count > 0)
{
@ -222,7 +220,7 @@ namespace DeiNiu.wms.Data.Model
try
{
newLocs = nearLocation.getFreeLocation(nearLocation, goods.goodsId, 0, enumWhType.合格库, locCnt);
newLocs = nearLocation.getFreeLocation(nearLocation, enumWhType.合格库, locCnt);
}
catch (DeiNiuNoFreeLocationkException er) //大小整货位不足
@ -242,9 +240,8 @@ namespace DeiNiu.wms.Data.Model
return CustOper(720) ;
}
public List<WmsLocation> getFreeLocation(WmsLocation nearLocation,string goodsId,int skuId,enumWhType whType,int count =1 )
public List<WmsLocation> getFreeLocation(WmsLocation nearLocation,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<WmsLocation> locations = new List<WmsLocation>();
if (nearLocation != null && nearLocation.warehouse == 0 )
@ -255,24 +252,11 @@ 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;
}
}
log.Debug("start to get locations......." + nearLocation);
LogHelper.debug(GetType(), "start to get locations...>");
LogHelper.debug(GetType(), Util.getJson(nearLocation));
cmdParameters[0] = nearLocation.locationId;
cmdParameters[1] = nearLocation.goodsType;
@ -299,7 +283,7 @@ namespace DeiNiu.wms.Data.Model
}
if (freeCnt < count)
{
log.Debug( "1 to free location in stock , whtype? " + whType);
LogHelper.debug(this.GetType(), "1 to free location in stock , whtype? " + whType);
freeLocations();
ds = CustQuery(300);
}
@ -315,7 +299,7 @@ namespace DeiNiu.wms.Data.Model
if (freeCnt >= count)
{
log.Debug( " end get locations...<<");
LogHelper.debug(GetType(), " end get locations...<<");
return locations;
}
}
@ -324,19 +308,19 @@ namespace DeiNiu.wms.Data.Model
if (freeCnt > 0 ) //未找到足够空货位
{
log.Debug("2 to free location in stock , whtype? " + whType);
LogHelper.debug(this.GetType(), "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);
log.Error(error);
LogHelper.debug(GetType(),error);
}
else
{
log.Debug(" end get locations...<<");
LogHelper.debug(GetType(), " end get locations...<<");
throw new DeiNiuNoFreeLocationkException();
}
log.Debug(" end get locations...<<");
LogHelper.debug(GetType(), " end get locations...<<");
return locations;
}

4
Utils/WmsConstants.cs
View File

@ -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="临时库位";
public static string TMP_BATCH_LOCATION = "临时库位";
public static string TMP_BULK_LOCATION="11.01.01.11";
public static string TMP_BATCH_LOCATION = "11.01.01.11";
public static string TMP_LACK_DEBIT_LOCATION = "缺货虚拟货位";//拣货时系统库存不足，但未进系统的待入货物从此周转，借用
public static bool BOX_BULK_IN_SINGLE_LOC=true; //拆箱入零库，一箱上单个货位，减少分拆上货花费成本。
public static bool VALID_LOC_CAPICITY = false;//是否验证货位库容

22
WcfService1/BLL/lWmsInRequest.cs
View File

@ -691,7 +691,7 @@ namespace DeiNiu.wms.Logical
logIn.Debug(string.Format("需 {0} 型新库位 {1}", enumWhLocVol.不合格区, cnt));
try
{
locs = nearLoc.getFreeLocation(nearLoc, goodsId, skuId, (enumWhType)requestDetail.whType, cnt);
locs = nearLoc.getFreeLocation(nearLoc, (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<WmsLocation> locs = null;
try
{
locs = nearLocation.getFreeLocation(nearLocation,goodsId,skuId, (enumWhType)requestDetail.whType, locCnt);
locs = nearLocation.getFreeLocation(nearLocation, (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<WmsLocation> locs = null;
try
{
locs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt);
locs = nearLocation.getFreeLocation(nearLocation, (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, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt);
locs = nearLocation.getFreeLocation(nearLocation, (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, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt);
locs = nearLocation.getFreeLocation(nearLocation, (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, goodsId, skuId, (enumWhType)requestDetail.whType, locCnt);
locs = nearLocation.getFreeLocation(nearLocation, (enumWhType)requestDetail.whType, locCnt);
logIn.Debug(string.Format(" 找到 {0} 型新库位 {1}", enumWhLocVol.零库, locs.Count));
foreach (WmsLocation loc in locs)
{
@ -2353,14 +2353,18 @@ namespace DeiNiu.wms.Logical
logIn.Debug("to check all jobs in validin detail " + inPort.detailId);
if (inPort.recType != (int)enumStockRecordType.补零入库 && inPort.isDoneByDetailId(inPort.detailId) )
if (inPort.isDoneByDetailId(inPort.detailId) )
{
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))

5
WcfService1/BLL/lWmsOutPickPort.cs
View File

@ -1138,15 +1138,12 @@ namespace DeiNiu.wms.Logical
DataTable dtFreeTasks = new DataTable();
bool isWholePickOrder = (locationId.StartsWith("PK") || locationId.StartsWith("RP"))&& new WmsOutPickRequest(locationId).ID>0;
bool isWholePickOrder = locationId.StartsWith("PK");
if (isWholePickOrder)
{
dtFreeTasks = getWmsOutPickPort.getFreeTasksByPickOrder(locationId);
}else if (locationId.StartsWith("JOB") && new WmsFlow(locationId).ID > 0)
{
dtFreeTasks = getWmsOutPickPort.getFreeTasksByJob(locationId);
}
else
{

38
WcfService1/BLL/lWmsOutPickRequest.cs
View File

@ -3745,7 +3745,7 @@ namespace DeiNiu.wms.Logical
using (TransactionScope scope = new TransactionScope())
{
if (is4OutStockTran((enumStockRecordType)outPickPort.recType)) //(outPickPort.recType != (int)enumStockRecordType.集货拣货)
if (outPickPort.recType != (int)enumStockRecordType.集货拣货)
{
wopr.createLoadTruckJob(operId); //创建装车任务
}
@ -3789,7 +3789,7 @@ namespace DeiNiu.wms.Logical
if (WmsConstants.AUTO_LOAD_TRUCK)
{
if (is4OutStockTran((enumStockRecordType)outPickPort.recType)) //(outPickPort.recType != (int)enumStockRecordType.集货拣货 )
if (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,18 +3912,6 @@ namespace DeiNiu.wms.Logical
}
/// <summary>
/// 是否创建出库运输
/// </summary>
/// <param name="recType"></param>
/// <returns></returns>
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)
{
@ -4022,24 +4010,6 @@ 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();
}
}
@ -4079,7 +4049,7 @@ namespace DeiNiu.wms.Logical
try
{
locs = nearLoc.getFreeLocation(nearLoc, goodsId, skuId, whType, 1);
locs = nearLoc.getFreeLocation(nearLoc, whType, 1);
}
catch (Exception er)
{
@ -4091,7 +4061,7 @@ namespace DeiNiu.wms.Logical
if (locs.Count == 0)
{
nearLoc.locationId = WmsConstants.TMP_BULK_LOCATION;
nearLoc.locationId = "临时货位";
locs.Add(nearLoc);
}

46
WcfService1/BLL/lWmsStock.cs
View File

@ -1066,23 +1066,10 @@ namespace DeiNiu.wms.Logical
}
if (count > 0) //需要新货位
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;
WmsLocation nearLocation = new WmsLocation();
nearLocation.goodsType = goods.goodsType;
nearLocation.whType = (int)enumWhType.合格库;
nearLocation.volType = (int)enumWhLocVol.零库;
nearLocation.locationId = lastBulkLocation;
@ -1093,7 +1080,7 @@ namespace DeiNiu.wms.Logical
try
{
List<WmsLocation> newLocs = nearLocation.getFreeLocation(nearLocation, goodsId, skuId, enumWhType.合格库, locCnt);
List<WmsLocation> newLocs = nearLocation.getFreeLocation(nearLocation, enumWhType.合格库, locCnt);
foreach (WmsLocation loc in newLocs)
{
if (count <= 0)
@ -1243,30 +1230,7 @@ namespace DeiNiu.wms.Logical
stk.recordMaintain(stk.locationId,operId);
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();
scope.Complete();
}
}
catch(Exception e)

2
WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user
View File

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword />
<History>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||;</History>
<History>True|2024-11-02T12:34:37.6850648Z||;True|2024-11-02T20:33:22.3223896+08:00||;True|2024-11-02T19:45:31.8188247+08:00||;True|2024-11-02T18:39:44.9569699+08:00||;True|2024-11-02T18:34:57.3571628+08:00||;True|2024-11-01T22:49:02.9367010+08:00||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;True|2024-03-25T12:01:37.4878288+08:00||;True|2024-03-25T10:10:10.4413746+08:00||;True|2024-03-24T23:57:03.5029554+08:00||;False|2024-03-24T23:56:43.7721505+08:00||;True|2024-03-24T18:10:49.6225565+08:00||;True|2024-03-24T15:29:14.9321731+08:00||;True|2024-03-24T14:49:41.1781462+08:00||;True|2024-03-24T14:49:04.1910017+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

49
winform/service/GoodsOutPickOrderPrint.Designer.cs generated
View File

@ -35,7 +35,6 @@
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();
@ -69,13 +68,13 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = 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();
((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();
@ -105,6 +104,7 @@
((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,24 +162,12 @@
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(184, 529, 450, 400);
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1509, 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);
@ -567,9 +555,27 @@
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;
@ -582,13 +588,6 @@
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);
@ -604,7 +603,6 @@
((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();
@ -634,6 +632,7 @@
((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();

2
winform/service/GoodsOutPickOrderPrint.resx
View File

@ -308,7 +308,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
CQAAAk1TRnQBSQFMAgEBAgEAASABCQEgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAARgBCQEYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

225
winform/基础资料/LocationmgrForm.designer.cs generated
View File

@ -233,9 +233,6 @@
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();
@ -420,9 +417,6 @@
((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
@ -603,7 +597,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(118, 33);
this.chkJobCrossQ.Size = new System.Drawing.Size(139, 33);
this.chkJobCrossQ.StyleController = this.layoutControl1;
this.chkJobCrossQ.TabIndex = 96;
//
@ -708,12 +702,12 @@
// gridControl2
//
this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
this.gridControl2.Location = new System.Drawing.Point(37, 302);
this.gridControl2.Location = new System.Drawing.Point(37, 341);
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, 616);
this.gridControl2.Size = new System.Drawing.Size(1891, 577);
this.gridControl2.TabIndex = 85;
this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@ -797,7 +791,7 @@
//
// pager1
//
this.pager1.Location = new System.Drawing.Point(37, 889);
this.pager1.Location = new System.Drawing.Point(37, 891);
this.pager1.Margin = new System.Windows.Forms.Padding(6);
this.pager1.MaximumSize = new System.Drawing.Size(0, 31);
this.pager1.Name = "pager1";
@ -805,18 +799,18 @@
this.pager1.PageCount = 0;
this.pager1.PageCurrent = 0;
this.pager1.PageSize = 50;
this.pager1.Size = new System.Drawing.Size(1891, 29);
this.pager1.Size = new System.Drawing.Size(1891, 27);
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, 302);
this.gridControl1.Location = new System.Drawing.Point(37, 341);
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, 581);
this.gridControl1.Size = new System.Drawing.Size(1891, 544);
this.gridControl1.TabIndex = 39;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@ -1082,7 +1076,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(742, 47);
this.btnUpdateSize.Size = new System.Drawing.Size(1196, 47);
this.btnUpdateSize.StyleController = this.layoutControl1;
this.btnUpdateSize.TabIndex = 60;
this.btnUpdateSize.Text = "更新";
@ -1091,10 +1085,10 @@
// btnCreate
//
this.btnCreate.Image = ((System.Drawing.Image)(resources.GetObject("btnCreate.Image")));
this.btnCreate.Location = new System.Drawing.Point(1480, 180);
this.btnCreate.Location = new System.Drawing.Point(56, 200);
this.btnCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnCreate.Name = "btnCreate";
this.btnCreate.Size = new System.Drawing.Size(448, 42);
this.btnCreate.Size = new System.Drawing.Size(352, 42);
this.btnCreate.StyleController = this.layoutControl1;
this.btnCreate.TabIndex = 63;
this.btnCreate.Text = "新建";
@ -1103,7 +1097,7 @@
// btnQuery
//
this.btnQuery.Image = ((System.Drawing.Image)(resources.GetObject("btnQuery.Image")));
this.btnQuery.Location = new System.Drawing.Point(1447, 180);
this.btnQuery.Location = new System.Drawing.Point(37, 219);
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);
@ -1188,7 +1182,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(1041, 28);
this.txtColumToQ.Size = new System.Drawing.Size(1528, 28);
this.txtColumToQ.StyleController = this.layoutControl1;
this.txtColumToQ.TabIndex = 5;
//
@ -1210,7 +1204,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(1041, 28);
this.txtLayerToQ.Size = new System.Drawing.Size(1528, 28);
this.txtLayerToQ.StyleController = this.layoutControl1;
this.txtLayerToQ.TabIndex = 6;
//
@ -1227,7 +1221,7 @@
//
// comWhVoTypeQuery
//
this.comWhVoTypeQuery.Location = new System.Drawing.Point(1316, 165);
this.comWhVoTypeQuery.Location = new System.Drawing.Point(1803, 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[] {
@ -1493,7 +1487,7 @@
this.tabbedControlGroup4.Name = "tabbedControlGroup4";
this.tabbedControlGroup4.SelectedTabPage = this.lcgQuery;
this.tabbedControlGroup4.SelectedTabPageIndex = 0;
this.tabbedControlGroup4.Size = new System.Drawing.Size(1936, 230);
this.tabbedControlGroup4.Size = new System.Drawing.Size(1936, 269);
this.tabbedControlGroup4.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.lcgQuery,
this.lcgSetup});
@ -1503,23 +1497,21 @@
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.emptySpaceItem18});
this.tabbedControlGroup2});
this.lcgQuery.Location = new System.Drawing.Point(0, 0);
this.lcgQuery.Name = "lcgQuery";
this.lcgQuery.Size = new System.Drawing.Size(1897, 156);
this.lcgQuery.Size = new System.Drawing.Size(1897, 195);
this.lcgQuery.Text = "货位查询";
//
// layoutControlItem42
//
this.layoutControlItem42.Control = this.btnQuery;
this.layoutControlItem42.Location = new System.Drawing.Point(1410, 108);
this.layoutControlItem42.Location = new System.Drawing.Point(0, 147);
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(87, 48);
this.layoutControlItem42.Size = new System.Drawing.Size(1897, 48);
this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem42.TextVisible = false;
@ -1530,7 +1522,7 @@
this.tabbedControlGroup2.Name = "tabbedControlGroup2";
this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup17;
this.tabbedControlGroup2.SelectedTabPageIndex = 0;
this.tabbedControlGroup2.Size = new System.Drawing.Size(1410, 156);
this.tabbedControlGroup2.Size = new System.Drawing.Size(1897, 147);
this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup17,
this.layoutControlGroup13,
@ -1563,7 +1555,7 @@
this.emptySpaceItem15});
this.layoutControlGroup17.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup17.Name = "layoutControlGroup17";
this.layoutControlGroup17.Size = new System.Drawing.Size(1371, 82);
this.layoutControlGroup17.Size = new System.Drawing.Size(1858, 73);
this.layoutControlGroup17.Text = "基本信息";
//
// layoutControlItem55
@ -1573,7 +1565,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, 58);
this.layoutControlItem55.Size = new System.Drawing.Size(170, 49);
this.layoutControlItem55.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem55.Text = "库房分区";
this.layoutControlItem55.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1602,7 +1594,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, 56);
this.layoutControlItem49.Size = new System.Drawing.Size(208, 47);
this.layoutControlItem49.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem49.Text = "货位分区";
this.layoutControlItem49.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1631,7 +1623,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, 82);
this.emptySpaceItem10.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0);
//
@ -1654,7 +1646,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, 82);
this.emptySpaceItem13.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem13.TextSize = new System.Drawing.Size(0, 0);
//
@ -1666,7 +1658,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, 58);
this.layoutControlItem50.Size = new System.Drawing.Size(188, 49);
this.layoutControlItem50.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem50.Text = "货物类别";
this.layoutControlItem50.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1707,7 +1699,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, 56);
this.layoutControlItem57.Size = new System.Drawing.Size(180, 47);
this.layoutControlItem57.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem57.Text = "货位状态";
this.layoutControlItem57.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1721,7 +1713,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, 82);
this.emptySpaceItem7.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
//
@ -1732,7 +1724,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, 82);
this.emptySpaceItem11.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem11.TextSize = new System.Drawing.Size(0, 0);
//
@ -1743,7 +1735,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, 82);
this.emptySpaceItem20.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem20.TextSize = new System.Drawing.Size(0, 0);
//
@ -1764,11 +1756,11 @@
//
this.layoutControlItem48.Control = this.comWhVoTypeQuery;
this.layoutControlItem48.CustomizationFormText = "货位容积";
this.layoutControlItem48.Location = new System.Drawing.Point(1183, 39);
this.layoutControlItem48.Location = new System.Drawing.Point(1670, 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, 43);
this.layoutControlItem48.Size = new System.Drawing.Size(188, 34);
this.layoutControlItem48.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem48.Text = "存储分类";
this.layoutControlItem48.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1783,7 +1775,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, 58);
this.layoutControlItem53.Size = new System.Drawing.Size(188, 49);
this.layoutControlItem53.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem53.Text = "ABC类别 ";
this.layoutControlItem53.TextSize = new System.Drawing.Size(75, 22);
@ -1795,7 +1787,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, 43);
this.layoutControlItem66.Size = new System.Drawing.Size(189, 34);
this.layoutControlItem66.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem66.Text = "库容倍数";
this.layoutControlItem66.TextSize = new System.Drawing.Size(75, 22);
@ -1805,7 +1797,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(10, 43);
this.emptySpaceItem9.Size = new System.Drawing.Size(497, 34);
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem71
@ -1813,7 +1805,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(124, 39);
this.layoutControlItem71.Size = new System.Drawing.Size(145, 39);
this.layoutControlItem71.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem71.TextVisible = false;
this.layoutControlItem71.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
@ -1821,9 +1813,9 @@
// emptySpaceItem15
//
this.emptySpaceItem15.AllowHotTrack = false;
this.emptySpaceItem15.Location = new System.Drawing.Point(1296, 0);
this.emptySpaceItem15.Location = new System.Drawing.Point(1317, 0);
this.emptySpaceItem15.Name = "emptySpaceItem15";
this.emptySpaceItem15.Size = new System.Drawing.Size(75, 39);
this.emptySpaceItem15.Size = new System.Drawing.Size(541, 39);
this.emptySpaceItem15.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup13
@ -1840,7 +1832,7 @@
this.emptySpaceItem25});
this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup13.Name = "layoutControlGroup13";
this.layoutControlGroup13.Size = new System.Drawing.Size(1371, 82);
this.layoutControlGroup13.Size = new System.Drawing.Size(1858, 73);
this.layoutControlGroup13.Text = "货位坐标";
//
// layoutControlItem37
@ -1866,7 +1858,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, 58);
this.layoutControlItem38.Size = new System.Drawing.Size(125, 49);
this.layoutControlItem38.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem38.Text = "货架起止";
this.layoutControlItem38.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1896,7 +1888,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, 58);
this.layoutControlItem40.Size = new System.Drawing.Size(64, 49);
this.layoutControlItem40.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem40.Text = "--";
this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
@ -1925,7 +1917,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(1047, 24);
this.layoutControlItem46.Size = new System.Drawing.Size(1534, 24);
this.layoutControlItem46.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem46.Text = "--";
this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
@ -1939,7 +1931,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, 58);
this.layoutControlItem43.Size = new System.Drawing.Size(125, 49);
this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem43.Text = "列号起止";
this.layoutControlItem43.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -1954,7 +1946,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(1047, 58);
this.layoutControlItem44.Size = new System.Drawing.Size(1534, 49);
this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem44.Text = "--";
this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
@ -1967,7 +1959,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, 82);
this.emptySpaceItem25.Size = new System.Drawing.Size(10, 73);
this.emptySpaceItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem25.TextSize = new System.Drawing.Size(0, 0);
//
@ -1981,7 +1973,7 @@
this.emptySpaceItem22});
this.layoutControlGroup18.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup18.Name = "layoutControlGroup18";
this.layoutControlGroup18.Size = new System.Drawing.Size(1371, 82);
this.layoutControlGroup18.Size = new System.Drawing.Size(1858, 73);
this.layoutControlGroup18.Text = "标签编号";
//
// layoutControlItem52
@ -2021,7 +2013,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, 58);
this.layoutControlItem9.Size = new System.Drawing.Size(179, 49);
this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem9.Text = "标签端口";
this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2034,7 +2026,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(1192, 82);
this.emptySpaceItem22.Size = new System.Drawing.Size(1679, 73);
this.emptySpaceItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem22.TextSize = new System.Drawing.Size(0, 0);
//
@ -2044,12 +2036,10 @@
this.lcgSetup.AppearanceGroup.Options.UseFont = true;
this.lcgSetup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.tabbedControlGroup3,
this.layoutControlGroup14,
this.layoutControlItem41,
this.emptySpaceItem19});
this.layoutControlGroup14});
this.lcgSetup.Location = new System.Drawing.Point(0, 0);
this.lcgSetup.Name = "lcgSetup";
this.lcgSetup.Size = new System.Drawing.Size(1897, 156);
this.lcgSetup.Size = new System.Drawing.Size(1897, 195);
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);
@ -2061,7 +2051,7 @@
this.tabbedControlGroup3.Name = "tabbedControlGroup3";
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup5;
this.tabbedControlGroup3.SelectedTabPageIndex = 0;
this.tabbedControlGroup3.Size = new System.Drawing.Size(1047, 156);
this.tabbedControlGroup3.Size = new System.Drawing.Size(1501, 195);
this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup5,
this.layoutControlGroup11,
@ -2082,7 +2072,7 @@
this.layoutControlItem22});
this.layoutControlGroup5.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup5.Name = "layoutControlGroup5";
this.layoutControlGroup5.Size = new System.Drawing.Size(1008, 82);
this.layoutControlGroup5.Size = new System.Drawing.Size(1462, 121);
this.layoutControlGroup5.Text = "基本属性";
//
// layoutControlItem27
@ -2107,7 +2097,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, 58);
this.layoutcomWarehouse.Size = new System.Drawing.Size(227, 97);
this.layoutcomWarehouse.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutcomWarehouse.Text = "库房分区";
this.layoutcomWarehouse.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2151,7 +2141,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, 58);
this.layoutControlItem16.Size = new System.Drawing.Size(240, 97);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "货位类型";
this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2166,7 +2156,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, 58);
this.layoutControlItem19.Size = new System.Drawing.Size(240, 97);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "零库整库";
this.layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2179,7 +2169,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(208, 82);
this.emptySpaceItem2.Size = new System.Drawing.Size(662, 121);
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem22
@ -2189,7 +2179,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, 82);
this.layoutControlItem22.Size = new System.Drawing.Size(93, 121);
this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@ -2215,7 +2205,7 @@
this.emptySpaceItem26});
this.layoutControlGroup11.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup11.Name = "layoutControlGroup11";
this.layoutControlGroup11.Size = new System.Drawing.Size(1008, 82);
this.layoutControlGroup11.Size = new System.Drawing.Size(1462, 121);
this.layoutControlGroup11.Text = "其它属性";
//
// layoutControlItem20
@ -2239,7 +2229,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, 44);
this.layoutControlItem28.Size = new System.Drawing.Size(172, 83);
this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem28.Text = "线路编号";
this.layoutControlItem28.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2265,7 +2255,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, 44);
this.layoutControlItem13.Size = new System.Drawing.Size(77, 83);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@ -2303,7 +2293,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, 44);
this.layoutControlItem60.Size = new System.Drawing.Size(172, 83);
this.layoutControlItem60.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem60.Text = "货主专用";
this.layoutControlItem60.TextSize = new System.Drawing.Size(75, 22);
@ -2315,7 +2305,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, 44);
this.layoutControlItem62.Size = new System.Drawing.Size(77, 83);
this.layoutControlItem62.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem62.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem62.TextVisible = false;
@ -2379,7 +2369,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, 44);
this.layoutControlItem70.Size = new System.Drawing.Size(85, 83);
this.layoutControlItem70.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem70.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem70.TextVisible = false;
@ -2391,7 +2381,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, 44);
this.layoutControlItem69.Size = new System.Drawing.Size(165, 83);
this.layoutControlItem69.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem69.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem69.TextVisible = false;
@ -2401,7 +2391,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(260, 44);
this.emptySpaceItem12.Size = new System.Drawing.Size(714, 83);
this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem26
@ -2409,7 +2399,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(10, 38);
this.emptySpaceItem26.Size = new System.Drawing.Size(464, 38);
this.emptySpaceItem26.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup3
@ -2422,7 +2412,7 @@
this.layoutControlItem11});
this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup3.Name = "layoutControlGroup3";
this.layoutControlGroup3.Size = new System.Drawing.Size(1008, 82);
this.layoutControlGroup3.Size = new System.Drawing.Size(1462, 121);
this.layoutControlGroup3.Text = "货位尺寸";
//
// f
@ -2446,7 +2436,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, 58);
this.layoutControlItem24.Size = new System.Drawing.Size(129, 97);
this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem24.Text = "宽(cm)";
this.layoutControlItem24.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2475,7 +2465,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, 58);
this.layoutControlItem23.Size = new System.Drawing.Size(131, 97);
this.layoutControlItem23.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem23.Text = "承重(kg)";
this.layoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@ -2489,7 +2479,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(748, 82);
this.layoutControlItem11.Size = new System.Drawing.Size(1202, 121);
this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@ -2504,7 +2494,7 @@
this.layoutControlItem14});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.Size = new System.Drawing.Size(1008, 82);
this.layoutControlGroup2.Size = new System.Drawing.Size(1462, 121);
this.layoutControlGroup2.Text = "电子标签布局";
//
// layoutControlItem15
@ -2514,7 +2504,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, 82);
this.layoutControlItem15.Size = new System.Drawing.Size(54, 121);
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem15.Text = "层";
this.layoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top;
@ -2527,7 +2517,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, 82);
this.layoutControlItem21.Size = new System.Drawing.Size(54, 121);
this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem21.Text = "列";
this.layoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top;
@ -2538,7 +2528,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(755, 82);
this.emptySpaceItem8.Size = new System.Drawing.Size(1209, 121);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem54
@ -2548,7 +2538,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, 82);
this.layoutControlItem54.Size = new System.Drawing.Size(91, 121);
this.layoutControlItem54.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem54.Text = "起始编号";
this.layoutControlItem54.TextLocation = DevExpress.Utils.Locations.Top;
@ -2562,7 +2552,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, 82);
this.layoutControlItem14.Size = new System.Drawing.Size(54, 121);
this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem14.Text = "端口";
this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
@ -2578,7 +2568,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(1008, 82);
this.layoutControlGroup21.Size = new System.Drawing.Size(1462, 121);
this.layoutControlGroup21.Text = "电子标签修改";
//
// layoutControlItem18
@ -2600,7 +2590,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, 58);
this.layoutControlItem34.Size = new System.Drawing.Size(130, 97);
this.layoutControlItem34.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem34.Text = "货位地址";
this.layoutControlItem34.TextSize = new System.Drawing.Size(75, 22);
@ -2612,7 +2602,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, 82);
this.layoutControlItem33.Size = new System.Drawing.Size(86, 121);
this.layoutControlItem33.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem33.TextVisible = false;
@ -2622,7 +2612,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(792, 82);
this.emptySpaceItem6.Size = new System.Drawing.Size(1246, 121);
this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup14
@ -2636,10 +2626,11 @@
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, 156);
this.layoutControlGroup14.Size = new System.Drawing.Size(396, 195);
this.layoutControlGroup14.Text = "货位坐标";
//
// layoutControlItem7
@ -2754,11 +2745,11 @@
// layoutControlItem41
//
this.layoutControlItem41.Control = this.btnCreate;
this.layoutControlItem41.Location = new System.Drawing.Point(1443, 108);
this.layoutControlItem41.Location = new System.Drawing.Point(0, 79);
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(454, 48);
this.layoutControlItem41.Size = new System.Drawing.Size(358, 48);
this.layoutControlItem41.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem41.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem41.TextVisible = false;
@ -2768,16 +2759,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, 40);
this.emptySpaceItem16.Size = new System.Drawing.Size(358, 31);
this.emptySpaceItem16.TextSize = new System.Drawing.Size(0, 0);
//
// tabbedControlGroup5
//
this.tabbedControlGroup5.Location = new System.Drawing.Point(0, 230);
this.tabbedControlGroup5.Location = new System.Drawing.Point(0, 269);
this.tabbedControlGroup5.Name = "tabbedControlGroup5";
this.tabbedControlGroup5.SelectedTabPage = this.layoutControlGroup19;
this.tabbedControlGroup5.SelectedTabPageIndex = 0;
this.tabbedControlGroup5.Size = new System.Drawing.Size(1936, 696);
this.tabbedControlGroup5.Size = new System.Drawing.Size(1936, 657);
this.tabbedControlGroup5.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup19,
this.layoutControlGroup20});
@ -2789,15 +2780,15 @@
this.layoutControlItem31});
this.layoutControlGroup19.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup19.Name = "layoutControlGroup19";
this.layoutControlGroup19.Size = new System.Drawing.Size(1897, 622);
this.layoutControlGroup19.Size = new System.Drawing.Size(1897, 583);
this.layoutControlGroup19.Text = "货位列表";
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.pager1;
this.layoutControlItem32.Location = new System.Drawing.Point(0, 587);
this.layoutControlItem32.Location = new System.Drawing.Point(0, 550);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.Size = new System.Drawing.Size(1897, 35);
this.layoutControlItem32.Size = new System.Drawing.Size(1897, 33);
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
//
@ -2809,7 +2800,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, 587);
this.layoutControlItem31.Size = new System.Drawing.Size(1897, 550);
this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem31.Text = "货位列表";
this.layoutControlItem31.TextLocation = DevExpress.Utils.Locations.Top;
@ -2822,7 +2813,7 @@
this.layoutControlItem59});
this.layoutControlGroup20.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup20.Name = "layoutControlGroup20";
this.layoutControlGroup20.Size = new System.Drawing.Size(1897, 622);
this.layoutControlGroup20.Size = new System.Drawing.Size(1897, 583);
this.layoutControlGroup20.Text = "使用汇总";
//
// layoutControlItem59
@ -2831,7 +2822,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, 622);
this.layoutControlItem59.Size = new System.Drawing.Size(1897, 583);
this.layoutControlItem59.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem59.Text = "使用汇总";
this.layoutControlItem59.TextLocation = DevExpress.Utils.Locations.Top;
@ -2963,30 +2954,6 @@
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);
@ -3185,9 +3152,6 @@
((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();
@ -3399,8 +3363,5 @@
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;
}
}

2
winform/基础资料/LocationmgrForm.resx
View File

@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>274, 17</value>
<value>275, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bbQuery.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">