梳理复核播种流程
This commit is contained in:
parent
ffadd567d3
commit
1aa2f1ad68
|
|
@ -29,6 +29,12 @@ namespace DeiNiu.wms.Data.Model
|
|||
sqlCmd.CommandText = _strSql;
|
||||
|
||||
break;
|
||||
case 10: //by custId
|
||||
_strSql = "SELECT * FROM v_tmsLineDetail WHERE custId = @custId";
|
||||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@custId", mObj.CmdParameters[0]);
|
||||
break;
|
||||
|
||||
case 100: //by name
|
||||
_strSql = "SELECT * FROM t_tmsStock WHERE NAME = @NAME";
|
||||
sqlCmd.CommandText = _strSql;
|
||||
|
|
@ -58,7 +64,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
break;
|
||||
case 300: //get line 整货集货货位 where the cust in
|
||||
_strSql = "SELECT top 1 locationId FROM v_tmsLineLocation WHERE custId = @custId and volType = @volType ";
|
||||
_strSql = "SELECT top 1 locationId FROM v_tmsLineLocation WHERE locationid is not null and custId = @custId and volType = @volType ";
|
||||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@custId", mObj.CmdParameters[0]);
|
||||
sqlCmd.Parameters.AddWithValue("@volType", (int)enumWhLocVol.分拣集货);
|
||||
|
|
|
|||
|
|
@ -829,7 +829,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
sqlCmd.Parameters.AddWithValue("@orderDate", mObj.CmdParameters[3]);
|
||||
|
||||
sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]);
|
||||
|
||||
log.Debug(_strSql);
|
||||
sqlCmd.CommandText = _strSql;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -761,9 +761,12 @@ namespace DeiNiu.wms.Data.Model
|
|||
break;
|
||||
|
||||
case 11001: //get pick details by seedsPickNo,skuId
|
||||
_strSql = "SELECT * from [v_stockOutWavePickDetail] where "
|
||||
+" seedsPickNo = @seedsPickNo and pdaOuting >0 "
|
||||
+" and skuId=@skuid";
|
||||
// _strSql = "SELECT * from [v_stockOutWavePickDetail] where "
|
||||
// +" seedsPickNo = @seedsPickNo and pdaOuting >0 "
|
||||
// +" and skuId=@skuid";
|
||||
|
||||
_strSql = " SELECT * FROM v_stockoutport p WHERE skuId=@skuid and exists" +
|
||||
" (select 1 from t_wmsoutpickrequest where pickOrderNo = p.pickorderno and seedsPickNo=@seedsPickNo)";
|
||||
|
||||
sqlCmd.CommandText = _strSql;
|
||||
sqlCmd.Parameters.AddWithValue("@seedsPickNo", mObj.CmdParameters[0]);
|
||||
|
|
|
|||
|
|
@ -145,7 +145,8 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
case 500: // get location info by locationId
|
||||
|
||||
_strSql = " select [id],[locationId] ,[ownerCode] ,[warehouse] ,[channel] ,[shelf] ,[layer] ,[col] ,[elabId] ,[elabAddress] ,[height] ,[width] ,[length] , [weight] ,[port] ,[part] ,[bigPart] ,[goodsType] ,[whType] ,[whGoodsType] ,[whVolType] ,[volType] ,[ABC] ,[state]" +
|
||||
_strSql = " select [id],[locationId] ,[ownerCode] ,[warehouse] ,[channel] ,[shelf] ,[layer] ,[col] ,[elabId] ,[elabAddress] ,[height] ,[width] ,[length] , " +
|
||||
" [weight] ,[port] ,[part] ,[bigPart] ,[goodsType] ,[whType] ,[whGoodsType] ,[whVolType] ,[volType] ,[ABC] ,[state],empId" +
|
||||
" from v_location where locationId= @locId";
|
||||
|
||||
sqlCmd.CommandText = _strSql;
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
public DataTable getByErpState()
|
||||
{
|
||||
cmdParameters[0] =(int)enumErpOrderStatus.通知失败;
|
||||
cmdParameters[1] = (int)enumOutStockRequestStatus.已装车;
|
||||
cmdParameters[1] = (int)enumOutStockRequestStatus.装车集货;
|
||||
|
||||
|
||||
return CustQuery(700).Tables[0];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,12 @@ namespace DeiNiu.wms.Data.Model
|
|||
{
|
||||
|
||||
}
|
||||
protected override void getImp()
|
||||
public TmsStock(string locationId)
|
||||
{
|
||||
cmdParameters[0] = locationId;
|
||||
getModel(10);
|
||||
}
|
||||
protected override void getImp()
|
||||
{
|
||||
model_imp = new TmsStock_Imp();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
public void finishedTasksPlus(int ownerId,decimal finishedPcs, bool isChildTasksOperation=false,bool isDone=false)
|
||||
{
|
||||
LogHelper.debug("finishedTasksPlus", string.Format(" orderno {5}, ownerId {0}, finishedPcs: {1}, isChildTasksOperation: {2}, isDone {3}, state {4}",
|
||||
log.Debug( string.Format(" orderno {5}, ownerId {0}, finishedPcs: {1}, isChildTasksOperation: {2}, isDone {3}, state {4}",
|
||||
ownerId, finishedPcs, isChildTasksOperation, isDone,state ,orderNo));
|
||||
if (!isChildTasksOperation && state == (int)enumFlowTaskStatus.已完成)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -584,7 +584,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
/// pick details by pickOrderNo
|
||||
/// including batch and bulk
|
||||
/// </summary>
|
||||
/// <param name="waveOrder"></param>
|
||||
/// <param name="pickOrderNo"></param>
|
||||
/// <returns></returns>
|
||||
public DataSet getPickDetailByPickOrderNo(string pickOrderNo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
{
|
||||
lst= lst.Concat(requests[p]).ToList();
|
||||
}
|
||||
LogHelper.debug(this.GetType(), string.Format(" plate {0} request count {1} ", plateId, lst.Count));
|
||||
log.Debug( string.Format(" plate {0} request count {1} ", plateId, lst.Count));
|
||||
return lst ;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
public class WmsLocation : WmsLocation_base
|
||||
{
|
||||
private int _partion=0;
|
||||
private int _empId = 0;
|
||||
|
||||
public int partion
|
||||
{
|
||||
|
|
@ -30,7 +31,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
|
||||
if (dt.Rows.Count > 0)
|
||||
{
|
||||
dt.Rows[0]["partion"].ToString();
|
||||
// dt.Rows[0]["partion"].ToString();
|
||||
if (dt.Columns.Contains("partion") && !(dt.Rows[0]["partion"] is DBNull))
|
||||
{
|
||||
_partion = Convert.ToInt32(dt.Rows[0]["partion"].ToString());
|
||||
|
|
@ -41,6 +42,29 @@ namespace DeiNiu.wms.Data.Model
|
|||
}
|
||||
set { _partion = value; }
|
||||
}
|
||||
|
||||
public int empId
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_empId == 0 && ID > 0)
|
||||
{
|
||||
DataTable dt = CustQuery(10).Tables[0];
|
||||
|
||||
if (dt.Rows.Count > 0)
|
||||
{
|
||||
// dt.Rows[0]["empId"].ToString();
|
||||
if (dt.Columns.Contains("empId") && !(dt.Rows[0]["empId"] is DBNull))
|
||||
{
|
||||
_empId = Convert.ToInt32(dt.Rows[0]["empId"].ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
return _empId;
|
||||
}
|
||||
set => _empId = value;
|
||||
}
|
||||
|
||||
public WmsLocation()
|
||||
{
|
||||
|
||||
|
|
@ -56,7 +80,15 @@ namespace DeiNiu.wms.Data.Model
|
|||
}
|
||||
public WmsLocation(DataRow dr): base(dr)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
_empId = Convert.ToInt32( dr["empId"].ToString());
|
||||
}
|
||||
catch(Exception er)
|
||||
{
|
||||
log.Error(er);
|
||||
}
|
||||
|
||||
}
|
||||
public WmsLocation(String locationId)
|
||||
{
|
||||
|
|
@ -358,7 +390,7 @@ namespace DeiNiu.wms.Data.Model
|
|||
/// get location info by locId
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public DataTable getLocations(string locId)
|
||||
public DataTable getLocationDt(string locId)
|
||||
{
|
||||
cmdParameters[0] = locId;
|
||||
return CustQuery(500).Tables[0];
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ namespace DeiNiu.Utils
|
|||
|
||||
|
||||
public enum EnumFlowTaskType { 入库验收= 0,入库上架,播种分货, 补货下架, 补货上架, 出库下架,移库下架,移库上架, 不良品入库,
|
||||
报废下架, 退供应商下架, 退供应商上架,出库检验,装车运输,盘点采集,直通分货,客户集货,日常理货};
|
||||
报废下架, 退供应商下架, 退供应商上架,出库装车复核,装车运输,盘点采集,直通分货,客户集货,日常理货};
|
||||
|
||||
public enum enumFlowTaskStatus{ 未开始=0,进行中,暂停,取消,已完成};
|
||||
public enum enumFlowTaskResult { 成功 = 0,失败, 已被他人开始,状态不允许,任务不存在 };
|
||||
|
|
@ -97,8 +97,8 @@ namespace DeiNiu.Utils
|
|||
public enum enumOutStockRequestStatus
|
||||
{
|
||||
待审核 = 0, 订单驳回/*1*/, 待出库/*2*/ , 准备分拣/*3*/, 库存不足/*4*/, 等待补货/*5*/, 待定位/*6*/, 定位完成/*7*/, 等待波次/*8*/,
|
||||
正在分拣/*9*/, 分拣完成/*10*/, 复核完成/*11 */, 集货完成/*12 */, 复核异常/*13*/, 已装车/*14*/, 已出库/*15*/,
|
||||
客户签收/*16*/, 客户拒签/*17*/, 订单完成/*18*/, 订单作废/*19*/, 订单异常/*20*/
|
||||
正在分拣/*9*/, 分拣完成/*10*/, 复核完成/*11 */, 集货完成/*12 */, 复核异常/*13*/, 装车集货/*14*/, 装车复核/*15*/, 已出库,/*16*/
|
||||
客户签收, 客户拒签, 订单完成, 订单作废, 订单异常
|
||||
};
|
||||
/// <summary>
|
||||
/// 散货、整货分拣状态 bulkPickstate,batchpickstate （t_wmsOutPickDetail， t_wmsOutPickRequest）
|
||||
|
|
@ -281,10 +281,12 @@ namespace DeiNiu.Utils
|
|||
, 容器非空闲,容器不存在,容器空间不足,容器空闲无任务
|
||||
,容器已被其他货区占用,只允许下级容器放入上级容器,客户容器已被其他客户占用,集货线路不同,容器非直接包含关系,码头集货需要客户类型的容器,客户已经在其他码头集货,
|
||||
容器已完成客户集货,
|
||||
容器已完成码头集货,容器已完成装车集货,装车集货需要码头类型的容器,完成码头集货后才能装车,完成装车集货后才能装车, 装车需要客户类型的容器,客户货物不属于此车,发车需要运输类型的容器,容器已完成合流集货,已发车,等级别的容器才可以合并,相同上级容器的子容器才可以相互合并,码头已装车集货,前置集货未完成,容器所属客户不明确
|
||||
容器已完成码头集货,容器已完成装车集货,装车集货需要码头类型的容器,完成码头集货后才能装车,完成装车集货后才能装车, 装车需要客户类型的容器,客户货物不属于此车,
|
||||
发车需要运输类型的容器,容器已完成合流集货,已发车,等级别的容器才可以合并,相同上级容器的子容器才可以相互合并,码头已装车集货,前置集货未完成,容器所属客户不明确,
|
||||
发车待复核,容器已完成复核
|
||||
};
|
||||
public enum enumRegBoxResult { 成功 = 0, 箱子颜色和订单灯色不符, 当前无拣货订单 };
|
||||
public enum enumPlateStatus { 空闲 = 0, 入库待上架, 存储架上, 出库待集货, 取总待分播, 已集货, 已装车, 已发车,临时堆放, 不可用 };
|
||||
public enum enumPlateStatus { 空闲 = 0, 入库待上架, 存储架上, 出库待集货, 取总待分播, 已集货, 待复核, 已装车, 已发车,临时堆放, 不可用 };
|
||||
|
||||
public enum enumPlateLevel { 临时容器 = 0, 固定容器,客户集货, 线路集货,运输车 };
|
||||
|
||||
|
|
|
|||
|
|
@ -213,10 +213,10 @@ namespace DeiNiu.Utils
|
|||
public static string GOODS_VALID_DATE_FORMAT = "yyyyMMdd";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static string CURRENT_SEEDS_NO, CURRENT_SEEDS_GOODSID, CURRENT_SEEDS_GOOD_BATCH;
|
||||
|
||||
// public static string CURRENT_SEEDS_NO, CURRENT_SEEDS_GOODSID, CURRENT_SEEDS_GOOD_BATCH, CURRENT_SEEDS_PICK_ORDERNO;
|
||||
public static int CURRENT_SEEDS_GOOD_SKUID;
|
||||
public static int CURRENT_SEEDS_LABLE_ID;
|
||||
public static Dictionary<string, bool> SEEDS_CURRENT_PICK_STATUS = new Dictionary<string, bool>();
|
||||
|
|
@ -454,7 +454,8 @@ namespace DeiNiu.Utils
|
|||
public static bool IS_CHECK_LINE_ON_LOAD;//是否装车时限制同线路客户
|
||||
public static bool UP_DOWN_SELF_RECS=false; //是否只能上架自己下架的货品
|
||||
|
||||
public static bool AUTO_LOAD_TRUCK = true; //客户订单的容器自动装车
|
||||
public static bool AUTO_LOAD_TRUCK = true; //客户订单的容器自动装车集货
|
||||
public static bool AUTO_LOAD_TRUCK_VALID = false; //发车前是否自动复核，否则客户订单装车集货后，发车前需要复核
|
||||
|
||||
public static int STOCK_HIS_KEEP_DAYS = 31;
|
||||
public static bool OUT_SEEDS_CAN_OVER_REQ; //集货播种时，可否比原来的需求多发
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ namespace DeiNiu.Wcf
|
|||
|
||||
|
||||
|
||||
var result = DataTableToDicList(loc.getWmslocation.getLocations(locId));
|
||||
var result = DataTableToDicList(loc.getWmslocation.getLocationDt(locId));
|
||||
|
||||
return new FormatedResult(JsonConvert.SerializeObject(result));
|
||||
|
||||
|
|
|
|||
|
|
@ -344,6 +344,36 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
}
|
||||
|
||||
//TODO: 创建装车复核任务
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID //&& plate.state != (int)enumPlateStatus.待复核
|
||||
// && (req.batchPickState > -1 && req.batchCheckedby == 0|| req.bulkPickState > -1 && req.bulkCheckedby == 0)
|
||||
)
|
||||
{
|
||||
// WmsFlow vFlow = new WmsFlow(tmsTranRequest.transNo, tmsTranRequest.viechleNo, enumFlowTaskStatus.未开始, EnumFlowTaskType.出库装车复核);
|
||||
// if (vFlow.ID == 0)
|
||||
{
|
||||
WmsFlow vFlow = new WmsFlow();
|
||||
vFlow.operater = operId;
|
||||
vFlow.orderNo = tmsTranRequest.transNo;
|
||||
vFlow.flowNo = tmsTranRequest.viechleNo;
|
||||
vFlow.type = (int)EnumFlowTaskType.出库装车复核;
|
||||
vFlow.typeName = EnumFlowTaskType.出库装车复核.ToString();
|
||||
vFlow.task = tmsTranRequest.transNo;
|
||||
|
||||
vFlow.taskCnt = 1;
|
||||
vFlow.Add();
|
||||
|
||||
plate.state =(int) enumPlateStatus.待复核;
|
||||
plate.Update();
|
||||
|
||||
}
|
||||
// else
|
||||
{
|
||||
// vFlow.taskCnt ++;
|
||||
// vFlow.Update();
|
||||
}
|
||||
}
|
||||
|
||||
if (i > 0)
|
||||
{
|
||||
//plate.transNo = tmsTranRequest.transNo;
|
||||
|
|
|
|||
|
|
@ -420,14 +420,14 @@ namespace DeiNiu.wms.Logical
|
|||
int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据
|
||||
|
||||
//#if DEBUG
|
||||
// if (lblist.Count == 0)
|
||||
// if (TESTlblist.Count == 0)
|
||||
{
|
||||
TESTlblist.Clear();
|
||||
initialDebugSetting();
|
||||
}
|
||||
TESTlblist.Sort();
|
||||
// int minId = lblist[0];
|
||||
// int maxId = lblist[lblist.Count - 1];
|
||||
// int minId = TESTlblist[0];
|
||||
// int maxId = TESTlblist[TESTlblist.Count - 1];
|
||||
// labelMaxInWave = 2;
|
||||
//#endif
|
||||
|
||||
|
|
@ -838,6 +838,7 @@ namespace DeiNiu.wms.Logical
|
|||
// wpl.elabId = new Random().Next(1,4); //测试。。。随机分配标签id 为 1-3
|
||||
wpl.port = rec.location.port;
|
||||
wpl.orderDetailId = rec.orderDetailId;
|
||||
|
||||
//#if DEBUG
|
||||
try
|
||||
{
|
||||
|
|
@ -865,12 +866,15 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
foreach (WmsOutPickLable_tmp wp in lstLabel) //建立电子拣选临时数据
|
||||
{
|
||||
wp.Add();
|
||||
|
||||
|
||||
WmsOutPickPort wop = new WmsOutPickPort();// wp.recordId
|
||||
wop.getPickPortByRecordId(wp.recordId);
|
||||
wop.dpsOrder = waveOrder;
|
||||
wop.Update();
|
||||
|
||||
wp.portId = wop.ID;
|
||||
wp.Add();
|
||||
// WmsOutPickDetail pd = new WmsOutPickDetail(wp.orderDetailId);
|
||||
// pd.updateErpSaleDetail_deng(true);
|
||||
|
||||
|
|
@ -1131,14 +1135,16 @@ namespace DeiNiu.wms.Logical
|
|||
int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据
|
||||
|
||||
#if DEBUG
|
||||
// if (lblist.Count == 0)
|
||||
|
||||
// if (TESTlblist.Count == 0)
|
||||
{
|
||||
lblist.Clear();
|
||||
TESTlblist.Clear();
|
||||
initialDebugSetting();
|
||||
}
|
||||
lblist.Sort();
|
||||
// int minId = lblist[0];
|
||||
// int maxId = lblist[lblist.Count - 1];
|
||||
TESTlblist.Sort();
|
||||
|
||||
// int minId = TESTlblist[0];
|
||||
// int maxId = TESTlblist[TESTlblist.Count - 1];
|
||||
// labelMaxInWave = 2;
|
||||
#endif
|
||||
|
||||
|
|
@ -1290,16 +1296,16 @@ namespace DeiNiu.wms.Logical
|
|||
sr.count = Convert.ToDecimal(drv["count"].ToString());
|
||||
}
|
||||
#if DEBUG
|
||||
if (lblist.Count > 0)
|
||||
if (TESTlblist.Count > 0)
|
||||
{
|
||||
int id = new Random().Next(lblist.Count);
|
||||
int id = new Random().Next(TESTlblist.Count);
|
||||
//#if DEBUG
|
||||
sr.location.elabId = lblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
sr.location.elabId = TESTlblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
|
||||
while (lblist.Count > 1 && lastId == sr.location.elabId)
|
||||
while (TESTlblist.Count > 1 && lastId == sr.location.elabId)
|
||||
{
|
||||
id = new Random().Next(lblist.Count);
|
||||
sr.location.elabId = lblist[id];
|
||||
id = new Random().Next(TESTlblist.Count);
|
||||
sr.location.elabId = TESTlblist[id];
|
||||
}
|
||||
|
||||
lastId = sr.location.elabId;
|
||||
|
|
@ -1460,16 +1466,16 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
|
||||
/*
|
||||
if (lblist.Count > 0)
|
||||
if (TESTlblist.Count > 0)
|
||||
{
|
||||
int id = new Random().Next(lblist.Count);
|
||||
int id = new Random().Next(TESTlblist.Count);
|
||||
//#if DEBUG
|
||||
rec.location.elabId = lblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
rec.location.elabId = TESTlblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
|
||||
while (lblist.Count > 1 && lastId == rec.location.elabId)
|
||||
while (TESTlblist.Count > 1 && lastId == rec.location.elabId)
|
||||
{
|
||||
id = new Random().Next(lblist.Count);
|
||||
rec.location.elabId = lblist[id];
|
||||
id = new Random().Next(TESTlblist.Count);
|
||||
rec.location.elabId = TESTlblist[id];
|
||||
}
|
||||
|
||||
lastId = rec.location.elabId;
|
||||
|
|
@ -1935,9 +1941,10 @@ namespace DeiNiu.wms.Logical
|
|||
//#endif
|
||||
wpl.dpsOrder = waveOrder;
|
||||
wpl.operater = this.operId;
|
||||
|
||||
|
||||
|
||||
WmsOutPickPort wop = new WmsOutPickPort();
|
||||
wop.getPickPortByRecordId(rec.ID);
|
||||
wpl.portId = wop.ID; //此时，若多个任务合并，则取第一个任务
|
||||
lstLabel.Add(wpl);
|
||||
|
||||
}
|
||||
|
|
@ -1951,6 +1958,8 @@ namespace DeiNiu.wms.Logical
|
|||
ww.Add();
|
||||
foreach (WmsOutPickLable_tmp wp in lstLabel) //建立电子拣选临时数据
|
||||
{
|
||||
|
||||
|
||||
wp.Add();
|
||||
|
||||
}
|
||||
|
|
@ -2505,23 +2514,37 @@ namespace DeiNiu.wms.Logical
|
|||
pickLabelDetail.updatePickingStatus(color, elabId, elabAddress, pickCount);
|
||||
}
|
||||
else
|
||||
{
|
||||
//update wmsOutPickPort
|
||||
WmsOutPickPort wop = new WmsOutPickPort();
|
||||
wop.updatePickDetailByStkrecId(wpt.recordId, enumPickState.已拣, operId);
|
||||
{
|
||||
/*
|
||||
//update wmsOutPickPort
|
||||
WmsOutPickPort wop = new WmsOutPickPort();
|
||||
wop.updatePickDetailByStkrecId(wpt.recordId, enumPickState.已拣, operId);
|
||||
|
||||
//new stockRecord //to update current rec
|
||||
//new stockRecord //to update current rec
|
||||
|
||||
WmsStockRecord wsr = new WmsStockRecord(wpt.recordId);
|
||||
wsr.count = pickCount;
|
||||
wsr.countOuting = 0;
|
||||
wsr.operater = operId;
|
||||
// wsr.Add();
|
||||
wsr.Update();
|
||||
*/
|
||||
WmsOutPickPort wop = new WmsOutPickPort(wpt.portId);
|
||||
WmsFlow wmsflow = new WmsFlow(wop.jobNo);
|
||||
|
||||
//get 分拣分区负责人
|
||||
WmsLocation loc = new WmsLocation(wop.locationId);
|
||||
|
||||
int ownerId = loc.empId>0?loc.empId:operId;
|
||||
operId = ownerId;
|
||||
wmsflow.finishedTasksPlus(ownerId, pickCount,true);
|
||||
|
||||
int i= pickLabelDetail.updatePickingStatus(color, elabId, elabAddress, pickCount, true);
|
||||
enumPickResult re = finishPickItem(wop.jobNo, "", wpt.pickOrderNo, wpt.portId, wpt.count/* * wpt.minOperateCount*/);
|
||||
log.Debug(string.Format("update pick status cnt {0}, finish pick item result {1}, operater is {2}", i, re.ToString(),operId));
|
||||
|
||||
WmsStockRecord wsr = new WmsStockRecord(wpt.recordId);
|
||||
wsr.count = pickCount;
|
||||
wsr.countOuting = 0;
|
||||
wsr.operater = operId;
|
||||
// wsr.Add();
|
||||
wsr.Update();
|
||||
pickLabelDetail.updatePickingStatus(color, elabId, elabAddress, pickCount, true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//更新待复核数据状态
|
||||
|
||||
WmsOutPickDetail_tmp pd = new WmsOutPickDetail_tmp(wpt.orderDetailId);
|
||||
|
|
@ -2581,7 +2604,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
|
||||
|
||||
enumPickResult re= finishPickItem(wpt.dpsOrder, "", wpt.pickOrderNo, wpt.portId, wpt.count*wpt.minOperateCount);
|
||||
enumPickResult re= finishPickItem(wpt.dpsOrder, "", wpt.pickOrderNo, wpt.portId, wpt.count/*wpt.minOperateCount*/);
|
||||
|
||||
log.Debug(string.Format("update pick status cnt {0}, finish pick item result {1}",i,re.ToString()));
|
||||
|
||||
|
|
@ -2795,7 +2818,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
dv.Sort = "dpsOrder ASC"; //fifo
|
||||
// DataTable dt = dv.ToTable(true, "pickOrderNo","orderState","customerName"); // TODO: check why custid to multi custname, custid: C1ZTLQIA97N
|
||||
DataTable dt = dv.ToTable(true,"orderBulkPickstate","dpsOrder", "pickOrderNo", "orderState", "customerName", "custAddress", "desk", "seedsLabelId","xuhao"); // 打印封箱
|
||||
DataTable dt = dv.ToTable(true,"orderBulkPickstate","dpsOrder", "pickOrderNo", "orderState", "customerName", "custAddress", "desk", "seedsLabelId","xuhao", "bulkBox", "bulkBag"); // 打印封箱
|
||||
dt.TableName = "tablePickOrderList";
|
||||
|
||||
int kk=0;
|
||||
|
|
@ -2923,13 +2946,30 @@ namespace DeiNiu.wms.Logical
|
|||
*/
|
||||
po.bulkPickState = isException ? (int)enumOutStockPickStatus.复核异常 : (int)enumOutStockPickStatus.复核完成;
|
||||
po.operater = this.operId;
|
||||
po.bulkCheckedby = operId;
|
||||
po.bulkCheckedTime = po.getDateTime();
|
||||
|
||||
if (po.bulkPickState == (int)enumOutStockPickStatus.复核完成) //both bulk and batch completed validation
|
||||
{
|
||||
if (po.batchPickState == (int)enumOutStockPickStatus.无需分拣
|
||||
|| po.batchPickState == (int)enumOutStockPickStatus.复核完成)
|
||||
{
|
||||
po.state = (int)enumOutStockRequestStatus.集货完成;
|
||||
updateErpSaleStatus(po.pickOrderNo, enumOutStockRequestStatus.集货完成);
|
||||
|
||||
// po.state = (int)enumOutStockRequestStatus.集货完成;
|
||||
// updateErpSaleStatus(po.pickOrderNo, enumOutStockRequestStatus.集货完成);
|
||||
|
||||
po.state = (int)enumOutStockRequestStatus.复核完成;
|
||||
updateErpSaleStatus(po.pickOrderNo, enumOutStockRequestStatus.复核完成);
|
||||
|
||||
// update 复核任务完成情况
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID)
|
||||
{
|
||||
WmsFlow vFlow = new WmsFlow(po.transNo);
|
||||
vFlow.finishedTasksPlus(operId, 1,true,true);
|
||||
}
|
||||
po.checkedBy = operId;
|
||||
po.checkedTime = po.getDateTime();
|
||||
|
||||
/*
|
||||
Erp_sale es = new Erp_sale();
|
||||
if (!WmsConstants.OUT_REQUEST_MERGE)
|
||||
|
|
@ -2946,7 +2986,7 @@ namespace DeiNiu.wms.Logical
|
|||
es.updatePickStatus(po.pickOrderNo, enumOutStockRequestStatus.集货完成);
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
po.Update();
|
||||
|
|
@ -3055,15 +3095,21 @@ namespace DeiNiu.wms.Logical
|
|||
if (po.batchPickState == (int)enumOutStockPickStatus.无需分拣
|
||||
|| po.batchPickState == (int)enumOutStockPickStatus.复核完成)
|
||||
{
|
||||
po.state = (int)enumOutStockRequestStatus.集货完成;
|
||||
po.state = (int)enumOutStockRequestStatus.复核完成;
|
||||
Erp_sale es = new Erp_sale();
|
||||
es.updatePickStatus(po.pickOrderNo, enumOutStockRequestStatus.集货完成);
|
||||
es.updatePickStatus(po.pickOrderNo, enumOutStockRequestStatus.复核完成);
|
||||
// update 复核任务完成情况
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID)
|
||||
{
|
||||
WmsFlow vFlow = new WmsFlow(po.transNo);
|
||||
vFlow.finishedTasksPlus(operId, 1, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
po.Update();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
foreach (DataRow dr in validationDetails.Rows)
|
||||
|
|
@ -3104,11 +3150,11 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
catch (Exception er)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(lWmsOutPickRequest), er);
|
||||
log.Error( er);
|
||||
Thread.CurrentThread.Join(200);
|
||||
// completeBulkValidation(pickOrderNo, bulkBox, bulkBag, validationDetails);
|
||||
throw er;
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -3566,8 +3612,8 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
}
|
||||
|
||||
WmsPlate toP = new WmsPlate(flowNo);
|
||||
WmsStock stkVir = new WmsStock(new WmsLocation().getVirLocations(goods.part).locationId,new WmsOutPickDetail(outPickPort.pickDetailId).skuId, sr.goodsId);
|
||||
WmsPlate toP = new WmsPlate(flowNo);
|
||||
WmsStock stkVir = null;// new WmsStock(new WmsLocation().getVirLocations(goods.part).locationId,new WmsOutPickDetail(outPickPort.pickDetailId).skuId, sr.goodsId);
|
||||
|
||||
|
||||
logOut.Debug("拣货更新库存前: " + stk);
|
||||
|
|
@ -3588,8 +3634,9 @@ namespace DeiNiu.wms.Logical
|
|||
//TODO: 处理虚拟库存
|
||||
if ( WmsConstants.OUT_STOCK_LACK_VIR_OUT_AUTO && stk.virtialCount > 0 && outPickPort.virtialCnt>0 )
|
||||
{
|
||||
stkVir = new WmsStock(new WmsLocation().getVirLocations(goods.part).locationId, new WmsOutPickDetail(outPickPort.pickDetailId).skuId, sr.goodsId);
|
||||
|
||||
logOut.Debug(string.Format("扣虚拟库存， 原库存 {0}， 虚拟库存 {1}, outPickPort.virtialCnt {2} ", stk.ToString(), stkVir.ToString(), outPickPort.virtialCnt));
|
||||
logOut.Debug(string.Format("扣虚拟库存， 原库存 {0}， 虚拟库存 {1}, outPickPort.virtialCnt {2} ", stk.ToString(), stkVir.ToString(), outPickPort.virtialCnt));
|
||||
|
||||
stk.virtialCount -= pickCount;// outPickPort.virtialCnt;
|
||||
stk.virtialCount = stk.virtialCount<0?0: stk.virtialCount; // 称重或修改出库数量可能出现出库数量大于预计数量
|
||||
|
|
@ -3775,13 +3822,16 @@ namespace DeiNiu.wms.Logical
|
|||
// logOut.Debug("拣货更新库存: " + stk);
|
||||
|
||||
logOut.Debug("更新库存前: " + stk);
|
||||
logOut.Debug("更新库存前,虚拟库: " + stkVir);
|
||||
|
||||
|
||||
|
||||
stk.updateCountOut();
|
||||
|
||||
stkVir.updateCountOut();
|
||||
|
||||
if (stkVir != null)
|
||||
{
|
||||
logOut.Debug("更新库存前,虚拟库: " + stkVir);
|
||||
stkVir.updateCountOut();
|
||||
}
|
||||
//stk.Update();
|
||||
|
||||
plateStock.skuId = stk.skuId;
|
||||
|
|
@ -3791,10 +3841,39 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (WmsConstants.AUTO_LOAD_TRUCK)
|
||||
{
|
||||
//库位下架 过滤掉集货拣货、补货拣货等非出库类型的拣选
|
||||
//装车集货容器的判定
|
||||
/*
|
||||
* 统一发车出库，则用 000
|
||||
* 按线路、销售分批发货 使用线路ID
|
||||
*
|
||||
* 按客户单独配送、自提、快递的处理 使用分拣单号
|
||||
*
|
||||
* 如果按单复核出库，零库复核台已复核，只需复核整库部分，复核按线路复核
|
||||
*/
|
||||
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);//有总拣任务的分拣单集中装车
|
||||
int lineId = new WmsLocation(wopr.tranLocationId).transLine;
|
||||
//有总拣任务的分拣单集中装车000,单拣的以分拣单合为装车容器
|
||||
|
||||
truck = wopr.pickGroup > 0 && !string.IsNullOrEmpty(wopr.seedsPickNo) ?//此拣货单是否包含合并拣选项目，如果包含则为统一发车出库
|
||||
truck : //统一发车出库
|
||||
lineId > 0 ? //分线路出库或单独出库
|
||||
lineId + ""
|
||||
:wopr.pickOrderNo; //单独出库
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
enumRegPlateResult rs= new lWmsPlate(operId).loadTruck(plateStock.plateId, truck);
|
||||
log.Debug("loadtruck result:" + rs);
|
||||
}
|
||||
catch ( Exception e)
|
||||
{
|
||||
log.Error(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4294,9 +4373,9 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
|
||||
|
||||
//seeds
|
||||
//播种复核
|
||||
|
||||
public enumOutSeedsStatus updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2)
|
||||
public enumOutSeedsStatus updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2)
|
||||
{
|
||||
loglw.Debug( "updateSeedingStatus... operId is " + operId);
|
||||
loglw.Debug( "begin to update seeding pick.....>");
|
||||
|
|
@ -4305,13 +4384,24 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
enumOutSeedsStatus rt = enumOutSeedsStatus.状态更新成功;
|
||||
int cnt = outPickTmp.updateSeedingPickStatus(seedsPickNo, goodsId, batch, labId, address, count,operId,checkedBy2);
|
||||
|
||||
|
||||
|
||||
//TODO: 复核任务
|
||||
|
||||
if (cnt == 0)
|
||||
{
|
||||
loglw.Debug( " 更新失败，。。。。。。。return failure");
|
||||
return enumOutSeedsStatus.处理失败;
|
||||
}
|
||||
|
||||
WmsOutPickRequest pr =null;
|
||||
DataTable dtSeeds = outRequest.getSeedsData(seedsPickNo, labId);
|
||||
foreach(DataRow dr in dtSeeds.Rows)
|
||||
{
|
||||
pr = new WmsOutPickRequest(dr["pickOrderNo"].ToString());
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
int color = 0;
|
||||
using (TransactionScope scope = new TransactionScope())
|
||||
{
|
||||
|
|
@ -4323,23 +4413,23 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
loglw.Debug( " " + rt);
|
||||
|
||||
if (outRequest.getUnSeedsCnt(seedsPickNo, labId) == 0) // LabId对应的分拣单播种完毕
|
||||
// update 复核任务完成情况
|
||||
WmsFlow vFlow = null;
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID)
|
||||
{
|
||||
vFlow = new WmsFlow(pr.transNo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
DataTable dtSeeds = outRequest.getSeedsData(seedsPickNo, labId);
|
||||
|
||||
DataView dv = dtSeeds.DefaultView;
|
||||
DataTable dtPickOrders = dv.ToTable(true, "pickOrderNo");
|
||||
|
||||
if (pr!=null && outRequest.getUnSeedsCnt(seedsPickNo, labId) == 0) // LabId对应的分拣单播种完毕
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
foreach (DataRow dr in dtPickOrders.Rows)
|
||||
{
|
||||
|
||||
{
|
||||
string pickOrderNo = dr[0].ToString();
|
||||
WmsOutPickRequest pr = new WmsOutPickRequest(pickOrderNo);
|
||||
|
||||
//分拣明细状态 更新为 零货复核完成（enumOutStockPickStatus.复核完成） 和 全部完成分拣（enumOutStockDetailStatus.完成分拣）
|
||||
|
||||
foreach (WmsOutPickDetail pd in pr.outDetails)
|
||||
{
|
||||
if (pd.bulkCount > 0)
|
||||
|
|
@ -4357,20 +4447,35 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
}
|
||||
pr.bulkPickState = (int)enumOutStockPickStatus.复核完成;
|
||||
pr.bulkCheckedby = operId;
|
||||
pr.bulkCheckedTime = pr.getDateTime();
|
||||
if (pr.batchPickState == (int)enumOutStockPickStatus.无需分拣 || pr.batchPickState >= (int)enumOutStockPickStatus.分拣完成)
|
||||
{
|
||||
|
||||
enumOutStockRequestStatus state = enumOutStockRequestStatus.分拣完成;
|
||||
enumOutStockRequestStatus state = enumOutStockRequestStatus.分拣完成;
|
||||
|
||||
if (pr.batchPickState == (int)enumOutStockPickStatus.无需分拣 || pr.batchPickState == (int)enumOutStockPickStatus.复核完成)
|
||||
{
|
||||
state = enumOutStockRequestStatus.复核完成;
|
||||
|
||||
// update 复核任务完成情况
|
||||
if (vFlow!=null) //复核任务完成
|
||||
{
|
||||
|
||||
vFlow.finishedTasksPlus(operId, count,true,true);
|
||||
}
|
||||
|
||||
pr.checkedBy = operId;
|
||||
pr.checkedTime = pr.getDateTime();
|
||||
|
||||
}
|
||||
|
||||
pr.state = (int)state;
|
||||
|
||||
|
||||
updateErpSaleStatus( pr.pickOrderNo,state);
|
||||
if (pr.state != (int)state)
|
||||
{
|
||||
updateErpSaleStatus(pr.pickOrderNo, state);
|
||||
}
|
||||
|
||||
}
|
||||
pr.operater = this.operId;
|
||||
|
|
@ -4386,19 +4491,27 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LogHelper.WriteLog(this.GetType(), e);
|
||||
loglw.Error(e);
|
||||
return enumOutSeedsStatus.处理失败;
|
||||
}
|
||||
|
||||
// pk order is finished, to print code, can be packed.
|
||||
|
||||
} // 拣货单分播没有完成， 复核任务加1
|
||||
|
||||
if (vFlow != null && pr.state != (int)enumOutStockRequestStatus.复核完成)
|
||||
{
|
||||
vFlow.finishedTasksPlus(operId, count, true, false);
|
||||
}
|
||||
|
||||
|
||||
if (outRequest.getUnSeedsCnt(seedsPickNo) == 0)//是否播种单订单全部分播完毕
|
||||
{
|
||||
outPickTmp.completeSeeding(seedsPickNo);
|
||||
if (WmsConstants.OUT_BULK_DESK_CONTROLL)
|
||||
{
|
||||
setDeskFree(color);
|
||||
LogHelper.debug(typeof(lWmsOutRequest), color +"播种台播种完毕，设置状态为空闲，参与下个波次");
|
||||
loglw.Debug(color +"播种台播种完毕，设置状态为空闲，参与下个波次");
|
||||
}
|
||||
WmsWave ww = new WmsWave();
|
||||
ww.QueryBySeedsNo(seedsPickNo);
|
||||
|
|
@ -4640,14 +4753,14 @@ namespace DeiNiu.wms.Logical
|
|||
int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据
|
||||
|
||||
//#if DEBUG
|
||||
// if (lblist.Count == 0)
|
||||
// if (TESTlblist.Count == 0)
|
||||
{
|
||||
TESTlblist.Clear();
|
||||
initialDebugSetting();
|
||||
}
|
||||
TESTlblist.Sort();
|
||||
// int minId = lblist[0];
|
||||
// int maxId = lblist[lblist.Count - 1];
|
||||
// int minId = TESTlblist[0];
|
||||
// int maxId = TESTlblist[TESTlblist.Count - 1];
|
||||
// labelMaxInWave = 2;
|
||||
// #endif
|
||||
|
||||
|
|
@ -4996,14 +5109,14 @@ namespace DeiNiu.wms.Logical
|
|||
int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据
|
||||
|
||||
//#if DEBUG
|
||||
// if (lblist.Count == 0)
|
||||
// if (TESTlblist.Count == 0)
|
||||
{
|
||||
TESTlblist.Clear();
|
||||
initialDebugSetting();
|
||||
}
|
||||
TESTlblist.Sort();
|
||||
// int minId = lblist[0];
|
||||
// int maxId = lblist[lblist.Count - 1];
|
||||
// int minId = TESTlblist[0];
|
||||
// int maxId = TESTlblist[TESTlblist.Count - 1];
|
||||
// labelMaxInWave = 2;
|
||||
//#endif
|
||||
|
||||
|
|
@ -5164,16 +5277,16 @@ namespace DeiNiu.wms.Logical
|
|||
foreach (WmsStockRecord rec in lstBulk)//检查电子标签数量是否超过范围
|
||||
{
|
||||
|
||||
if (lblist.Count > 0)
|
||||
if (TESTlblist.Count > 0)
|
||||
{
|
||||
int id = new Random().Next(lblist.Count);
|
||||
int id = new Random().Next(TESTlblist.Count);
|
||||
//#if DEBUG
|
||||
rec.location.elabId = lblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
rec.location.elabId = TESTlblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
|
||||
|
||||
while (lblist.Count > 1 && lastId == rec.location.elabId)
|
||||
while (TESTlblist.Count > 1 && lastId == rec.location.elabId)
|
||||
{
|
||||
id = new Random().Next(lblist.Count);
|
||||
rec.location.elabId = lblist[id];
|
||||
id = new Random().Next(TESTlblist.Count);
|
||||
rec.location.elabId = TESTlblist[id];
|
||||
}
|
||||
|
||||
lastId = rec.location.elabId;
|
||||
|
|
@ -5774,7 +5887,7 @@ namespace DeiNiu.wms.Logical
|
|||
public void unloadPickrequests()
|
||||
{
|
||||
// List<WmsOutPickRequest> requests = getWmsOutPickRequest.getRequestsReady4Validation();
|
||||
List<WmsOutPickRequest> requests = getWmsOutPickRequest.getRequestObjects(enumOutStockRequestStatus.已装车);
|
||||
List<WmsOutPickRequest> requests = getWmsOutPickRequest.getRequestObjects(enumOutStockRequestStatus.装车集货);
|
||||
//TODO: get 自提类型的订单，状态为已复核
|
||||
logPlate.Debug("装车后续处理。。。。开始");
|
||||
WmsPlateStock_tmp wpt = new WmsPlateStock_tmp();
|
||||
|
|
|
|||
|
|
@ -703,7 +703,7 @@ namespace DeiNiu.wms.Logical
|
|||
|
||||
if (fromP.getParentPlate(fromPlate).ID > 0)
|
||||
{
|
||||
return enumRegPlateResult.容器已完成合流集货;
|
||||
return enumRegPlateResult.容器已完成合流集货; //TODO:容器第一次拣货完成装车后，后续拣货不能再装车了？？
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -750,9 +750,28 @@ namespace DeiNiu.wms.Logical
|
|||
// List<WmsFlow> jflows = new List<WmsFlow>();
|
||||
|
||||
|
||||
|
||||
|
||||
WmsPlate toP = new WmsPlate(toPlate);
|
||||
log.Debug("loadTruck 1 tp transNo:"+ toP.transNo);
|
||||
WmsFlow vFlow = new WmsFlow(toP.transNo);
|
||||
|
||||
|
||||
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID )
|
||||
{
|
||||
if(toP.state > (int)enumPlateStatus.待复核)
|
||||
{
|
||||
return enumRegPlateResult.容器已完成复核;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//TODO：容器复用、多次拣货时，容器内物品量方存在重复统计的问题
|
||||
int lineId = fromP.lineId;
|
||||
if (fromP.ID == 0 || fromP.volume == 0) //临时容器
|
||||
{
|
||||
|
|
@ -769,12 +788,20 @@ namespace DeiNiu.wms.Logical
|
|||
}
|
||||
|
||||
|
||||
DataTable dt1 = ptmp.getOutPort(ptmp.outPortId);
|
||||
DataTable dt1 = ptmp.getOutPort(ptmp.outPortId);
|
||||
foreach (DataRow dr1 in dt1.Rows)
|
||||
{
|
||||
lineId = Convert.ToInt32(dr1["lineId"].ToString());
|
||||
fromP.volume += Convert.ToDecimal(dr1["volCm"].ToString());
|
||||
fromP.load += Convert.ToDecimal(dr1["weight"].ToString());
|
||||
try
|
||||
{
|
||||
lineId = Convert.ToInt32(dr1["lineId"].ToString());
|
||||
fromP.volume += Convert.ToDecimal(dr1["volCm"].ToString());
|
||||
fromP.load += Convert.ToDecimal(dr1["weight"].ToString());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
log.Error(ex);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
/*
|
||||
|
|
@ -844,9 +871,12 @@ namespace DeiNiu.wms.Logical
|
|||
new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo;
|
||||
|
||||
// return enumRegPlateResult.完成装车集货后才能装车;
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
int taskcnt = 0;
|
||||
foreach (WmsOutPickRequest op in requests)
|
||||
{
|
||||
if (string.IsNullOrEmpty(op.transNo))
|
||||
|
|
@ -861,8 +891,17 @@ namespace DeiNiu.wms.Logical
|
|||
td.transNo = toP.transNo;
|
||||
td.operater = operId;
|
||||
td.Add();
|
||||
}
|
||||
taskcnt++;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (vFlow.ID > 0 && taskcnt>0) //增加装车复核任务数
|
||||
{
|
||||
vFlow.taskCnt+=taskcnt;
|
||||
vFlow.Update();
|
||||
log.Debug(string.Format("装车复核任务数增加 {0}个",taskcnt));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -895,7 +934,9 @@ namespace DeiNiu.wms.Logical
|
|||
{
|
||||
if (req.state == (int)enumOutStockRequestStatus.集货完成)
|
||||
{
|
||||
req.state = (int)enumOutStockRequestStatus.已装车;
|
||||
req.state = (int)enumOutStockRequestStatus.装车集货;
|
||||
|
||||
|
||||
req.Update();
|
||||
}
|
||||
}
|
||||
|
|
@ -986,6 +1027,13 @@ namespace DeiNiu.wms.Logical
|
|||
return enumRegPlateResult.已发车;
|
||||
}
|
||||
|
||||
if (!WmsConstants.AUTO_LOAD_TRUCK_VALID)
|
||||
{
|
||||
if(plate.state == (int)enumPlateStatus.待复核)
|
||||
{
|
||||
return enumRegPlateResult.发车待复核;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (WmsConstants.IS_PLATE_IN_LINE)
|
||||
|
|
|
|||
|
|
@ -415,7 +415,15 @@ namespace DeiNiu.wms.Logical
|
|||
case 41:
|
||||
WmsConstants.OUT_BULK_REP_FROM_BATCH = n.isOn;
|
||||
break;
|
||||
|
||||
case 42:
|
||||
WmsConstants.AUTO_LOAD_TRUCK = n.isOn;
|
||||
break;
|
||||
case 43:
|
||||
WmsConstants.AUTO_LOAD_TRUCK_VALID = n.isOn;
|
||||
break;
|
||||
|
||||
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ namespace DeiNiu.Wcf
|
|||
[OperationContract]
|
||||
DataTable getPackingDataByPickOrderNo(string pickOrderNo);
|
||||
[OperationContract]
|
||||
int updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2);
|
||||
int updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2);
|
||||
|
||||
[OperationContract]
|
||||
DataTable getSeedsPackingData(int desk);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<appender-ref ref="lightWaveAppender"/>
|
||||
</logger>
|
||||
<appender name="lightWaveAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/lightWave.log" />
|
||||
<file value="/log/medicine/lightWave.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
|
||||
<appender name="testAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/test/test.log" />
|
||||
<file value="/log/medicine/test/test.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
</layout>
|
||||
</appender>
|
||||
<appender name="testError" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/testError.log" />
|
||||
<file value="/log/medicine/testError.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
</appender>
|
||||
|
||||
<appender name="errorApperder" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/error.log" />
|
||||
<file value="/log/medicine/error.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
</filter>
|
||||
</appender>
|
||||
<appender name="SpecialAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/spec/special.log" />
|
||||
<file value="/log/medicine/spec/special.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
</layout>
|
||||
</appender>
|
||||
<appender name="CommonAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/common.log" />
|
||||
<file value="/log/medicine/common.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -142,7 +142,7 @@
|
|||
</appender>
|
||||
|
||||
<appender name="InAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/stockIn/stockIn.log" />
|
||||
<file value="/log/medicine/stockIn/stockIn.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -158,7 +158,7 @@
|
|||
</appender>
|
||||
|
||||
<appender name="OutAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/stockOut/stockOut.log" />
|
||||
<file value="/log/medicine/stockOut/stockOut.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
</layout>
|
||||
</appender>
|
||||
<appender name="ERPAppender" type="log4net.Appender.RollingFileAppender">
|
||||
<file value="/medicine/log/wms/stockOut/ERP.log" />
|
||||
<file value="/log/medicine/stockOut/ERP.log" />
|
||||
<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Size" />
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
public DataTable getLocation(string locId)
|
||||
{
|
||||
return loc.getWmslocation.getLocations(locId);
|
||||
return loc.getWmslocation.getLocationDt(locId);
|
||||
}
|
||||
|
||||
public DataTable getStockCompareErp(string goodsId, string barcode)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<PropertyGroup>
|
||||
<TimeStampOfAssociatedLegacyPublishXmlFile />
|
||||
<EncryptedPassword />
|
||||
<History>True|2024-11-04T14:27:29.3756940Z||;True|2024-11-04T22:24:17.0651411+08:00||;True|2024-11-04T22:19:38.7879418+08:00||;True|2024-11-04T22:05:56.8271654+08:00||;True|2024-11-04T21:50:07.9758208+08:00||;True|2024-11-04T21:18:16.9346004+08:00||;True|2024-11-04T10:58:22.6037381+08:00||;True|2024-11-03T21:34:43.5638618+08:00||;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||;</History>
|
||||
<History>True|2024-11-15T06:43:27.7666188Z||;True|2024-11-15T13:41:55.9669432+08:00||;True|2024-11-15T10:21:44.9129634+08:00||;True|2024-11-15T01:00:31.2339119+08:00||;True|2024-11-15T00:17:29.3207532+08:00||;True|2024-11-14T20:49:31.7616349+08:00||;True|2024-11-14T09:06:01.2742901+08:00||;True|2024-11-14T00:04:51.5979094+08:00||;True|2024-11-13T23:48:11.5484821+08:00||;True|2024-11-13T23:39:20.2946116+08:00||;True|2024-11-13T23:21:08.2354809+08:00||;True|2024-11-13T23:06:39.0614447+08:00||;True|2024-11-13T22:05:01.9568502+08:00||;True|2024-11-12T16:34:51.0951416+08:00||;True|2024-11-04T22:27:29.3756940+08:00||;True|2024-11-04T22:24:17.0651411+08:00||;True|2024-11-04T22:19:38.7879418+08:00||;True|2024-11-04T22:05:56.8271654+08:00||;True|2024-11-04T21:50:07.9758208+08:00||;True|2024-11-04T21:18:16.9346004+08:00||;True|2024-11-04T10:58:22.6037381+08:00||;True|2024-11-03T21:34:43.5638618+08:00||;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||;</History>
|
||||
<LastFailureDetails />
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -278,7 +278,9 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
public DataTable getPickDetailByPickOrderNo(string pickOrder)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getPickDetailByPickOrderNo(pickOrder).Tables[0];
|
||||
|
||||
return lopp.getWmsOutPickPort.getPickDetails(pickOrder);
|
||||
// return lop.getWmsOutPickRequest.getPickDetailByPickOrderNo(pickOrder).Tables[0];
|
||||
}
|
||||
public DataTable getPickDetailBySeedsPickOrderNo(string pickOrder, int skuId)
|
||||
{
|
||||
|
|
@ -402,7 +404,7 @@ namespace DeiNiu.Wcf
|
|||
public int updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2)
|
||||
{
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "begin to update seeding pick.....>");
|
||||
return (int)lop.updateSeedingStatus(seedsPickNo, goodsId, batch, labId, address, count, checkedBy2);
|
||||
return (int)lop.updateSeedingStatus(seedsPickNo, goodsId, batch, labId, address, count, checkedBy2);
|
||||
}
|
||||
|
||||
public DataTable getSeedsPackingData(int desk)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ namespace Deiniu.win.elelab
|
|||
//internal static int ele_return_receive_address = 0;
|
||||
//internal static int ele_return_manage_address = 0;
|
||||
//internal static int ele_return_max = 10000;
|
||||
|
||||
|
||||
internal static bool begain_pick = false;
|
||||
// internal static bool Threads_state;
|
||||
// internal static bool out_start_state;
|
||||
|
|
@ -42,11 +42,11 @@ namespace Deiniu.win.elelab
|
|||
internal static int[] seed_part_task = new int[100];//分区名称 分区结果 0 没有任务 正在处理任务
|
||||
internal static int[] tran_part_task = new int[100];//分区名称 分区结果 0 没有任务 正在处理任务
|
||||
|
||||
// internal static int port_max = 100;
|
||||
// internal static int port_max = 100;
|
||||
|
||||
internal static bool pick_task = true;
|
||||
|
||||
internal static List<int> activeComports = new List<int>() ;//激活的com口
|
||||
internal static List<int> activeComports = new List<int>();//激活的com口
|
||||
public static bool resetDevice(int port)
|
||||
{
|
||||
if (elelab.coms.com_manage[port] != null)
|
||||
|
|
@ -87,16 +87,16 @@ namespace Deiniu.win.elelab
|
|||
}
|
||||
else if (str.Count == 2)
|
||||
{
|
||||
int len = Convert.ToInt16(str[0]);
|
||||
int len1 = Convert.ToInt16(str[1]);
|
||||
int len = Convert.ToInt16(str[0]);
|
||||
int len1 = Convert.ToInt16(str[1]);
|
||||
len = len * 10 + len1;
|
||||
return Convert.ToByte(len);
|
||||
}
|
||||
else if (str.Count == 3)
|
||||
{
|
||||
int len = Convert.ToInt16(str[0]);
|
||||
int len1 = Convert.ToInt16(str[1]);
|
||||
int len2 = Convert.ToInt16(str[2]);
|
||||
int len = Convert.ToInt16(str[0]);
|
||||
int len1 = Convert.ToInt16(str[1]);
|
||||
int len2 = Convert.ToInt16(str[2]);
|
||||
|
||||
len = len * 100 + len1 * 10 + len2;
|
||||
return Convert.ToByte(len);
|
||||
|
|
@ -118,12 +118,12 @@ namespace Deiniu.win.elelab
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private static void init_sys_port(enumLabelPickType pickType)
|
||||
{
|
||||
|
||||
// activeComports.Clear();
|
||||
// activeComports.Clear();
|
||||
clear_order order = new clear_order();
|
||||
int port;
|
||||
for (int i = 0; i < coms.com_count; i++)//init com0-10
|
||||
|
|
@ -131,17 +131,17 @@ namespace Deiniu.win.elelab
|
|||
int com = Convert.ToByte(i);
|
||||
if (elelab.coms.initCom(com, true) == true)
|
||||
{
|
||||
port = Convert.ToInt16(i);
|
||||
port = Convert.ToInt16(i);
|
||||
// order = Convert.ToInt16(dt.Rows[i]["ele_order"]);
|
||||
order.order = Convert.ToByte(i);
|
||||
order.state =Convert.ToByte((int)pickType);
|
||||
order.state = Convert.ToByte((int)pickType);
|
||||
if (coms.com_manage[port].clear_order(order))
|
||||
{
|
||||
activeComports.Add( port);
|
||||
activeComports.Add(port);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
init_pick();
|
||||
// clear_order(dt);
|
||||
}
|
||||
|
|
@ -151,7 +151,7 @@ namespace Deiniu.win.elelab
|
|||
clear_order order = new clear_order();
|
||||
for (int i = 0; i < dt.Rows.Count; i++)
|
||||
{
|
||||
port = Convert.ToInt16(dt.Rows[i]["port"]);
|
||||
port = Convert.ToInt16(dt.Rows[i]["port"]);
|
||||
// order = Convert.ToInt16(dt.Rows[i]["ele_order"]);
|
||||
order.order = Convert.ToByte(dt.Rows[i]["ele_order"]);
|
||||
order.state = 1;
|
||||
|
|
@ -195,14 +195,14 @@ namespace Deiniu.win.elelab
|
|||
internal static void wake_thread()
|
||||
{
|
||||
|
||||
// if ( Convert.ToInt16(pick_work.ThreadState) == 68)
|
||||
// if ( Convert.ToInt16(pick_work.ThreadState) == 68)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (pick_work!=null && Convert.ToInt16(pick_work.ThreadState) == 68)
|
||||
pick_work.Resume();
|
||||
if (pick_work != null && Convert.ToInt16(pick_work.ThreadState) == 68)
|
||||
pick_work.Resume();
|
||||
}
|
||||
catch(Exception er)
|
||||
catch (Exception er)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(light), er);
|
||||
|
||||
|
|
@ -213,20 +213,20 @@ namespace Deiniu.win.elelab
|
|||
|
||||
internal static void wake_support_thread()
|
||||
{
|
||||
if ( Convert.ToInt16(pick_work_support.ThreadState) == 68)
|
||||
if (Convert.ToInt16(pick_work_support.ThreadState) == 68)
|
||||
pick_work_support.Resume();
|
||||
}
|
||||
private static void get_data(string data, out int dot_station, out int total_num)
|
||||
{
|
||||
data = Convert.ToDouble(data).ToString();
|
||||
string[] count = data.Split('.');//Out_count
|
||||
int full = Convert.ToInt16(count[0]);
|
||||
int full = Convert.ToInt16(count[0]);
|
||||
int dot_num;
|
||||
dot_station = 0;
|
||||
total_num = full;
|
||||
if (count.Length > 1)
|
||||
{
|
||||
dot_num = Convert.ToInt16(count[1]);
|
||||
dot_num = Convert.ToInt16(count[1]);
|
||||
if (dot_num > 0)
|
||||
{
|
||||
if (dot_num < 10)
|
||||
|
|
@ -256,7 +256,7 @@ namespace Deiniu.win.elelab
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
internal static bool make_data(DataTable ds, byte led_color, byte ele_order_id, byte port,
|
||||
string[] ele_lab_id, string[] ele_address, string[] Out_count, byte type)
|
||||
{
|
||||
|
|
@ -277,7 +277,7 @@ namespace Deiniu.win.elelab
|
|||
{
|
||||
ele_data_comment[j].channel_id = 0;//暂不使用 默认为0
|
||||
ele_data_comment[j].dis_type = Convert.ToByte(ds.Rows[j]["color"].ToString()); ;// 灯的颜色 0 不亮 1 红灯 2 绿灯 3 蓝灯 4 红闪 5 绿闪 6 蓝闪
|
||||
ele_data_comment[j].ele_id = Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString());
|
||||
ele_data_comment[j].ele_id = Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString());
|
||||
ele_data_comment[j].kucun_id = 0;
|
||||
ele_data_comment[j].little_ele_id = Convert.ToByte(ds.Rows[j]["ele_address"].ToString());
|
||||
ele_data_comment[j].order = Convert.ToByte(ele_order_id);
|
||||
|
|
@ -297,7 +297,7 @@ namespace Deiniu.win.elelab
|
|||
ele_data_comment[j].WarehousingID = 0;
|
||||
ele_lab[ele_data_comment[j].ele_id, ele_data_comment[j].little_ele_id] = type;
|
||||
|
||||
statuKeys.Add(Util.getLightKey(ele_data_comment[j].dis_type, Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString()), Convert.ToByte(ds.Rows[j]["ele_address"].ToString())));
|
||||
statuKeys.Add(Util.getLightKey(ele_data_comment[j].dis_type, Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString()), Convert.ToByte(ds.Rows[j]["ele_address"].ToString())));
|
||||
|
||||
}// //向串口发送数据
|
||||
clear_order order = new clear_order();
|
||||
|
|
@ -305,9 +305,9 @@ namespace Deiniu.win.elelab
|
|||
order.state = 1;
|
||||
if (coms.com_manage[port].clear_order(order) == false)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(light), string.Format(" port {0} clear fail",port));
|
||||
LogHelper.WriteLog(typeof(light), string.Format(" port {0} clear fail", port));
|
||||
//MessageBox.Show("clear fail");
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
//elelab.ele_base.usart_send_state = false; //ele .usart_send_state = false;
|
||||
while (coms.com_manage[port].send_state_finish == false) ;
|
||||
|
|
@ -321,15 +321,15 @@ namespace Deiniu.win.elelab
|
|||
coms.com_manage[port].send_state_finish = true;
|
||||
coms.com_manage[port].usart_send_state = true;
|
||||
coms.com_manage[port].usart_send_result = "";
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
string result;
|
||||
bool isLightsSuccess = coms.com_manage[port].wait_ack(out result);
|
||||
|
||||
foreach(string key in statuKeys){
|
||||
foreach (string key in statuKeys) {
|
||||
WmsConstants.WAVE_CURRENT_LIGHTS_STATUS[key] = isLightsSuccess;
|
||||
WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = false;
|
||||
}
|
||||
}
|
||||
return isLightsSuccess;
|
||||
}
|
||||
else
|
||||
|
|
@ -339,14 +339,14 @@ namespace Deiniu.win.elelab
|
|||
{
|
||||
ele_data_comment[j].channel_id = 0;//暂不使用 默认为0
|
||||
ele_data_comment[j].dis_type = led_color;// 灯的颜色 0 不亮 1 红灯 2 绿灯 3 蓝灯 4 红闪 5 绿闪 6 蓝闪
|
||||
ele_data_comment[j].ele_id = Convert.ToInt16(ele_lab_id[j].ToString());
|
||||
ele_data_comment[j].ele_id = Convert.ToInt16(ele_lab_id[j].ToString());
|
||||
ele_data_comment[j].kucun_id = 0;
|
||||
ele_data_comment[j].little_ele_id = Convert.ToByte(ele_address[j].ToString());
|
||||
ele_data_comment[j].order = Convert.ToByte(ele_order_id);
|
||||
ele_data_comment[j].port = "1";
|
||||
ele_data_comment[j].receive_count = 0;
|
||||
string[] count = Out_count[j].ToString().Split('.');
|
||||
ele_data_comment[j].send_count = Convert.ToInt16(count[0]);//.ToString());
|
||||
ele_data_comment[j].send_count = Convert.ToInt16(count[0]);//.ToString());
|
||||
ele_data_comment[j].state = 1;
|
||||
ele_data_comment[j].WarehousingID = 0;
|
||||
ele_lab[ele_data_comment[j].ele_id, ele_data_comment[j].little_ele_id] = type;
|
||||
|
|
@ -367,7 +367,7 @@ namespace Deiniu.win.elelab
|
|||
}
|
||||
|
||||
|
||||
void speak(string msg)
|
||||
void speak(string msg)
|
||||
{
|
||||
|
||||
SpeechSynthesizer voice = new SpeechSynthesizer(); //创建语音实例
|
||||
|
|
@ -376,7 +376,7 @@ namespace Deiniu.win.elelab
|
|||
voice.SpeakAsync(msg); //播放指定的字符串,这是异步朗读
|
||||
}
|
||||
|
||||
internal static bool clsDisplay(byte port, byte ele_order_id)
|
||||
internal static bool clsDisplay(byte port, byte ele_order_id)
|
||||
{
|
||||
clear_order order = new clear_order();
|
||||
order.order = Convert.ToByte(ele_order_id);
|
||||
|
|
@ -391,7 +391,7 @@ namespace Deiniu.win.elelab
|
|||
coms.com_manage[port].write_reset_device();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
private static void read_single(int address)
|
||||
{
|
||||
while (coms.com_manage[address].manage_address != coms.com_manage[address].receive_address)
|
||||
|
|
@ -445,114 +445,115 @@ namespace Deiniu.win.elelab
|
|||
return result;
|
||||
}
|
||||
|
||||
// static WmsOutPickLable outPick = new WmsOutPickLable();
|
||||
// static lWmsOutPickRequest lpickRequest = new lWmsOutPickRequest();
|
||||
/// <summary>
|
||||
/// send back from elabel
|
||||
/// </summary>
|
||||
// static WmsOutPickLable outPick = new WmsOutPickLable();
|
||||
// static lWmsOutPickRequest lpickRequest = new lWmsOutPickRequest();
|
||||
/// <summary>
|
||||
/// send back from elabel
|
||||
/// </summary>
|
||||
internal static void dataSent()
|
||||
{
|
||||
|
||||
List<string> statuKeys = new List<string>();
|
||||
// string sql, table;
|
||||
// string sql, table;
|
||||
int ele_id;
|
||||
int little_ele_id;
|
||||
string receive_count;
|
||||
string color;
|
||||
// WmsOutPickLable outPick = new WmsOutPickLable();
|
||||
|
||||
enumLabelPickType pickType =enumLabelPickType.pick; //同一个控制器应该拣选类型唯一
|
||||
// int cnt = 0;
|
||||
// WmsOutPickLable outPick = new WmsOutPickLable();
|
||||
|
||||
enumLabelPickType pickType = enumLabelPickType.pick; //同一个控制器应该拣选类型唯一
|
||||
// int cnt = 0;
|
||||
Dictionary<string, bool> tmp = WmsConstants.WAVE_CURRENT_PICK_STATUS;
|
||||
|
||||
//LogHelper.debug(typeof(light),"-----------------------------new data---------------------------");
|
||||
|
||||
while (receive_add != manage_add)
|
||||
{
|
||||
// cnt++;
|
||||
// cnt++;
|
||||
|
||||
receive_count = receiveDataDot( Convert.ToInt16(ele_lab_data[manage_add].receive_count), Convert.ToInt16(ele_lab_data[manage_add].dot));
|
||||
receive_count = receiveDataDot(Convert.ToInt16(ele_lab_data[manage_add].receive_count), Convert.ToInt16(ele_lab_data[manage_add].dot));
|
||||
// ele_lab_data[receive_add]
|
||||
//receive_count = "0";
|
||||
ele_id = Convert.ToInt16(ele_lab_data[manage_add].ele_id.ToString()); //label id
|
||||
color = ele_lab_data[manage_add].order.ToString();//color
|
||||
little_ele_id = Convert.ToInt16(ele_lab_data[manage_add].little_ele_id.ToString()); //ele address
|
||||
ele_id = Convert.ToInt16(ele_lab_data[manage_add].ele_id.ToString()); //label id
|
||||
color = ele_lab_data[manage_add].order.ToString();//color
|
||||
little_ele_id = Convert.ToInt16(ele_lab_data[manage_add].little_ele_id.ToString()); //ele address
|
||||
int state = elelab.light.ele_lab[ele_id, little_ele_id];
|
||||
pickType = (enumLabelPickType)state;
|
||||
|
||||
|
||||
string key = Util.getLightKey( Convert.ToInt16(color), ele_id, little_ele_id);
|
||||
LogHelper.debug(typeof(light), string.Format("current key {0}, waveNo {1}", key, WmsConstants.WAVE_CURRENT_ORDER));
|
||||
//WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = true;
|
||||
//#if debug
|
||||
//speak(key);
|
||||
//#endif
|
||||
// LogHelper.debug(typeof(light), string.Format("receive_add {0}, manage_add {1}", receive_add, manage_add));
|
||||
|
||||
// while (receive_add != manage_add)
|
||||
// {
|
||||
string key = Util.getLightKey(Convert.ToInt16(color), ele_id, little_ele_id);
|
||||
LogHelper.debug(typeof(light), string.Format("current key {0}, waveNo {1}", key, WmsConstants.WAVE_CURRENT_ORDER));
|
||||
//WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = true;
|
||||
//#if debug
|
||||
//speak(key);
|
||||
//#endif
|
||||
// LogHelper.debug(typeof(light), string.Format("receive_add {0}, manage_add {1}", receive_add, manage_add));
|
||||
|
||||
// while (receive_add != manage_add)
|
||||
// {
|
||||
switch (pickType)
|
||||
{
|
||||
case enumLabelPickType.pick:
|
||||
|
||||
int trycnt = 0;
|
||||
if (WmsConstants.WAVE_CURRENT_PICK_STATUS.ContainsKey(key) )
|
||||
if (WmsConstants.WAVE_CURRENT_PICK_STATUS.ContainsKey(key))
|
||||
{
|
||||
// LogHelper.debug(typeof(light), string.Format(" !!!!!!!!!..........{0} exist in pick cache ", key));
|
||||
//
|
||||
// LogHelper.debug(typeof(light), string.Format(" !!!!!!!!!..........{0} exist in pick cache ", key));
|
||||
//
|
||||
|
||||
LogHelper.debug(typeof(light), string.Format(" {0} value is {1} ", key, WmsConstants.WAVE_CURRENT_PICK_STATUS[key]));
|
||||
|
||||
|
||||
if (WmsConstants.WAVE_CURRENT_PICK_STATUS[key])
|
||||
{
|
||||
manage_add++;
|
||||
if (manage_add >= add_max)
|
||||
{
|
||||
manage_add = 0;
|
||||
}
|
||||
|
||||
LogHelper.debug(typeof(light), string.Format(" {0} value is {1} ", key, WmsConstants.WAVE_CURRENT_PICK_STATUS[key]));
|
||||
|
||||
|
||||
if (WmsConstants.WAVE_CURRENT_PICK_STATUS[key])
|
||||
{
|
||||
manage_add++;
|
||||
if (manage_add >= add_max)
|
||||
{
|
||||
manage_add = 0;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
}
|
||||
try
|
||||
{
|
||||
|
||||
updatePickStatus(key, color, ele_id, little_ele_id, receive_count);
|
||||
}
|
||||
catch (DeiNiuTimeOutException e)
|
||||
}
|
||||
try
|
||||
{
|
||||
|
||||
updatePickStatus(key, color, ele_id, little_ele_id, receive_count);
|
||||
}
|
||||
catch (DeiNiuTimeOutException e)
|
||||
{
|
||||
Login lg = new Login();
|
||||
lg.ShowDialog();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(light), e);
|
||||
WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = false;
|
||||
trycnt++;
|
||||
LogHelper.debug(typeof(light), string.Format(" trying cnt {0} ", trycnt));
|
||||
|
||||
|
||||
if (trycnt < 3)
|
||||
{
|
||||
Login lg = new Login();
|
||||
lg.ShowDialog();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(light), e);
|
||||
WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = false;
|
||||
trycnt++;
|
||||
LogHelper.debug(typeof(light), string.Format(" trying cnt {0} ", trycnt ));
|
||||
|
||||
|
||||
if (trycnt < 3)
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
updatePickStatus(key, color, ele_id, little_ele_id, receive_count);
|
||||
}
|
||||
catch(Exception err) {
|
||||
LogHelper.WriteLog(typeof(light), err);
|
||||
}
|
||||
updatePickStatus(key, color, ele_id, little_ele_id, receive_count);
|
||||
}
|
||||
catch (Exception err)
|
||||
{
|
||||
LogHelper.WriteLog(typeof(light), err);
|
||||
}
|
||||
|
||||
// throw e;
|
||||
}
|
||||
|
||||
|
||||
// throw e;
|
||||
}
|
||||
|
||||
break;
|
||||
case enumLabelPickType.seed:
|
||||
|
||||
key = Util.getLightKey( Convert.ToInt16(color), ele_id, WmsConstants.CURRENT_SEEDS_GOOD_SKUID);
|
||||
|
||||
|
||||
key = Util.getLightKey(Convert.ToInt16(color), ele_id, WmsConstants.CURRENT_SEEDS_GOOD_SKUID);
|
||||
|
||||
if (WmsConstants.SEEDS_CURRENT_PICK_STATUS.ContainsKey(key))
|
||||
{
|
||||
if (WmsConstants.SEEDS_CURRENT_PICK_STATUS[key])
|
||||
|
|
@ -564,24 +565,24 @@ namespace Deiniu.win.elelab
|
|||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
using (WmsOutPickRequestClient client = new WmsOutPickRequestClient("BasicHttpBinding_IWmsOutPickRequest",
|
||||
string.Format("http://{0}/{1}", Park.svrUrl, "WmsOutPickRequestService.svc")))
|
||||
|
||||
}
|
||||
using (WmsOutPickRequestClient client = new WmsOutPickRequestClient("BasicHttpBinding_IWmsOutPickRequest",
|
||||
string.Format("http://{0}/{1}", Park.svrUrl, "WmsOutPickRequestService.svc")))
|
||||
|
||||
{
|
||||
try
|
||||
{
|
||||
// client.updateValidBulkPickStatus(407,1,"test seed",0,100,2788);
|
||||
enumOutSeedsStatus status = (enumOutSeedsStatus)client.updateSeedingStatus(WmsConstants.CURRENT_SEEDS_NO,
|
||||
WmsConstants.CURRENT_SEEDS_GOODSID, WmsConstants.CURRENT_SEEDS_GOOD_BATCH, ele_id, little_ele_id,
|
||||
{
|
||||
// client.updateValidBulkPickStatus(407,1,"test seed",0,100,2788);
|
||||
enumOutSeedsStatus status = (enumOutSeedsStatus)client.updateSeedingStatus(CURRENT_SEEDS_NO,
|
||||
CURRENT_SEEDS_GOODSID, CURRENT_SEEDS_GOOD_BATCH, ele_id, little_ele_id,
|
||||
Convert.ToDecimal(receive_count), WmsConstants.CHECKED_BY_2_ID);//本次拣选完毕
|
||||
client.Close();
|
||||
bool result =(int)status > (int)enumOutSeedsStatus.处理失败;
|
||||
bool result = (int)status > (int)enumOutSeedsStatus.处理失败;
|
||||
|
||||
LogHelper.debug(typeof(light), string.Format("updated record result {3} ----by elabelId {0}, address {1},receiveCnt {2} ", ele_id, little_ele_id, receive_count, status));
|
||||
|
||||
LogHelper.debug(typeof(light), string.Format("key {0}, result {1}", key, result));
|
||||
WmsConstants.SEEDS_CURRENT_PICK_STATUS[key] =result ;// isPickOrderFinished;
|
||||
WmsConstants.SEEDS_CURRENT_PICK_STATUS[key] = result;// isPickOrderFinished;
|
||||
|
||||
if (WmsConstants.SEEDS_CURRENT_PICK_STATUS[key])
|
||||
{
|
||||
|
|
@ -592,43 +593,46 @@ namespace Deiniu.win.elelab
|
|||
{
|
||||
if (seedsGoodItemValided != null)
|
||||
{
|
||||
// seedsGoodItemValided();
|
||||
// seedsGoodItemValided();
|
||||
}
|
||||
}
|
||||
|
||||
if (status == enumOutSeedsStatus.分拣单完成分播
|
||||
|| status == enumOutSeedsStatus.播种单完成分播)
|
||||
{
|
||||
LogHelper.debug(typeof(light), string.Format(" labid {0} 对应分拣单完成分拣， to print.... ", ele_id ));
|
||||
if (printLabPack != null)
|
||||
{
|
||||
printLabPack(ele_id);
|
||||
}
|
||||
if (seedsGoodItemValided != null)
|
||||
{
|
||||
// seedsGoodItemValided();
|
||||
// seedsGoodItemValided();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
catch (DeiNiuTimeOutException e)
|
||||
{
|
||||
LogHelper.debug(typeof(light), string.Format("{0} 出错了。。。{1}", key, e.Message));
|
||||
Login lg = new Login();
|
||||
lg.ShowDialog();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LogHelper.debug(typeof(light), string.Format("{0} 出错了。。。{1}", key, e.Message));
|
||||
LogHelper.WriteLog(typeof(light), e);
|
||||
}
|
||||
}
|
||||
|
||||
manage_add++;
|
||||
// manage_add = receive_add;
|
||||
if (manage_add >= add_max)
|
||||
{
|
||||
manage_add = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
manage_add++;
|
||||
// manage_add = receive_add;
|
||||
if (manage_add >= add_max)
|
||||
{
|
||||
manage_add = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
case enumLabelPickType.tran:
|
||||
|
|
@ -685,7 +689,7 @@ namespace Deiniu.win.elelab
|
|||
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
manage_add++;
|
||||
if (manage_add >= add_max)
|
||||
|
|
@ -693,7 +697,7 @@ namespace Deiniu.win.elelab
|
|||
manage_add = 0;
|
||||
}
|
||||
* */
|
||||
|
||||
|
||||
}
|
||||
//统一处理。。。。
|
||||
/*
|
||||
|
|
@ -721,10 +725,10 @@ namespace Deiniu.win.elelab
|
|||
break;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
private static void updatePickStatus(string key, string color, int ele_id, int little_ele_id, string receive_count)
|
||||
{
|
||||
using (WmsOutPickRequestClient client = new WmsOutPickRequestClient("BasicHttpBinding_IWmsOutPickRequest",
|
||||
|
|
@ -732,7 +736,7 @@ namespace Deiniu.win.elelab
|
|||
{
|
||||
LogHelper.debug(typeof(light), string.Format(" ..........{0} trying to update db ", key));
|
||||
|
||||
WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = client.updatePickingStatus( Convert.ToInt16(color), ele_id, little_ele_id, Convert.ToDecimal(receive_count));//本次拣选完毕
|
||||
WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = client.updatePickingStatus(Convert.ToInt16(color), ele_id, little_ele_id, Convert.ToDecimal(receive_count));//本次拣选完毕
|
||||
LogHelper.debug(typeof(light), string.Format(" ..........{0} update result {1}", key, WmsConstants.WAVE_CURRENT_PICK_STATUS[key]));
|
||||
|
||||
bool isPickOver = client.getCurrentPickList((int)DeiNiu.Utils.enumPickState.未拣).Rows.Count == 0;//波次是否全部拣选完毕
|
||||
|
|
@ -754,9 +758,9 @@ namespace Deiniu.win.elelab
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private static void manage_data()
|
||||
|
|
@ -836,7 +840,7 @@ namespace Deiniu.win.elelab
|
|||
int port_num;
|
||||
try
|
||||
{
|
||||
port_num = Convert.ToInt16(port);
|
||||
port_num = Convert.ToInt16(port);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
@ -846,6 +850,16 @@ namespace Deiniu.win.elelab
|
|||
return "<result>执行成功</result>";
|
||||
|
||||
}
|
||||
|
||||
static string CURRENT_SEEDS_NO, CURRENT_SEEDS_GOODSID, CURRENT_SEEDS_GOOD_BATCH;
|
||||
internal static string lightsUpSeeds(DataTable dt, enumLabelPickType pickType, string seedsNo, string goodsId, string batch)
|
||||
{
|
||||
CURRENT_SEEDS_NO = seedsNo;
|
||||
CURRENT_SEEDS_GOODSID =goodsId;
|
||||
CURRENT_SEEDS_GOOD_BATCH =batch;
|
||||
|
||||
return lightsUp( dt, pickType);
|
||||
}
|
||||
internal static string lightsUp(DataTable dt,enumLabelPickType pickType)////-----
|
||||
{
|
||||
// init_port(pickType);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -760,8 +760,59 @@ namespace DeiNiu.wms.win.utils.print
|
|||
// return;
|
||||
}
|
||||
}
|
||||
public bool printBulkPackingNoStore(DataTable dt, int boxes, int bags)
|
||||
{
|
||||
try
|
||||
{
|
||||
string reportName = "pickOrderBulks.rdlc";
|
||||
|
||||
public bool printBulkPackingNoStore(DataTable dt, int boxes, int bags)
|
||||
|
||||
Microsoft.Reporting.WinForms.ReportParameter[] parameters
|
||||
= new Microsoft.Reporting.WinForms.ReportParameter[2];
|
||||
|
||||
|
||||
|
||||
while (dt.Rows.Count > 1)
|
||||
{
|
||||
dt.Rows.RemoveAt(dt.Rows.Count-1);
|
||||
}
|
||||
|
||||
foreach (DataRow dr in dt.Rows)
|
||||
{
|
||||
parameters[1] = new ReportParameter("pickNo", Util.getCode128(dr["pickOrderNo"].ToString()));
|
||||
break;
|
||||
}
|
||||
|
||||
DataView dv = dt.DefaultView;
|
||||
|
||||
// parameters[1] = new ReportParameter("pickNo", Util.getCode128("052759" + ""));
|
||||
|
||||
for (int i = 0; i < bags; i++)
|
||||
{
|
||||
|
||||
parameters[0] = new ReportParameter("packNo", "第 " + (i + 1) + "/" + bags + " 拼袋");
|
||||
BillPrint.Run(dt, reportName, PrinterType.code, parameters);
|
||||
}
|
||||
|
||||
for (int i = 0; i < boxes; i++)
|
||||
{
|
||||
parameters[0] = new ReportParameter("packNo", "第 " + (i + 1) + "/" + boxes + " 拼箱");
|
||||
BillPrint.Run(dt, reportName, PrinterType.code, parameters);
|
||||
}
|
||||
if(boxes + bags == 0)
|
||||
{
|
||||
parameters[0] = new ReportParameter("packNo", "");
|
||||
BillPrint.Run(dt, reportName, PrinterType.code, parameters);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (Exception er)
|
||||
{
|
||||
throw er;
|
||||
// return;
|
||||
}
|
||||
}
|
||||
public bool printBulkPackingNoStore2del(DataTable dt, int boxes, int bags)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -784,6 +835,7 @@ namespace DeiNiu.wms.win.utils.print
|
|||
dv.RowFilter = string.Format("volType={0}", (int)enumWhLocVol.散货拼袋);
|
||||
// parameters[0] = new ReportParameter("bulksPackCnt","共"+ dv.Count + "袋");
|
||||
dtBulks = dv.ToTable();
|
||||
dtBulks.Columns.Remove("orderNo");//多单合并时，会打印多个重复的封签
|
||||
DataView dv2 = dtBulks.DefaultView;
|
||||
for (int i = 0; i < bags; i++)
|
||||
{
|
||||
|
|
@ -796,7 +848,8 @@ namespace DeiNiu.wms.win.utils.print
|
|||
dv.RowFilter = string.Format("volType={0}", (int)enumWhLocVol.散货拼箱);
|
||||
//parameters[0] = new ReportParameter("bulksPackCnt", "共" + dv.Count + "箱");
|
||||
dtBulks = dv.ToTable();
|
||||
dv2 = dtBulks.DefaultView;
|
||||
dtBulks.Columns.Remove("orderNo");//多单合并时，会打印多个重复的封签
|
||||
dv2 = dtBulks.DefaultView;
|
||||
for (int i = 0; i < boxes; i++)
|
||||
{
|
||||
int id = Convert.ToInt32(dtBulks.Rows[i]["id"].ToString());
|
||||
|
|
|
|||
|
|
@ -90,12 +90,6 @@
|
|||
this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
|
||||
this.tabbedControlGroup3 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup12 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem10 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -114,7 +108,7 @@
|
|||
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem16 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
|
||||
this.tabbedControlGroup3 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -123,13 +117,6 @@
|
|||
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem6 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem13 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem14 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
|
|
@ -137,6 +124,19 @@
|
|||
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem13 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup12 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem10 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
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();
|
||||
|
|
@ -176,12 +176,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
|
||||
|
|
@ -200,6 +194,7 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem16)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
|
||||
|
|
@ -208,13 +203,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem14)).BeginInit();
|
||||
|
|
@ -222,6 +210,18 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// ribbon
|
||||
|
|
@ -947,76 +947,6 @@
|
|||
this.splitterItem1.Name = "splitterItem1";
|
||||
this.splitterItem1.Size = new System.Drawing.Size(8, 1007);
|
||||
//
|
||||
// tabbedControlGroup3
|
||||
//
|
||||
this.tabbedControlGroup3.Location = new System.Drawing.Point(0, 0);
|
||||
this.tabbedControlGroup3.Name = "tabbedControlGroup3";
|
||||
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup11;
|
||||
this.tabbedControlGroup3.SelectedTabPageIndex = 0;
|
||||
this.tabbedControlGroup3.Size = new System.Drawing.Size(563, 166);
|
||||
this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup11,
|
||||
this.layoutControlGroup10,
|
||||
this.layoutControlGroup3,
|
||||
this.layoutControlGroup12});
|
||||
//
|
||||
// layoutControlGroup12
|
||||
//
|
||||
this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem2,
|
||||
this.layoutControlItem32,
|
||||
this.layoutControlItem13,
|
||||
this.emptySpaceItem10});
|
||||
this.layoutControlGroup12.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup12.Name = "layoutControlGroup12";
|
||||
this.layoutControlGroup12.Size = new System.Drawing.Size(524, 92);
|
||||
this.layoutControlGroup12.Text = "灯光分拣";
|
||||
//
|
||||
// layoutControlItem2
|
||||
//
|
||||
this.layoutControlItem2.Control = this.btnRelight;
|
||||
this.layoutControlItem2.Location = new System.Drawing.Point(220, 0);
|
||||
this.layoutControlItem2.MaxSize = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.MinSize = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.Name = "layoutControlItem2";
|
||||
this.layoutControlItem2.Size = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem2.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem32
|
||||
//
|
||||
this.layoutControlItem32.Control = this.lightSwitch;
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem32.MinSize = new System.Drawing.Size(156, 29);
|
||||
this.layoutControlItem32.Name = "layoutControlItem32";
|
||||
this.layoutControlItem32.Size = new System.Drawing.Size(220, 29);
|
||||
this.layoutControlItem32.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem32.Text = "灯光分拣";
|
||||
this.layoutControlItem32.TextLocation = DevExpress.Utils.Locations.Left;
|
||||
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem32.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem13
|
||||
//
|
||||
this.layoutControlItem13.Control = this.lbLightsInfo;
|
||||
this.layoutControlItem13.Location = new System.Drawing.Point(0, 29);
|
||||
this.layoutControlItem13.MaxSize = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.MinSize = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.Name = "layoutControlItem13";
|
||||
this.layoutControlItem13.Size = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem13.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem10
|
||||
//
|
||||
this.emptySpaceItem10.AllowHotTrack = false;
|
||||
this.emptySpaceItem10.Location = new System.Drawing.Point(301, 0);
|
||||
this.emptySpaceItem10.Name = "emptySpaceItem10";
|
||||
this.emptySpaceItem10.Size = new System.Drawing.Size(223, 92);
|
||||
this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup4
|
||||
//
|
||||
this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
|
|
@ -1241,12 +1171,18 @@
|
|||
this.emptySpaceItem16.Size = new System.Drawing.Size(86, 144);
|
||||
this.emptySpaceItem16.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// imageList1
|
||||
// tabbedControlGroup3
|
||||
//
|
||||
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");
|
||||
this.tabbedControlGroup3.Location = new System.Drawing.Point(0, 0);
|
||||
this.tabbedControlGroup3.Name = "tabbedControlGroup3";
|
||||
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup12;
|
||||
this.tabbedControlGroup3.SelectedTabPageIndex = 3;
|
||||
this.tabbedControlGroup3.Size = new System.Drawing.Size(563, 166);
|
||||
this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup11,
|
||||
this.layoutControlGroup10,
|
||||
this.layoutControlGroup3,
|
||||
this.layoutControlGroup12});
|
||||
//
|
||||
// layoutControlGroup11
|
||||
//
|
||||
|
|
@ -1340,6 +1276,80 @@
|
|||
this.emptySpaceItem6.Size = new System.Drawing.Size(10, 92);
|
||||
this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup10
|
||||
//
|
||||
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem15,
|
||||
this.emptySpaceItem14,
|
||||
this.emptySpaceItem1,
|
||||
this.layoutControlItem31,
|
||||
this.emptySpaceItem5,
|
||||
this.emptySpaceItem9});
|
||||
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup10.Name = "layoutControlGroup10";
|
||||
this.layoutControlGroup10.Size = new System.Drawing.Size(524, 92);
|
||||
this.layoutControlGroup10.Text = "波次策略";
|
||||
//
|
||||
// layoutControlItem15
|
||||
//
|
||||
this.layoutControlItem15.Control = this.comboWaveRule;
|
||||
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem15.MaxSize = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.MinSize = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.Name = "layoutControlItem15";
|
||||
this.layoutControlItem15.Size = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem15.Text = "选择策略";
|
||||
this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
|
||||
//
|
||||
// emptySpaceItem14
|
||||
//
|
||||
this.emptySpaceItem14.AllowHotTrack = false;
|
||||
this.emptySpaceItem14.Location = new System.Drawing.Point(239, 26);
|
||||
this.emptySpaceItem14.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.emptySpaceItem14.Name = "emptySpaceItem14";
|
||||
this.emptySpaceItem14.Size = new System.Drawing.Size(275, 66);
|
||||
this.emptySpaceItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem14.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem1
|
||||
//
|
||||
this.emptySpaceItem1.AllowHotTrack = false;
|
||||
this.emptySpaceItem1.Location = new System.Drawing.Point(0, 24);
|
||||
this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.emptySpaceItem1.Name = "emptySpaceItem1";
|
||||
this.emptySpaceItem1.Size = new System.Drawing.Size(239, 68);
|
||||
this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlItem31
|
||||
//
|
||||
this.layoutControlItem31.Control = this.btnSetWaveRule;
|
||||
this.layoutControlItem31.Location = new System.Drawing.Point(239, 0);
|
||||
this.layoutControlItem31.MaxSize = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.MinSize = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.Name = "layoutControlItem31";
|
||||
this.layoutControlItem31.Size = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem31.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem5
|
||||
//
|
||||
this.emptySpaceItem5.AllowHotTrack = false;
|
||||
this.emptySpaceItem5.Location = new System.Drawing.Point(333, 0);
|
||||
this.emptySpaceItem5.Name = "emptySpaceItem5";
|
||||
this.emptySpaceItem5.Size = new System.Drawing.Size(181, 26);
|
||||
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem9
|
||||
//
|
||||
this.emptySpaceItem9.AllowHotTrack = false;
|
||||
this.emptySpaceItem9.Location = new System.Drawing.Point(514, 0);
|
||||
this.emptySpaceItem9.Name = "emptySpaceItem9";
|
||||
this.emptySpaceItem9.Size = new System.Drawing.Size(10, 92);
|
||||
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup3
|
||||
//
|
||||
this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
|
|
@ -1421,79 +1431,69 @@
|
|||
this.emptySpaceItem13.Size = new System.Drawing.Size(297, 92);
|
||||
this.emptySpaceItem13.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup10
|
||||
// layoutControlGroup12
|
||||
//
|
||||
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem15,
|
||||
this.emptySpaceItem14,
|
||||
this.emptySpaceItem1,
|
||||
this.layoutControlItem31,
|
||||
this.emptySpaceItem5,
|
||||
this.emptySpaceItem9});
|
||||
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup10.Name = "layoutControlGroup10";
|
||||
this.layoutControlGroup10.Size = new System.Drawing.Size(524, 92);
|
||||
this.layoutControlGroup10.Text = "波次策略";
|
||||
this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem2,
|
||||
this.layoutControlItem32,
|
||||
this.layoutControlItem13,
|
||||
this.emptySpaceItem10});
|
||||
this.layoutControlGroup12.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup12.Name = "layoutControlGroup12";
|
||||
this.layoutControlGroup12.Size = new System.Drawing.Size(524, 92);
|
||||
this.layoutControlGroup12.Text = "灯光分拣";
|
||||
//
|
||||
// layoutControlItem15
|
||||
// layoutControlItem2
|
||||
//
|
||||
this.layoutControlItem15.Control = this.comboWaveRule;
|
||||
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem15.MaxSize = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.MinSize = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.Name = "layoutControlItem15";
|
||||
this.layoutControlItem15.Size = new System.Drawing.Size(239, 24);
|
||||
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem15.Text = "选择策略";
|
||||
this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
|
||||
this.layoutControlItem2.Control = this.btnRelight;
|
||||
this.layoutControlItem2.Location = new System.Drawing.Point(220, 0);
|
||||
this.layoutControlItem2.MaxSize = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.MinSize = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.Name = "layoutControlItem2";
|
||||
this.layoutControlItem2.Size = new System.Drawing.Size(81, 29);
|
||||
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem2.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem14
|
||||
// layoutControlItem32
|
||||
//
|
||||
this.emptySpaceItem14.AllowHotTrack = false;
|
||||
this.emptySpaceItem14.Location = new System.Drawing.Point(239, 26);
|
||||
this.emptySpaceItem14.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.emptySpaceItem14.Name = "emptySpaceItem14";
|
||||
this.emptySpaceItem14.Size = new System.Drawing.Size(275, 66);
|
||||
this.emptySpaceItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem14.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem32.Control = this.lightSwitch;
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem32.MinSize = new System.Drawing.Size(156, 29);
|
||||
this.layoutControlItem32.Name = "layoutControlItem32";
|
||||
this.layoutControlItem32.Size = new System.Drawing.Size(220, 29);
|
||||
this.layoutControlItem32.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem32.Text = "灯光分拣";
|
||||
this.layoutControlItem32.TextLocation = DevExpress.Utils.Locations.Left;
|
||||
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem32.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem1
|
||||
// layoutControlItem13
|
||||
//
|
||||
this.emptySpaceItem1.AllowHotTrack = false;
|
||||
this.emptySpaceItem1.Location = new System.Drawing.Point(0, 24);
|
||||
this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.emptySpaceItem1.Name = "emptySpaceItem1";
|
||||
this.emptySpaceItem1.Size = new System.Drawing.Size(239, 68);
|
||||
this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem13.Control = this.lbLightsInfo;
|
||||
this.layoutControlItem13.Location = new System.Drawing.Point(0, 29);
|
||||
this.layoutControlItem13.MaxSize = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.MinSize = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.Name = "layoutControlItem13";
|
||||
this.layoutControlItem13.Size = new System.Drawing.Size(301, 63);
|
||||
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem13.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem31
|
||||
// emptySpaceItem10
|
||||
//
|
||||
this.layoutControlItem31.Control = this.btnSetWaveRule;
|
||||
this.layoutControlItem31.Location = new System.Drawing.Point(239, 0);
|
||||
this.layoutControlItem31.MaxSize = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.MinSize = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.Name = "layoutControlItem31";
|
||||
this.layoutControlItem31.Size = new System.Drawing.Size(94, 26);
|
||||
this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem31.TextVisible = false;
|
||||
this.emptySpaceItem10.AllowHotTrack = false;
|
||||
this.emptySpaceItem10.Location = new System.Drawing.Point(301, 0);
|
||||
this.emptySpaceItem10.Name = "emptySpaceItem10";
|
||||
this.emptySpaceItem10.Size = new System.Drawing.Size(223, 92);
|
||||
this.emptySpaceItem10.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem5
|
||||
// imageList1
|
||||
//
|
||||
this.emptySpaceItem5.AllowHotTrack = false;
|
||||
this.emptySpaceItem5.Location = new System.Drawing.Point(333, 0);
|
||||
this.emptySpaceItem5.Name = "emptySpaceItem5";
|
||||
this.emptySpaceItem5.Size = new System.Drawing.Size(181, 26);
|
||||
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem9
|
||||
//
|
||||
this.emptySpaceItem9.AllowHotTrack = false;
|
||||
this.emptySpaceItem9.Location = new System.Drawing.Point(514, 0);
|
||||
this.emptySpaceItem9.Name = "emptySpaceItem9";
|
||||
this.emptySpaceItem9.Size = new System.Drawing.Size(10, 92);
|
||||
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
|
||||
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");
|
||||
//
|
||||
// GoodsOutForm
|
||||
//
|
||||
|
|
@ -1546,12 +1546,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
|
||||
|
|
@ -1570,6 +1564,7 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem16)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
|
||||
|
|
@ -1578,13 +1573,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem14)).EndInit();
|
||||
|
|
@ -1592,6 +1580,18 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem10)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
|
|||
|
|
@ -1101,7 +1101,7 @@ namespace DeiNiu.wms.win
|
|||
TimeSpan ts = DateTime.Now - WmsConstants.WAVE_LAST_TIME;// WmsConstants.WAVE_LAST_TIME;
|
||||
try
|
||||
{
|
||||
debug("WmsConstants.WAVE_CURRENT_ORDER :" + WmsConstants.WAVE_CURRENT_ORDER);
|
||||
// debug("WmsConstants.WAVE_CURRENT_ORDER :" + WmsConstants.WAVE_CURRENT_ORDER);
|
||||
if (InvokeRequired)
|
||||
{
|
||||
this.Invoke(new loadNewCurrentWave(delegate()
|
||||
|
|
@ -1796,7 +1796,7 @@ namespace DeiNiu.wms.win
|
|||
WmsOutPickLable label;
|
||||
|
||||
DataView dv = dtBulks.DefaultView;
|
||||
debug(String.Format("updateLableStatus ...dtBulks row count {0}", dv.Count));
|
||||
// debug(String.Format("updateLableStatus ...dtBulks row count {0}", dv.Count));
|
||||
|
||||
/*foreach(DataRowView dvRow in dv)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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>275, 17</value>
|
||||
<value>274, 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">
|
||||
|
|
@ -259,14 +259,14 @@
|
|||
</value>
|
||||
</data>
|
||||
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>542, 17</value>
|
||||
<value>539, 17</value>
|
||||
</metadata>
|
||||
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
|
||||
CQAAAk1TRnQBSQFMAgEBAgEAAcABCAHAAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CQAAAk1TRnQBSQFMAgEBAgEAAcgBCAHIAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
|
|
|||
|
|
@ -96,6 +96,8 @@
|
|||
this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -130,8 +132,6 @@
|
|||
this.lllightbutton = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
|
||||
this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -149,13 +149,6 @@
|
|||
this.layoutControlGroup12 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -165,6 +158,13 @@
|
|||
this.emptySpaceItem16 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.simpleSeparator5 = new DevExpress.XtraLayout.SimpleSeparator();
|
||||
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
|
|
@ -213,6 +213,8 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
|
||||
|
|
@ -247,8 +249,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.lllightbutton)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
|
||||
|
|
@ -266,13 +266,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
|
||||
|
|
@ -282,6 +275,13 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem16)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.simpleSeparator5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
|
||||
|
|
@ -1064,6 +1064,24 @@
|
|||
this.layoutControlGroup9,
|
||||
this.layoutControlGroup15});
|
||||
//
|
||||
// layoutControlGroup15
|
||||
//
|
||||
this.layoutControlGroup15.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem36});
|
||||
this.layoutControlGroup15.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup15.Name = "layoutControlGroup15";
|
||||
this.layoutControlGroup15.Size = new System.Drawing.Size(1186, 553);
|
||||
this.layoutControlGroup15.Text = "拣货明细";
|
||||
//
|
||||
// layoutControlItem36
|
||||
//
|
||||
this.layoutControlItem36.Control = this.gridControlPkDetail;
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem36.Name = "layoutControlItem36";
|
||||
this.layoutControlItem36.Size = new System.Drawing.Size(1186, 553);
|
||||
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem36.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup9
|
||||
//
|
||||
this.layoutControlGroup9.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F);
|
||||
|
|
@ -1488,24 +1506,6 @@
|
|||
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem14.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup15
|
||||
//
|
||||
this.layoutControlGroup15.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem36});
|
||||
this.layoutControlGroup15.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup15.Name = "layoutControlGroup15";
|
||||
this.layoutControlGroup15.Size = new System.Drawing.Size(1186, 553);
|
||||
this.layoutControlGroup15.Text = "拣货明细";
|
||||
//
|
||||
// layoutControlItem36
|
||||
//
|
||||
this.layoutControlItem36.Control = this.gridControlPkDetail;
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem36.Name = "layoutControlItem36";
|
||||
this.layoutControlItem36.Size = new System.Drawing.Size(1186, 553);
|
||||
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem36.TextVisible = false;
|
||||
//
|
||||
// splitterItem1
|
||||
//
|
||||
this.splitterItem1.AllowHotTrack = true;
|
||||
|
|
@ -1697,93 +1697,6 @@
|
|||
this.layoutControlGroup10,
|
||||
this.layoutControlGroup7});
|
||||
//
|
||||
// layoutControlGroup10
|
||||
//
|
||||
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem19,
|
||||
this.layoutControlItem22,
|
||||
this.layoutControlItem20,
|
||||
this.emptySpaceItem7,
|
||||
this.layoutControlItem17,
|
||||
this.layoutControlItem32});
|
||||
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup10.Name = "layoutControlGroup10";
|
||||
this.layoutControlGroup10.Size = new System.Drawing.Size(502, 102);
|
||||
this.layoutControlGroup10.Text = "亮灯设备";
|
||||
//
|
||||
// layoutControlItem19
|
||||
//
|
||||
this.layoutControlItem19.Control = this.combComs;
|
||||
this.layoutControlItem19.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem19.MaxSize = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.MinSize = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.Name = "layoutControlItem19";
|
||||
this.layoutControlItem19.Size = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem19.Text = "选择端口";
|
||||
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem19.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem22
|
||||
//
|
||||
this.layoutControlItem22.Control = this.btnShowId;
|
||||
this.layoutControlItem22.Location = new System.Drawing.Point(98, 0);
|
||||
this.layoutControlItem22.MaxSize = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.MinSize = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.Name = "layoutControlItem22";
|
||||
this.layoutControlItem22.Size = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem22.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem20
|
||||
//
|
||||
this.layoutControlItem20.Control = this.btnInitialCom;
|
||||
this.layoutControlItem20.Location = new System.Drawing.Point(0, 26);
|
||||
this.layoutControlItem20.MinSize = new System.Drawing.Size(56, 26);
|
||||
this.layoutControlItem20.Name = "layoutControlItem20";
|
||||
this.layoutControlItem20.Size = new System.Drawing.Size(88, 32);
|
||||
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem20.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem7
|
||||
//
|
||||
this.emptySpaceItem7.AllowHotTrack = false;
|
||||
this.emptySpaceItem7.Location = new System.Drawing.Point(88, 0);
|
||||
this.emptySpaceItem7.MaxSize = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.MinSize = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.Name = "emptySpaceItem7";
|
||||
this.emptySpaceItem7.Size = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlItem17
|
||||
//
|
||||
this.layoutControlItem17.AppearanceItemCaption.Font = new System.Drawing.Font("华文仿宋", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.layoutControlItem17.AppearanceItemCaption.Options.UseFont = true;
|
||||
this.layoutControlItem17.Control = this.lbLightsState;
|
||||
this.layoutControlItem17.Location = new System.Drawing.Point(173, 0);
|
||||
this.layoutControlItem17.MinSize = new System.Drawing.Size(52, 34);
|
||||
this.layoutControlItem17.Name = "layoutControlItem17";
|
||||
this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 2, 2, 2);
|
||||
this.layoutControlItem17.Size = new System.Drawing.Size(329, 58);
|
||||
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem17.Text = "电子标签";
|
||||
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem17.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem32
|
||||
//
|
||||
this.layoutControlItem32.Control = this.lbComstatus;
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(0, 58);
|
||||
this.layoutControlItem32.MinSize = new System.Drawing.Size(24, 24);
|
||||
this.layoutControlItem32.Name = "layoutControlItem32";
|
||||
this.layoutControlItem32.Size = new System.Drawing.Size(502, 44);
|
||||
this.layoutControlItem32.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem32.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup2
|
||||
//
|
||||
this.layoutControlGroup2.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
|
||||
|
|
@ -1897,6 +1810,93 @@
|
|||
this.emptySpaceItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup10
|
||||
//
|
||||
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem19,
|
||||
this.layoutControlItem22,
|
||||
this.layoutControlItem20,
|
||||
this.emptySpaceItem7,
|
||||
this.layoutControlItem17,
|
||||
this.layoutControlItem32});
|
||||
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup10.Name = "layoutControlGroup10";
|
||||
this.layoutControlGroup10.Size = new System.Drawing.Size(502, 102);
|
||||
this.layoutControlGroup10.Text = "亮灯设备";
|
||||
//
|
||||
// layoutControlItem19
|
||||
//
|
||||
this.layoutControlItem19.Control = this.combComs;
|
||||
this.layoutControlItem19.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem19.MaxSize = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.MinSize = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.Name = "layoutControlItem19";
|
||||
this.layoutControlItem19.Size = new System.Drawing.Size(88, 26);
|
||||
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem19.Text = "选择端口";
|
||||
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem19.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem22
|
||||
//
|
||||
this.layoutControlItem22.Control = this.btnShowId;
|
||||
this.layoutControlItem22.Location = new System.Drawing.Point(98, 0);
|
||||
this.layoutControlItem22.MaxSize = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.MinSize = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.Name = "layoutControlItem22";
|
||||
this.layoutControlItem22.Size = new System.Drawing.Size(75, 58);
|
||||
this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem22.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem20
|
||||
//
|
||||
this.layoutControlItem20.Control = this.btnInitialCom;
|
||||
this.layoutControlItem20.Location = new System.Drawing.Point(0, 26);
|
||||
this.layoutControlItem20.MinSize = new System.Drawing.Size(56, 26);
|
||||
this.layoutControlItem20.Name = "layoutControlItem20";
|
||||
this.layoutControlItem20.Size = new System.Drawing.Size(88, 32);
|
||||
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem20.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem7
|
||||
//
|
||||
this.emptySpaceItem7.AllowHotTrack = false;
|
||||
this.emptySpaceItem7.Location = new System.Drawing.Point(88, 0);
|
||||
this.emptySpaceItem7.MaxSize = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.MinSize = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.Name = "emptySpaceItem7";
|
||||
this.emptySpaceItem7.Size = new System.Drawing.Size(10, 58);
|
||||
this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlItem17
|
||||
//
|
||||
this.layoutControlItem17.AppearanceItemCaption.Font = new System.Drawing.Font("华文仿宋", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.layoutControlItem17.AppearanceItemCaption.Options.UseFont = true;
|
||||
this.layoutControlItem17.Control = this.lbLightsState;
|
||||
this.layoutControlItem17.Location = new System.Drawing.Point(173, 0);
|
||||
this.layoutControlItem17.MinSize = new System.Drawing.Size(52, 34);
|
||||
this.layoutControlItem17.Name = "layoutControlItem17";
|
||||
this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 2, 2, 2);
|
||||
this.layoutControlItem17.Size = new System.Drawing.Size(329, 58);
|
||||
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem17.Text = "电子标签";
|
||||
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem17.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem32
|
||||
//
|
||||
this.layoutControlItem32.Control = this.lbComstatus;
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(0, 58);
|
||||
this.layoutControlItem32.MinSize = new System.Drawing.Size(24, 24);
|
||||
this.layoutControlItem32.Name = "layoutControlItem32";
|
||||
this.layoutControlItem32.Size = new System.Drawing.Size(502, 44);
|
||||
this.layoutControlItem32.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem32.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup7
|
||||
//
|
||||
this.layoutControlGroup7.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
|
|
@ -2041,6 +2041,8 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
|
||||
|
|
@ -2075,8 +2077,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.lllightbutton)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup15)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
|
||||
|
|
@ -2094,13 +2094,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
|
||||
|
|
@ -2110,6 +2103,13 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem16)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.simpleSeparator5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ namespace DeiNiu.wms.win
|
|||
string currentWave = "";
|
||||
string currentGoodsId = "";
|
||||
string currentGoodsBatch = "";
|
||||
|
||||
byte deskPort = 0;
|
||||
|
||||
bool showId = true;
|
||||
|
|
@ -112,6 +113,8 @@ namespace DeiNiu.wms.win
|
|||
}
|
||||
try
|
||||
{
|
||||
LogHelper.debug(typeof(light), string.Format(" to print.... " ));
|
||||
|
||||
showWaitForm("正在打印");
|
||||
DataView dv = dsPickOrders.Tables[2].DefaultView; // distinct pickOrderNo
|
||||
dv.RowFilter = "dpsOrder='" + currentWave + "' and seedsLabelId=" + labId;
|
||||
|
|
@ -120,7 +123,7 @@ namespace DeiNiu.wms.win
|
|||
DataTable dt = dv.ToTable(true, "pickOrderNo", "seedsLabelId", "customerName", "desk");//, "customerName", "seedsLabelId");
|
||||
dt.TableName = "tableSeedsPickOrders";
|
||||
|
||||
if (WmsConstants.VALIDATION_SEEDS_PACK_DESK_SPLIT)
|
||||
if (WmsConstants.VALIDATION_SEEDS_PACK_DESK_SPLIT)// 播种和打包分开进行
|
||||
{
|
||||
reqportPrint.printSeedsPickOrderCode(dt);
|
||||
}
|
||||
|
|
@ -606,13 +609,11 @@ namespace DeiNiu.wms.win
|
|||
GridColumn myCol14 = new GridColumn() { Caption = "批号", Visible = true, FieldName = WmsOutDetail.fields.batch.ToString(), MinWidth = 120 };
|
||||
GridColumn myCol15 = new GridColumn() { Caption = "生产日期", Visible = true, FieldName = WmsOutDetail.fields.productDate.ToString() };
|
||||
GridColumn myCol16 = new GridColumn() { Caption = "有效期", Visible = true, FieldName = WmsOutDetail.fields.validDate.ToString() };
|
||||
GridColumn myCol1001 = new GridColumn() { Caption = "拣货数量", Visible = true, FieldName = "pdaOuting" };
|
||||
GridColumn myCol1001 = new GridColumn() { Caption = "拣货数量", Visible = true, FieldName = "count" };
|
||||
|
||||
GridColumn myCol17 = new GridColumn() { Caption = "状态", Visible = true, FieldName = WmsOutDetail.fields.state.ToString() };
|
||||
GridColumn myCol18 = new GridColumn() { Caption = "说明", Visible = true, FieldName = WmsOutDetail.fields.description.ToString() };
|
||||
GridColumn myCol19 = new GridColumn() { Caption = "状态", Visible = true, FieldName = "bulkPickState",MinWidth=90 };
|
||||
GridColumn myCol191 = new GridColumn() { Caption = "状态", Visible = true, FieldName = "pickState", MinWidth = 90 };
|
||||
|
||||
|
||||
GridColumn myCol20 = new GridColumn() { Caption = "波次", Visible = true, FieldName = WmsOutPickLable.fields.dpsOrder.ToString() };
|
||||
GridColumn myCol21 = new GridColumn() { Caption = "颜色", Visible = true, FieldName = WmsOutPickLable.fields.color.ToString() };
|
||||
GridColumn myCol22 = new GridColumn() { Caption = "货位", Visible = true, FieldName = WmsOutPickLable.fields.locationId.ToString() };
|
||||
|
|
@ -623,10 +624,12 @@ namespace DeiNiu.wms.win
|
|||
GridColumn myCol26 = new GridColumn() { Caption = "异常回馈", Visible = true, FieldName = "solution" };
|
||||
GridColumn myCol27 = new GridColumn() { Caption = "回馈说明", Visible = true, FieldName = WmsOutPickDetail.fields.solutionRemark.ToString() };
|
||||
GridColumn myCol28 = new GridColumn() { Caption = "条码", Visible = true, FieldName = "barCode" };
|
||||
|
||||
|
||||
GridColumn myCol19 = new GridColumn() { Caption = "分拣状态", Visible = true, FieldName = "state" };
|
||||
GridColumn myCol191 = new GridColumn() { Caption = "分拣人", Visible = true, FieldName = "操作人" };
|
||||
GridColumn myCol192 = new GridColumn() { Caption = "分拣时间", Visible = true, FieldName = "pickTime", MinWidth = 120 };
|
||||
|
||||
if (gridview == gridViewException)
|
||||
if (gridview == gridViewException)
|
||||
{
|
||||
gridview.Columns.Add(myCol25);
|
||||
gridview.Columns.Add(myCol26);
|
||||
|
|
@ -642,11 +645,11 @@ namespace DeiNiu.wms.win
|
|||
gridview.Columns.Add(myCol1001);
|
||||
gridview.Columns.Add(myCol5);
|
||||
gridview.Columns.Add(myCol4);
|
||||
|
||||
gridview.Columns.Add(myCol191);
|
||||
gridview.Columns.Add(myCol19);
|
||||
gridview.Columns.Add(myCol191);
|
||||
gridview.Columns.Add(myCol192);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gridview.Columns.Add(myCol2);
|
||||
|
|
@ -821,10 +824,7 @@ namespace DeiNiu.wms.win
|
|||
resetValidationDetails();
|
||||
|
||||
lbPickOrderNo.Text = "";
|
||||
WmsConstants.CURRENT_SEEDS_NO = "";
|
||||
WmsConstants.CURRENT_SEEDS_GOODSID = "";
|
||||
WmsConstants.CURRENT_SEEDS_GOOD_BATCH = "";
|
||||
WmsConstants.CURRENT_SEEDS_GOOD_SKUID = 0;
|
||||
|
||||
this.currentSkuId = 0;
|
||||
tryCnt = 0;
|
||||
//resetLights();
|
||||
|
|
@ -1072,7 +1072,10 @@ namespace DeiNiu.wms.win
|
|||
|
||||
private void loadSeedsOrders()
|
||||
{
|
||||
|
||||
if (dtSeedsOrders == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// showWaitForm();
|
||||
try
|
||||
{
|
||||
|
|
@ -1327,8 +1330,8 @@ namespace DeiNiu.wms.win
|
|||
gridViewPickOrders4valid.CustomColumnDisplayText += gridView_CustomColumnDisplayText;
|
||||
gridViewSeedsPick.CustomColumnDisplayText += gridView_CustomColumnDisplayText;
|
||||
gridViewSeedsPick.RowCellStyle += gridView_RowCellStyle;
|
||||
|
||||
this.gridViewPickOrders4valid.FocusedRowObjectChanged += new DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventHandler(this.gridViewSeedsOrders_FocusedRowObjectChanged);
|
||||
gridViewPickDetail.CustomColumnDisplayText += gridViewPickDetails_CustomColumnDisplayText;
|
||||
this.gridViewPickOrders4valid.FocusedRowObjectChanged += new DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventHandler(this.gridViewSeedsOrders_FocusedRowObjectChanged);
|
||||
//this.gridViewPickOrders4valid.DataSourceChanged += new System.EventHandler(this.gridView1_DataSourceChanged);
|
||||
|
||||
//show line number
|
||||
|
|
@ -1375,11 +1378,40 @@ namespace DeiNiu.wms.win
|
|||
// gridViewPickDetails.CustomColumnDisplayText += gridView_CustomColumnDisplayText;
|
||||
this.gridViewException.CustomColumnDisplayText += gridView_CustomColumnDisplayText;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void gridViewPickDetails_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
|
||||
{
|
||||
if (e.Column.FieldName == WmsOutPickDetail.fields.state.ToString())
|
||||
{
|
||||
if (!pickOrNot.ContainsValue(e.DisplayText))
|
||||
{
|
||||
|
||||
private void gridView_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
|
||||
int display = -100;
|
||||
string disTxt = e.DisplayText;
|
||||
|
||||
try
|
||||
{
|
||||
display = Convert.ToInt16(e.DisplayText);
|
||||
|
||||
e.DisplayText = pickOrNot[display];
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
// e.DisplayText = pickOrNot.ContainsKey(display) ? pickOrNot[display] : display+"";
|
||||
}
|
||||
else if (e.Column.FieldName == "pickTime")
|
||||
{
|
||||
e.Column.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void gridView_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
|
||||
{
|
||||
//if (sender == gridViewValidated)
|
||||
{
|
||||
|
|
@ -1667,13 +1699,16 @@ namespace DeiNiu.wms.win
|
|||
this.gridControlPickOrders.DataSource = dv;
|
||||
// initialGridView2Columns(this.gridViewPickOrders4valid);
|
||||
// btnPrint.Enabled = dtPickOrders4Validation.Rows.Count == 0 ;//&& dtPickOrdersValidated.Select("bulkpickstate < " + (int)enumOutStockPickStatus.复核完成).Length ==0;
|
||||
*/
|
||||
|
||||
WmsConstants.CURRENT_SEEDS_NO = currentSeedsOrder;
|
||||
WmsConstants.CURRENT_SEEDS_GOODSID = currentGoodsId;
|
||||
WmsConstants.CURRENT_SEEDS_GOOD_BATCH = currentGoodsBatch;
|
||||
|
||||
//lbPickOrderNo.Text = currentWave;// currentSeedsOrder;
|
||||
*/
|
||||
|
||||
//lbPickOrderNo.Text = currentWave;// currentSeedsOrder;
|
||||
LogHelper.debug(typeof(light), string.Format("current goods detail {0} ", currentGoodsDetail));
|
||||
|
||||
LogHelper.debug(typeof(light), string.Format("to get light data currentSeedsOrder {0}, currentGoodsId {1}, currentGoodsBatch {2}, goodsname {3}", currentSeedsOrder, currentGoodsId, currentGoodsBatch, lbGoodsName.Text));
|
||||
showWaitForm();
|
||||
DataSet ds = pickClient.getSeedsLightData(currentSeedsOrder, currentGoodsId, currentGoodsBatch);
|
||||
|
||||
|
|
@ -1892,6 +1927,7 @@ namespace DeiNiu.wms.win
|
|||
this.currentGoodsId = currentGoodsDetail.goodsId;
|
||||
this.currentGoodsBatch = currentGoodsDetail.batch;
|
||||
this.currentSkuId = currentGoodsDetail.skuId;
|
||||
|
||||
deskPort = Convert.ToByte( currentGoodsDetail.seedsPort);
|
||||
WmsConstants.CURRENT_SEEDS_GOOD_SKUID = currentGoodsDetail.skuId;
|
||||
// WmsConstants.CURRENT_SEEDS_LABLE_ID = currentGoodsDetail.seedsLabelId;
|
||||
|
|
@ -2128,13 +2164,24 @@ namespace DeiNiu.wms.win
|
|||
/// <summary>
|
||||
/// 点亮待拣选标签
|
||||
/// </summary>
|
||||
private void lightLabelsCurrentGoods()
|
||||
private void lightLabelsCurrentGoods(string seedsNo,string goodsId,string batch)
|
||||
{
|
||||
|
||||
// lightLablesInSvc();
|
||||
|
||||
//lightLabelsInWinformSvc();
|
||||
|
||||
|
||||
|
||||
|
||||
DataSet ds = pickClient.getSeedsLightData(seedsNo, goodsId, batch);
|
||||
|
||||
|
||||
|
||||
//closeClient();
|
||||
closeWaitForm();
|
||||
dtSeedsLight = ds.Tables[0];
|
||||
|
||||
|
||||
initialLabs();
|
||||
clearDisplay(dtSeedsLight);
|
||||
showWaitForm( );
|
||||
|
|
@ -2146,8 +2193,13 @@ namespace DeiNiu.wms.win
|
|||
}
|
||||
}
|
||||
|
||||
// string result = lightSeeds.lightsUp(dtSeedsLight, enumLabelPickType.seed);
|
||||
string result = light.lightsUp(dtSeedsLight, enumLabelPickType.seed);
|
||||
// string result = lightSeeds.lightsUp(dtSeedsLight, enumLabelPickType.seed);
|
||||
LogHelper.WriteLog(this.GetType(), string.Format( "to light ......seedsNo :{0}, goodsId :{1},batch :{2}",seedsNo,goodsId,batch));
|
||||
|
||||
string result = light.lightsUpSeeds(dtSeedsLight, enumLabelPickType.seed, seedsNo, goodsId, batch);
|
||||
|
||||
|
||||
|
||||
WmsConstants.SEEDS_CURRENT_PICK_STATUS.Clear();
|
||||
//#if DEBUG
|
||||
closeWaitForm();
|
||||
|
|
@ -2298,7 +2350,7 @@ namespace DeiNiu.wms.win
|
|||
//this.gridSeedsGoods.DataSource = null;
|
||||
//setCurrentSeedsRequestGoodsList();
|
||||
|
||||
DataRow[] drs = this.dtSeedsGoods.Select(string.Format("barcode ='{0}'", barcode));
|
||||
DataRow[] drs = this.dtSeedsGoods.Select(string.Format("barcode ='{0}' and confirmedCount=0", barcode));
|
||||
// GetGridViewFilteredAndSortedData(gridViewSeedsDetail)
|
||||
|
||||
if (drs.Length == 0)
|
||||
|
|
@ -2349,8 +2401,11 @@ namespace DeiNiu.wms.win
|
|||
|
||||
// gridViewSeedsDetail.Focus();
|
||||
setCurrentValidationDetail();
|
||||
|
||||
|
||||
|
||||
// WmsConstants.CURRENT_SEEDS_NO = currentSeedsOrder;
|
||||
// WmsConstants.CURRENT_SEEDS_GOODSID = currentGoodsId;
|
||||
// WmsConstants.CURRENT_SEEDS_GOOD_BATCH = currentGoodsBatch;
|
||||
|
||||
if (drs.Length > 1)
|
||||
{
|
||||
textEditBarcode.BackColor = Color.OrangeRed;
|
||||
|
|
@ -2358,14 +2413,14 @@ namespace DeiNiu.wms.win
|
|||
}else
|
||||
if (!isDoubleChk || isDoubleChk && WmsConstants.CHECKED_BY_2_ID > 0)
|
||||
{
|
||||
lightLabelsCurrentGoods();
|
||||
lightLabelsCurrentGoods(dr["seedsPickNo"].ToString(), dr["goodsId"].ToString(), dr["batch"].ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
string tmpOrder = string.Empty;
|
||||
int boxcnt =3;
|
||||
int bagcnt =2;
|
||||
int boxcnt ;
|
||||
int bagcnt ;
|
||||
printIn reqportPrint = new printIn();
|
||||
private void btnPrint_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
|
@ -2433,8 +2488,8 @@ namespace DeiNiu.wms.win
|
|||
}
|
||||
}
|
||||
reqportPrint.printBulkPackingNoStore(dt, boxcnt, bagcnt);
|
||||
tmsClient.deletTmsRec(orderNo);
|
||||
//closeClient();
|
||||
// tmsClient.deletTmsRec(orderNo);
|
||||
closeClient();
|
||||
|
||||
}
|
||||
private void textEditValidCount_EditValueChanged(object sender, EventArgs e)
|
||||
|
|
@ -2888,7 +2943,8 @@ namespace DeiNiu.wms.win
|
|||
private void radioButton1_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
rd2.Checked = !rd1.Checked;
|
||||
setOrderFilter();
|
||||
setOrderFilter();
|
||||
loadSeedsOrders();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2896,6 +2952,7 @@ namespace DeiNiu.wms.win
|
|||
{
|
||||
rd1.Checked = !rd2.Checked;
|
||||
setOrderFilter();
|
||||
loadSeedsOrders();
|
||||
}
|
||||
string filter = "seedsstatus=" + (int)enumOutStockRequestStatus.正在分拣;
|
||||
private void setOrderFilter()
|
||||
|
|
@ -2920,7 +2977,7 @@ namespace DeiNiu.wms.win
|
|||
|
||||
private void sbLight_Click(object sender, EventArgs e)
|
||||
{
|
||||
lightLabelsCurrentGoods();
|
||||
lightLabelsCurrentGoods(currentSeedsOrder, currentGoodsId, currentGoodsBatch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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>275, 17</value>
|
||||
<value>274, 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">
|
||||
|
|
@ -348,10 +348,10 @@
|
|||
</value>
|
||||
</data>
|
||||
<metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>542, 17</value>
|
||||
<value>539, 17</value>
|
||||
</metadata>
|
||||
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>771, 17</value>
|
||||
<value>768, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>74</value>
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@
|
|||
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.simpleSeparator3 = new DevExpress.XtraLayout.SimpleSeparator();
|
||||
this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -74,8 +72,6 @@
|
|||
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -90,6 +86,10 @@
|
|||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
|
||||
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
|
||||
|
|
@ -114,8 +114,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.simpleSeparator3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
|
||||
|
|
@ -126,8 +124,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
|
||||
|
|
@ -140,6 +136,10 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// ribbon
|
||||
|
|
@ -205,12 +205,14 @@
|
|||
//
|
||||
// btnOk
|
||||
//
|
||||
this.btnOk.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.btnOk.Appearance.Options.UseFont = true;
|
||||
this.btnOk.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
|
||||
this.btnOk.ImageUri.Uri = "Apply";
|
||||
this.btnOk.Location = new System.Drawing.Point(1191, 83);
|
||||
this.btnOk.Location = new System.Drawing.Point(1301, 41);
|
||||
this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnOk.Name = "btnOk";
|
||||
this.btnOk.Size = new System.Drawing.Size(118, 75);
|
||||
this.btnOk.Size = new System.Drawing.Size(166, 116);
|
||||
this.btnOk.StyleController = this.layoutControl1;
|
||||
this.btnOk.TabIndex = 52;
|
||||
this.btnOk.Text = "打包完成";
|
||||
|
|
@ -219,22 +221,22 @@
|
|||
// lbCustmer
|
||||
//
|
||||
this.lbCustmer.Font = new System.Drawing.Font("华文仿宋", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.lbCustmer.Location = new System.Drawing.Point(996, 21);
|
||||
this.lbCustmer.Location = new System.Drawing.Point(353, 98);
|
||||
this.lbCustmer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbCustmer.Name = "lbCustmer";
|
||||
this.lbCustmer.Size = new System.Drawing.Size(884, 54);
|
||||
this.lbCustmer.Size = new System.Drawing.Size(745, 60);
|
||||
this.lbCustmer.TabIndex = 20;
|
||||
this.lbCustmer.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// gridSaleOrders
|
||||
//
|
||||
this.gridSaleOrders.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
|
||||
this.gridSaleOrders.Location = new System.Drawing.Point(532, 221);
|
||||
this.gridSaleOrders.Location = new System.Drawing.Point(346, 242);
|
||||
this.gridSaleOrders.MainView = this.gridViewSaleOrders;
|
||||
this.gridSaleOrders.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.gridSaleOrders.MenuManager = this.ribbon;
|
||||
this.gridSaleOrders.Name = "gridSaleOrders";
|
||||
this.gridSaleOrders.Size = new System.Drawing.Size(1380, 730);
|
||||
this.gridSaleOrders.Size = new System.Drawing.Size(1566, 709);
|
||||
this.gridSaleOrders.TabIndex = 9;
|
||||
this.gridSaleOrders.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
||||
this.gridViewSaleOrders});
|
||||
|
|
@ -252,7 +254,7 @@
|
|||
this.gridPickOrders.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.gridPickOrders.MenuManager = this.ribbon;
|
||||
this.gridPickOrders.Name = "gridPickOrders";
|
||||
this.gridPickOrders.Size = new System.Drawing.Size(419, 798);
|
||||
this.gridPickOrders.Size = new System.Drawing.Size(233, 798);
|
||||
this.gridPickOrders.TabIndex = 4;
|
||||
this.gridPickOrders.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
||||
this.gridViewPickOrders});
|
||||
|
|
@ -277,12 +279,14 @@
|
|||
//
|
||||
// btnPrint
|
||||
//
|
||||
this.btnPrint.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
|
||||
this.btnPrint.Appearance.Options.UseFont = true;
|
||||
this.btnPrint.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
|
||||
this.btnPrint.ImageUri.Uri = "Print";
|
||||
this.btnPrint.Location = new System.Drawing.Point(1315, 83);
|
||||
this.btnPrint.Location = new System.Drawing.Point(1473, 41);
|
||||
this.btnPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnPrint.Name = "btnPrint";
|
||||
this.btnPrint.Size = new System.Drawing.Size(118, 75);
|
||||
this.btnPrint.Size = new System.Drawing.Size(166, 116);
|
||||
this.btnPrint.StyleController = this.layoutControl1;
|
||||
this.btnPrint.TabIndex = 6;
|
||||
this.btnPrint.Text = "再次打印";
|
||||
|
|
@ -344,12 +348,12 @@
|
|||
// gridGoods
|
||||
//
|
||||
this.gridGoods.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
|
||||
this.gridGoods.Location = new System.Drawing.Point(532, 221);
|
||||
this.gridGoods.Location = new System.Drawing.Point(346, 242);
|
||||
this.gridGoods.MainView = this.gridViewGoods;
|
||||
this.gridGoods.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.gridGoods.MenuManager = this.ribbonControl1;
|
||||
this.gridGoods.Name = "gridGoods";
|
||||
this.gridGoods.Size = new System.Drawing.Size(1380, 730);
|
||||
this.gridGoods.Size = new System.Drawing.Size(1566, 709);
|
||||
this.gridGoods.TabIndex = 17;
|
||||
this.gridGoods.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
||||
this.gridViewGoods});
|
||||
|
|
@ -395,7 +399,7 @@
|
|||
//
|
||||
// textEditPickOrderNo
|
||||
//
|
||||
this.textEditPickOrderNo.Location = new System.Drawing.Point(623, 21);
|
||||
this.textEditPickOrderNo.Location = new System.Drawing.Point(456, 40);
|
||||
this.textEditPickOrderNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.textEditPickOrderNo.MenuManager = this.ribbon;
|
||||
this.textEditPickOrderNo.Name = "textEditPickOrderNo";
|
||||
|
|
@ -413,11 +417,11 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBox.Location = new System.Drawing.Point(993, 108);
|
||||
this.spinBulkBox.Location = new System.Drawing.Point(1103, 66);
|
||||
this.spinBulkBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.spinBulkBox.MenuManager = this.ribbon;
|
||||
this.spinBulkBox.Name = "spinBulkBox";
|
||||
this.spinBulkBox.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 18F);
|
||||
this.spinBulkBox.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
|
||||
this.spinBulkBox.Properties.Appearance.Options.UseFont = true;
|
||||
this.spinBulkBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
||||
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
||||
|
|
@ -428,7 +432,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBox.Size = new System.Drawing.Size(96, 50);
|
||||
this.spinBulkBox.Size = new System.Drawing.Size(96, 54);
|
||||
this.spinBulkBox.StyleController = this.layoutControl1;
|
||||
this.spinBulkBox.TabIndex = 25;
|
||||
//
|
||||
|
|
@ -439,10 +443,10 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBag.Location = new System.Drawing.Point(1095, 108);
|
||||
this.spinBulkBag.Location = new System.Drawing.Point(1205, 66);
|
||||
this.spinBulkBag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.spinBulkBag.Name = "spinBulkBag";
|
||||
this.spinBulkBag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 18F);
|
||||
this.spinBulkBag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
|
||||
this.spinBulkBag.Properties.Appearance.Options.UseFont = true;
|
||||
this.spinBulkBag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
||||
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
||||
|
|
@ -453,7 +457,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBag.Size = new System.Drawing.Size(90, 50);
|
||||
this.spinBulkBag.Size = new System.Drawing.Size(90, 54);
|
||||
this.spinBulkBag.StyleController = this.layoutControl1;
|
||||
this.spinBulkBag.TabIndex = 25;
|
||||
//
|
||||
|
|
@ -488,16 +492,10 @@
|
|||
this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup3,
|
||||
this.tabbedControlGroup1,
|
||||
this.simpleSeparator1,
|
||||
this.layoutControlItem35,
|
||||
this.layoutControlItem36,
|
||||
this.layoutControlItem2,
|
||||
this.layoutControlItem14,
|
||||
this.emptySpaceItem2,
|
||||
this.emptySpaceItem3});
|
||||
this.layoutControlGroup5.Location = new System.Drawing.Point(491, 0);
|
||||
this.simpleSeparator1});
|
||||
this.layoutControlGroup5.Location = new System.Drawing.Point(305, 0);
|
||||
this.layoutControlGroup5.Name = "layoutControlGroup5";
|
||||
this.layoutControlGroup5.Size = new System.Drawing.Size(1463, 993);
|
||||
this.layoutControlGroup5.Size = new System.Drawing.Size(1649, 993);
|
||||
this.layoutControlGroup5.Text = "出库单复核";
|
||||
this.layoutControlGroup5.TextVisible = false;
|
||||
//
|
||||
|
|
@ -507,21 +505,20 @@
|
|||
this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup12,
|
||||
this.simpleSeparator3,
|
||||
this.layoutControlGroup11});
|
||||
this.emptySpaceItem3});
|
||||
this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup3.Name = "layoutControlGroup3";
|
||||
this.layoutControlGroup3.Size = new System.Drawing.Size(1425, 61);
|
||||
this.layoutControlGroup3.Size = new System.Drawing.Size(1611, 163);
|
||||
this.layoutControlGroup3.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup12
|
||||
//
|
||||
this.layoutControlGroup12.GroupBordersVisible = false;
|
||||
this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem7,
|
||||
this.layoutControlItem17});
|
||||
this.layoutControlGroup6});
|
||||
this.layoutControlGroup12.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup12.Name = "layoutControlGroup12";
|
||||
this.layoutControlGroup12.Size = new System.Drawing.Size(1372, 58);
|
||||
this.layoutControlGroup12.Size = new System.Drawing.Size(1347, 160);
|
||||
this.layoutControlGroup12.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem7
|
||||
|
|
@ -545,11 +542,11 @@
|
|||
this.layoutControlItem17.AppearanceItemCaption.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.layoutControlItem17.AppearanceItemCaption.Options.UseFont = true;
|
||||
this.layoutControlItem17.Control = this.lbCustmer;
|
||||
this.layoutControlItem17.Location = new System.Drawing.Point(476, 0);
|
||||
this.layoutControlItem17.Location = new System.Drawing.Point(0, 58);
|
||||
this.layoutControlItem17.MinSize = new System.Drawing.Size(42, 34);
|
||||
this.layoutControlItem17.Name = "layoutControlItem17";
|
||||
this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 2, 2);
|
||||
this.layoutControlItem17.Size = new System.Drawing.Size(896, 58);
|
||||
this.layoutControlItem17.Size = new System.Drawing.Size(757, 64);
|
||||
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem17.Text = "客户";
|
||||
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
|
||||
|
|
@ -558,35 +555,17 @@
|
|||
// simpleSeparator3
|
||||
//
|
||||
this.simpleSeparator3.AllowHotTrack = false;
|
||||
this.simpleSeparator3.Location = new System.Drawing.Point(0, 58);
|
||||
this.simpleSeparator3.Location = new System.Drawing.Point(0, 160);
|
||||
this.simpleSeparator3.Name = "simpleSeparator3";
|
||||
this.simpleSeparator3.Size = new System.Drawing.Size(1425, 3);
|
||||
//
|
||||
// layoutControlGroup11
|
||||
//
|
||||
this.layoutControlGroup11.GroupBordersVisible = false;
|
||||
this.layoutControlGroup11.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.emptySpaceItem1});
|
||||
this.layoutControlGroup11.Location = new System.Drawing.Point(1372, 0);
|
||||
this.layoutControlGroup11.Name = "layoutControlGroup11";
|
||||
this.layoutControlGroup11.Size = new System.Drawing.Size(53, 58);
|
||||
this.layoutControlGroup11.Text = "打包信息";
|
||||
//
|
||||
// emptySpaceItem1
|
||||
//
|
||||
this.emptySpaceItem1.AllowHotTrack = false;
|
||||
this.emptySpaceItem1.Location = new System.Drawing.Point(0, 0);
|
||||
this.emptySpaceItem1.Name = "emptySpaceItem1";
|
||||
this.emptySpaceItem1.Size = new System.Drawing.Size(53, 58);
|
||||
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.simpleSeparator3.Size = new System.Drawing.Size(1611, 3);
|
||||
//
|
||||
// tabbedControlGroup1
|
||||
//
|
||||
this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 145);
|
||||
this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 166);
|
||||
this.tabbedControlGroup1.Name = "tabbedControlGroup1";
|
||||
this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup7;
|
||||
this.tabbedControlGroup1.SelectedTabPageIndex = 0;
|
||||
this.tabbedControlGroup1.Size = new System.Drawing.Size(1425, 810);
|
||||
this.tabbedControlGroup1.Size = new System.Drawing.Size(1611, 789);
|
||||
this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlGroup7,
|
||||
this.lgOutPickDetail});
|
||||
|
|
@ -597,7 +576,7 @@
|
|||
this.layoutControlItem5});
|
||||
this.layoutControlGroup7.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup7.Name = "layoutControlGroup7";
|
||||
this.layoutControlGroup7.Size = new System.Drawing.Size(1386, 736);
|
||||
this.layoutControlGroup7.Size = new System.Drawing.Size(1572, 715);
|
||||
this.layoutControlGroup7.Text = "商品列表";
|
||||
//
|
||||
// layoutControlItem5
|
||||
|
|
@ -606,7 +585,7 @@
|
|||
this.layoutControlItem5.CustomizationFormText = "波次整库明细";
|
||||
this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem5.Name = "layoutControlItem5";
|
||||
this.layoutControlItem5.Size = new System.Drawing.Size(1386, 736);
|
||||
this.layoutControlItem5.Size = new System.Drawing.Size(1572, 715);
|
||||
this.layoutControlItem5.Text = " 波次零库明细";
|
||||
this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
|
||||
|
|
@ -619,7 +598,7 @@
|
|||
this.layoutControlItem10});
|
||||
this.lgOutPickDetail.Location = new System.Drawing.Point(0, 0);
|
||||
this.lgOutPickDetail.Name = "lgOutPickDetail";
|
||||
this.lgOutPickDetail.Size = new System.Drawing.Size(1386, 736);
|
||||
this.lgOutPickDetail.Size = new System.Drawing.Size(1572, 715);
|
||||
this.lgOutPickDetail.Text = "原始订单信息";
|
||||
this.lgOutPickDetail.CustomButtonUnchecked += new DevExpress.XtraBars.Docking2010.BaseButtonEventHandler(this.lgOutPickDetail_CustomButtonUnchecked);
|
||||
this.lgOutPickDetail.CustomButtonChecked += new DevExpress.XtraBars.Docking2010.BaseButtonEventHandler(this.lgOutPickDetail_CustomButtonChecked);
|
||||
|
|
@ -630,7 +609,7 @@
|
|||
this.layoutControlItem10.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem10.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.layoutControlItem10.Name = "layoutControlItem10";
|
||||
this.layoutControlItem10.Size = new System.Drawing.Size(1386, 736);
|
||||
this.layoutControlItem10.Size = new System.Drawing.Size(1572, 715);
|
||||
this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem10.Text = "原始订单信息";
|
||||
this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
|
|
@ -640,18 +619,18 @@
|
|||
// simpleSeparator1
|
||||
//
|
||||
this.simpleSeparator1.AllowHotTrack = false;
|
||||
this.simpleSeparator1.Location = new System.Drawing.Point(0, 142);
|
||||
this.simpleSeparator1.Location = new System.Drawing.Point(0, 163);
|
||||
this.simpleSeparator1.Name = "simpleSeparator1";
|
||||
this.simpleSeparator1.Size = new System.Drawing.Size(1425, 3);
|
||||
this.simpleSeparator1.Size = new System.Drawing.Size(1611, 3);
|
||||
//
|
||||
// layoutControlItem35
|
||||
//
|
||||
this.layoutControlItem35.Control = this.spinBulkBox;
|
||||
this.layoutControlItem35.Location = new System.Drawing.Point(480, 61);
|
||||
this.layoutControlItem35.Location = new System.Drawing.Point(757, 0);
|
||||
this.layoutControlItem35.MaxSize = new System.Drawing.Size(102, 0);
|
||||
this.layoutControlItem35.MinSize = new System.Drawing.Size(102, 81);
|
||||
this.layoutControlItem35.Name = "layoutControlItem35";
|
||||
this.layoutControlItem35.Size = new System.Drawing.Size(102, 81);
|
||||
this.layoutControlItem35.Size = new System.Drawing.Size(102, 122);
|
||||
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem35.Text = "拼箱";
|
||||
this.layoutControlItem35.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
|
|
@ -661,11 +640,11 @@
|
|||
//
|
||||
this.layoutControlItem36.Control = this.spinBulkBag;
|
||||
this.layoutControlItem36.CustomizationFormText = "拼箱";
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(582, 61);
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(859, 0);
|
||||
this.layoutControlItem36.MaxSize = new System.Drawing.Size(96, 0);
|
||||
this.layoutControlItem36.MinSize = new System.Drawing.Size(96, 81);
|
||||
this.layoutControlItem36.Name = "layoutControlItem36";
|
||||
this.layoutControlItem36.Size = new System.Drawing.Size(96, 81);
|
||||
this.layoutControlItem36.Size = new System.Drawing.Size(96, 122);
|
||||
this.layoutControlItem36.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem36.Text = "拼袋";
|
||||
this.layoutControlItem36.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
|
|
@ -674,10 +653,11 @@
|
|||
// layoutControlItem2
|
||||
//
|
||||
this.layoutControlItem2.Control = this.btnOk;
|
||||
this.layoutControlItem2.Location = new System.Drawing.Point(678, 61);
|
||||
this.layoutControlItem2.MinSize = new System.Drawing.Size(124, 46);
|
||||
this.layoutControlItem2.Location = new System.Drawing.Point(955, 0);
|
||||
this.layoutControlItem2.MaxSize = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem2.MinSize = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem2.Name = "layoutControlItem2";
|
||||
this.layoutControlItem2.Size = new System.Drawing.Size(124, 81);
|
||||
this.layoutControlItem2.Size = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem2.TextVisible = false;
|
||||
|
|
@ -685,33 +665,15 @@
|
|||
// layoutControlItem14
|
||||
//
|
||||
this.layoutControlItem14.Control = this.btnPrint;
|
||||
this.layoutControlItem14.Location = new System.Drawing.Point(802, 61);
|
||||
this.layoutControlItem14.MinSize = new System.Drawing.Size(124, 46);
|
||||
this.layoutControlItem14.Location = new System.Drawing.Point(1127, 0);
|
||||
this.layoutControlItem14.MaxSize = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem14.MinSize = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem14.Name = "layoutControlItem14";
|
||||
this.layoutControlItem14.Size = new System.Drawing.Size(124, 81);
|
||||
this.layoutControlItem14.Size = new System.Drawing.Size(172, 122);
|
||||
this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem14.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem2
|
||||
//
|
||||
this.emptySpaceItem2.AllowHotTrack = false;
|
||||
this.emptySpaceItem2.Location = new System.Drawing.Point(926, 61);
|
||||
this.emptySpaceItem2.Name = "emptySpaceItem2";
|
||||
this.emptySpaceItem2.Size = new System.Drawing.Size(499, 81);
|
||||
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem3
|
||||
//
|
||||
this.emptySpaceItem3.AllowHotTrack = false;
|
||||
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 61);
|
||||
this.emptySpaceItem3.MaxSize = new System.Drawing.Size(480, 69);
|
||||
this.emptySpaceItem3.MinSize = new System.Drawing.Size(480, 69);
|
||||
this.emptySpaceItem3.Name = "emptySpaceItem3";
|
||||
this.emptySpaceItem3.Size = new System.Drawing.Size(480, 81);
|
||||
this.emptySpaceItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup2
|
||||
//
|
||||
this.layoutControlGroup2.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
|
||||
|
|
@ -727,7 +689,7 @@
|
|||
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup2.Name = "layoutControlGroup2";
|
||||
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 9, 9);
|
||||
this.layoutControlGroup2.Size = new System.Drawing.Size(491, 993);
|
||||
this.layoutControlGroup2.Size = new System.Drawing.Size(305, 993);
|
||||
this.layoutControlGroup2.Text = "数据更新";
|
||||
this.layoutControlGroup2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
|
||||
//
|
||||
|
|
@ -803,7 +765,7 @@
|
|||
this.emptySpaceItem6.AllowHotTrack = false;
|
||||
this.emptySpaceItem6.Location = new System.Drawing.Point(275, 0);
|
||||
this.emptySpaceItem6.Name = "emptySpaceItem6";
|
||||
this.emptySpaceItem6.Size = new System.Drawing.Size(196, 63);
|
||||
this.emptySpaceItem6.Size = new System.Drawing.Size(10, 63);
|
||||
this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup4
|
||||
|
|
@ -815,7 +777,7 @@
|
|||
this.splitterItem1});
|
||||
this.layoutControlGroup4.Location = new System.Drawing.Point(0, 63);
|
||||
this.layoutControlGroup4.Name = "layoutControlGroup4";
|
||||
this.layoutControlGroup4.Size = new System.Drawing.Size(471, 872);
|
||||
this.layoutControlGroup4.Size = new System.Drawing.Size(285, 872);
|
||||
this.layoutControlGroup4.Text = "分拣单列表";
|
||||
//
|
||||
// layoutControlItem18
|
||||
|
|
@ -824,7 +786,7 @@
|
|||
this.layoutControlItem18.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem18.MinSize = new System.Drawing.Size(104, 24);
|
||||
this.layoutControlItem18.Name = "layoutControlItem18";
|
||||
this.layoutControlItem18.Size = new System.Drawing.Size(425, 804);
|
||||
this.layoutControlItem18.Size = new System.Drawing.Size(239, 804);
|
||||
this.layoutControlItem18.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.layoutControlItem18.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
|
||||
|
|
@ -833,7 +795,7 @@
|
|||
// splitterItem1
|
||||
//
|
||||
this.splitterItem1.AllowHotTrack = true;
|
||||
this.splitterItem1.Location = new System.Drawing.Point(425, 0);
|
||||
this.splitterItem1.Location = new System.Drawing.Point(239, 0);
|
||||
this.splitterItem1.Name = "splitterItem1";
|
||||
this.splitterItem1.Size = new System.Drawing.Size(8, 804);
|
||||
//
|
||||
|
|
@ -864,6 +826,50 @@
|
|||
//
|
||||
this.openFileDialog1.FileName = "openFileDialog1";
|
||||
//
|
||||
// emptySpaceItem3
|
||||
//
|
||||
this.emptySpaceItem3.AllowHotTrack = false;
|
||||
this.emptySpaceItem3.Location = new System.Drawing.Point(1347, 0);
|
||||
this.emptySpaceItem3.Name = "emptySpaceItem3";
|
||||
this.emptySpaceItem3.Size = new System.Drawing.Size(264, 160);
|
||||
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlGroup6
|
||||
//
|
||||
this.layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem7,
|
||||
this.layoutControlItem17,
|
||||
this.emptySpaceItem1,
|
||||
this.emptySpaceItem2,
|
||||
this.layoutControlItem35,
|
||||
this.layoutControlItem36,
|
||||
this.layoutControlItem2,
|
||||
this.layoutControlItem14});
|
||||
this.layoutControlGroup6.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup6.Name = "layoutControlGroup6";
|
||||
this.layoutControlGroup6.OptionsItemText.TextToControlDistance = 5;
|
||||
this.layoutControlGroup6.Size = new System.Drawing.Size(1347, 160);
|
||||
this.layoutControlGroup6.TextVisible = false;
|
||||
//
|
||||
// emptySpaceItem1
|
||||
//
|
||||
this.emptySpaceItem1.AllowHotTrack = false;
|
||||
this.emptySpaceItem1.Location = new System.Drawing.Point(476, 0);
|
||||
this.emptySpaceItem1.MaxSize = new System.Drawing.Size(281, 58);
|
||||
this.emptySpaceItem1.MinSize = new System.Drawing.Size(281, 58);
|
||||
this.emptySpaceItem1.Name = "emptySpaceItem1";
|
||||
this.emptySpaceItem1.Size = new System.Drawing.Size(281, 58);
|
||||
this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem2
|
||||
//
|
||||
this.emptySpaceItem2.AllowHotTrack = false;
|
||||
this.emptySpaceItem2.Location = new System.Drawing.Point(1299, 0);
|
||||
this.emptySpaceItem2.Name = "emptySpaceItem2";
|
||||
this.emptySpaceItem2.Size = new System.Drawing.Size(10, 122);
|
||||
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// GoodsOutSeedsPackForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
|
||||
|
|
@ -900,8 +906,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.simpleSeparator3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
|
||||
|
|
@ -912,8 +916,6 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
|
||||
|
|
@ -926,6 +928,10 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -971,7 +977,6 @@
|
|||
private DevExpress.XtraLayout.LayoutControlGroup lgOutPickDetail;
|
||||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
|
||||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
|
||||
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup11;
|
||||
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup12;
|
||||
private System.Windows.Forms.OpenFileDialog openFileDialog1;
|
||||
private DevExpress.XtraLayout.SimpleSeparator simpleSeparator3;
|
||||
|
|
@ -989,8 +994,9 @@
|
|||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
|
||||
private DevExpress.XtraEditors.SimpleButton btnOk;
|
||||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
|
||||
private DevExpress.XtraLayout.SimpleSeparator simpleSeparator1;
|
||||
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup6;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1296,6 +1296,7 @@ namespace DeiNiu.wms.win
|
|||
completeThread.Start();
|
||||
//remove the order from pickorder list
|
||||
clearDetails();
|
||||
return;
|
||||
if (dtPickOrders.Rows.Count < 2)
|
||||
{
|
||||
showWaitForm();
|
||||
|
|
|
|||
|
|
@ -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>275, 17</value>
|
||||
<value>274, 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">
|
||||
|
|
@ -259,10 +259,10 @@
|
|||
</value>
|
||||
</data>
|
||||
<metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>542, 17</value>
|
||||
<value>539, 17</value>
|
||||
</metadata>
|
||||
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>771, 17</value>
|
||||
<value>768, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>73</value>
|
||||
|
|
|
|||
|
|
@ -88,6 +88,8 @@
|
|||
this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
|
||||
this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -110,13 +112,10 @@
|
|||
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.lcgSKUGroup = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.emptySpaceItem11 = new DevExpress.XtraLayout.EmptySpaceItem();
|
||||
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.lgOutPickDetail = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup();
|
||||
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
|
||||
|
|
@ -196,6 +195,8 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
|
||||
|
|
@ -218,13 +219,10 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.lcgSKUGroup)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.lgOutPickDetail)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
|
||||
|
|
@ -351,7 +349,7 @@
|
|||
//
|
||||
this.btnOk.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
|
||||
this.btnOk.ImageUri.Uri = "Apply";
|
||||
this.btnOk.Location = new System.Drawing.Point(1207, 103);
|
||||
this.btnOk.Location = new System.Drawing.Point(1161, 103);
|
||||
this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnOk.Name = "btnOk";
|
||||
this.btnOk.Size = new System.Drawing.Size(118, 55);
|
||||
|
|
@ -531,7 +529,7 @@
|
|||
//
|
||||
this.btnPrint.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
|
||||
this.btnPrint.ImageUri.Uri = "Print";
|
||||
this.btnPrint.Location = new System.Drawing.Point(1341, 103);
|
||||
this.btnPrint.Location = new System.Drawing.Point(1295, 103);
|
||||
this.btnPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnPrint.Name = "btnPrint";
|
||||
this.btnPrint.Size = new System.Drawing.Size(118, 55);
|
||||
|
|
@ -774,7 +772,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBox.Location = new System.Drawing.Point(1071, 128);
|
||||
this.spinBulkBox.Location = new System.Drawing.Point(1025, 128);
|
||||
this.spinBulkBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.spinBulkBox.MenuManager = this.ribbon;
|
||||
this.spinBulkBox.Name = "spinBulkBox";
|
||||
|
|
@ -800,7 +798,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.spinBulkBag.Location = new System.Drawing.Point(1139, 128);
|
||||
this.spinBulkBag.Location = new System.Drawing.Point(1093, 128);
|
||||
this.spinBulkBag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.spinBulkBag.Name = "spinBulkBag";
|
||||
this.spinBulkBag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
|
||||
|
|
@ -898,14 +896,14 @@
|
|||
//
|
||||
// swStatus
|
||||
//
|
||||
this.swStatus.EditValue = true;
|
||||
this.swStatus.Location = new System.Drawing.Point(191, 56);
|
||||
this.swStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.swStatus.Name = "swStatus";
|
||||
this.swStatus.Properties.AutoHeight = false;
|
||||
this.swStatus.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
|
||||
this.swStatus.Properties.OffText = "Off";
|
||||
this.swStatus.Properties.OnText = "On";
|
||||
this.swStatus.Properties.ShowText = false;
|
||||
this.swStatus.Properties.OffText = "忙";
|
||||
this.swStatus.Properties.OnText = "闲";
|
||||
this.swStatus.ShowToolTips = false;
|
||||
this.swStatus.Size = new System.Drawing.Size(170, 34);
|
||||
this.swStatus.StyleController = this.layoutControl1;
|
||||
|
|
@ -1013,6 +1011,26 @@
|
|||
this.lgOutPickDetail,
|
||||
this.layoutControlGroup13});
|
||||
//
|
||||
// layoutControlGroup13
|
||||
//
|
||||
this.layoutControlGroup13.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem33});
|
||||
this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup13.Name = "layoutControlGroup13";
|
||||
this.layoutControlGroup13.Size = new System.Drawing.Size(1529, 424);
|
||||
this.layoutControlGroup13.Text = "拣货明细";
|
||||
//
|
||||
// layoutControlItem33
|
||||
//
|
||||
this.layoutControlItem33.Control = this.gridPickDetails;
|
||||
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem33.Name = "layoutControlItem33";
|
||||
this.layoutControlItem33.Size = new System.Drawing.Size(1529, 424);
|
||||
this.layoutControlItem33.Text = "拣货明细";
|
||||
this.layoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem33.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup9
|
||||
//
|
||||
this.layoutControlGroup9.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F);
|
||||
|
|
@ -1030,7 +1048,6 @@
|
|||
this.layoutControlGroup15,
|
||||
this.layoutControlItem30,
|
||||
this.lcgSKUGroup,
|
||||
this.emptySpaceItem5,
|
||||
this.emptySpaceItem11,
|
||||
this.layoutControlItem31});
|
||||
this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0);
|
||||
|
|
@ -1296,20 +1313,12 @@
|
|||
this.emptySpaceItem4.Size = new System.Drawing.Size(943, 40);
|
||||
this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem5
|
||||
//
|
||||
this.emptySpaceItem5.AllowHotTrack = false;
|
||||
this.emptySpaceItem5.Location = new System.Drawing.Point(981, 0);
|
||||
this.emptySpaceItem5.Name = "emptySpaceItem5";
|
||||
this.emptySpaceItem5.Size = new System.Drawing.Size(124, 424);
|
||||
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem11
|
||||
//
|
||||
this.emptySpaceItem11.AllowHotTrack = false;
|
||||
this.emptySpaceItem11.Location = new System.Drawing.Point(1105, 0);
|
||||
this.emptySpaceItem11.Location = new System.Drawing.Point(981, 0);
|
||||
this.emptySpaceItem11.Name = "emptySpaceItem11";
|
||||
this.emptySpaceItem11.Size = new System.Drawing.Size(424, 424);
|
||||
this.emptySpaceItem11.Size = new System.Drawing.Size(548, 424);
|
||||
this.emptySpaceItem11.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// layoutControlItem31
|
||||
|
|
@ -1348,26 +1357,6 @@
|
|||
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem10.TextVisible = false;
|
||||
//
|
||||
// layoutControlGroup13
|
||||
//
|
||||
this.layoutControlGroup13.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
||||
this.layoutControlItem33});
|
||||
this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlGroup13.Name = "layoutControlGroup13";
|
||||
this.layoutControlGroup13.Size = new System.Drawing.Size(1529, 424);
|
||||
this.layoutControlGroup13.Text = "拣货明细";
|
||||
//
|
||||
// layoutControlItem33
|
||||
//
|
||||
this.layoutControlItem33.Control = this.gridPickDetails;
|
||||
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
|
||||
this.layoutControlItem33.Name = "layoutControlItem33";
|
||||
this.layoutControlItem33.Size = new System.Drawing.Size(1529, 424);
|
||||
this.layoutControlItem33.Text = "拣货明细";
|
||||
this.layoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top;
|
||||
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
|
||||
this.layoutControlItem33.TextVisible = false;
|
||||
//
|
||||
// layoutControlItem7
|
||||
//
|
||||
this.layoutControlItem7.Control = this.textEditBarcode;
|
||||
|
|
@ -1384,7 +1373,7 @@
|
|||
// layoutControlItem35
|
||||
//
|
||||
this.layoutControlItem35.Control = this.spinBulkBox;
|
||||
this.layoutControlItem35.Location = new System.Drawing.Point(658, 51);
|
||||
this.layoutControlItem35.Location = new System.Drawing.Point(612, 51);
|
||||
this.layoutControlItem35.MaxSize = new System.Drawing.Size(68, 61);
|
||||
this.layoutControlItem35.MinSize = new System.Drawing.Size(68, 61);
|
||||
this.layoutControlItem35.Name = "layoutControlItem35";
|
||||
|
|
@ -1398,7 +1387,7 @@
|
|||
//
|
||||
this.layoutControlItem36.Control = this.spinBulkBag;
|
||||
this.layoutControlItem36.CustomizationFormText = "拼箱";
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(726, 51);
|
||||
this.layoutControlItem36.Location = new System.Drawing.Point(680, 51);
|
||||
this.layoutControlItem36.MaxSize = new System.Drawing.Size(68, 61);
|
||||
this.layoutControlItem36.MinSize = new System.Drawing.Size(68, 61);
|
||||
this.layoutControlItem36.Name = "layoutControlItem36";
|
||||
|
|
@ -1411,7 +1400,7 @@
|
|||
// layoutControlItem32
|
||||
//
|
||||
this.layoutControlItem32.Control = this.btnOk;
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(794, 51);
|
||||
this.layoutControlItem32.Location = new System.Drawing.Point(748, 51);
|
||||
this.layoutControlItem32.MaxSize = new System.Drawing.Size(124, 61);
|
||||
this.layoutControlItem32.MinSize = new System.Drawing.Size(124, 61);
|
||||
this.layoutControlItem32.Name = "layoutControlItem32";
|
||||
|
|
@ -1423,7 +1412,7 @@
|
|||
// emptySpaceItem12
|
||||
//
|
||||
this.emptySpaceItem12.AllowHotTrack = false;
|
||||
this.emptySpaceItem12.Location = new System.Drawing.Point(918, 51);
|
||||
this.emptySpaceItem12.Location = new System.Drawing.Point(872, 51);
|
||||
this.emptySpaceItem12.MaxSize = new System.Drawing.Size(10, 51);
|
||||
this.emptySpaceItem12.MinSize = new System.Drawing.Size(10, 51);
|
||||
this.emptySpaceItem12.Name = "emptySpaceItem12";
|
||||
|
|
@ -1434,7 +1423,7 @@
|
|||
// layoutControlItem14
|
||||
//
|
||||
this.layoutControlItem14.Control = this.btnPrint;
|
||||
this.layoutControlItem14.Location = new System.Drawing.Point(928, 51);
|
||||
this.layoutControlItem14.Location = new System.Drawing.Point(882, 51);
|
||||
this.layoutControlItem14.MaxSize = new System.Drawing.Size(124, 61);
|
||||
this.layoutControlItem14.MinSize = new System.Drawing.Size(124, 61);
|
||||
this.layoutControlItem14.Name = "layoutControlItem14";
|
||||
|
|
@ -1458,16 +1447,21 @@
|
|||
//
|
||||
this.emptySpaceItem3.AllowHotTrack = false;
|
||||
this.emptySpaceItem3.Location = new System.Drawing.Point(506, 51);
|
||||
this.emptySpaceItem3.MaxSize = new System.Drawing.Size(106, 61);
|
||||
this.emptySpaceItem3.MinSize = new System.Drawing.Size(106, 61);
|
||||
this.emptySpaceItem3.Name = "emptySpaceItem3";
|
||||
this.emptySpaceItem3.Size = new System.Drawing.Size(152, 61);
|
||||
this.emptySpaceItem3.Size = new System.Drawing.Size(106, 61);
|
||||
this.emptySpaceItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// emptySpaceItem9
|
||||
//
|
||||
this.emptySpaceItem9.AllowHotTrack = false;
|
||||
this.emptySpaceItem9.Location = new System.Drawing.Point(1052, 51);
|
||||
this.emptySpaceItem9.Location = new System.Drawing.Point(1006, 51);
|
||||
this.emptySpaceItem9.MinSize = new System.Drawing.Size(106, 26);
|
||||
this.emptySpaceItem9.Name = "emptySpaceItem9";
|
||||
this.emptySpaceItem9.Size = new System.Drawing.Size(516, 64);
|
||||
this.emptySpaceItem9.Size = new System.Drawing.Size(562, 64);
|
||||
this.emptySpaceItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
|
||||
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
|
||||
//
|
||||
// simpleSeparator2
|
||||
|
|
@ -1475,7 +1469,7 @@
|
|||
this.simpleSeparator2.AllowHotTrack = false;
|
||||
this.simpleSeparator2.Location = new System.Drawing.Point(0, 112);
|
||||
this.simpleSeparator2.Name = "simpleSeparator2";
|
||||
this.simpleSeparator2.Size = new System.Drawing.Size(1052, 3);
|
||||
this.simpleSeparator2.Size = new System.Drawing.Size(1006, 3);
|
||||
//
|
||||
// simpleSeparator4
|
||||
//
|
||||
|
|
@ -1840,6 +1834,8 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
|
||||
|
|
@ -1862,13 +1858,10 @@
|
|||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.lcgSKUGroup)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem11)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.lgOutPickDetail)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
|
||||
|
|
@ -2024,7 +2017,6 @@
|
|||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
|
||||
private DevExpress.XtraLayout.SplitterItem splitterItem2;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem5;
|
||||
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem11;
|
||||
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
|
||||
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ namespace DeiNiu.wms.win
|
|||
// GridColumn myCol11 = new GridColumn() { Caption = "大整", Visible = true, FieldName = WmsGoods.fields.batchMax2.ToString() };
|
||||
GridColumn myCol12 = new GridColumn() { Caption = "国药准字", Visible = true, FieldName = WmsGoods.exfields.regeditCode.ToString() };
|
||||
|
||||
GridColumn myCol100 = new GridColumn() { Caption = "数量", Visible = true, FieldName ="pdaOuting"};// WmsOutDetail.fields.count.ToString() };
|
||||
GridColumn myCol100 = new GridColumn() { Caption = "数量", Visible = true, FieldName ="count"};// WmsOutDetail.fields.count.ToString() };
|
||||
// GridColumn myCol101 = new GridColumn() { Caption = "零货", Visible = true, FieldName = WmsOutDetail.fields.count.ToString() };
|
||||
// GridColumn myCol102 = new GridColumn() { Caption = "整货", Visible = true, FieldName = WmsOutDetail.fields.batch1Count.ToString() };
|
||||
// GridColumn myCol103 = new GridColumn() { Caption = "大整", Visible = true, FieldName = WmsOutDetail.fields.batch2Count.ToString() };
|
||||
|
|
@ -478,7 +478,10 @@ namespace DeiNiu.wms.win
|
|||
|
||||
GridColumn myCol17 = new GridColumn() { Caption = "状态", Visible = true, FieldName = WmsOutDetail.fields.state.ToString() };
|
||||
GridColumn myCol18 = new GridColumn() { Caption = "说明", Visible = true, FieldName = WmsOutDetail.fields.description.ToString() };
|
||||
GridColumn myCol19 = new GridColumn() { Caption = "分拣状态", Visible = true, FieldName = "pickState" };
|
||||
// GridColumn myCol19 = new GridColumn() { Caption = "分拣状态", Visible = true, FieldName = "pickState" };
|
||||
GridColumn myCol19 = new GridColumn() { Caption = "分拣状态", Visible = true, FieldName = "state" };
|
||||
GridColumn myCol191 = new GridColumn() { Caption = "分拣人", Visible = true, FieldName = "操作人" };
|
||||
GridColumn myCol192 = new GridColumn() { Caption = "分拣时间", Visible = true, FieldName = "pickTime" };
|
||||
|
||||
GridColumn myCol20 = new GridColumn() { Caption = "波次", Visible = true, FieldName = WmsOutPickLable.fields.dpsOrder.ToString() };
|
||||
GridColumn myCol21 = new GridColumn() { Caption = "颜色", Visible = true, FieldName = WmsOutPickLable.fields.color.ToString() };
|
||||
|
|
@ -520,30 +523,32 @@ namespace DeiNiu.wms.win
|
|||
// gridview.Columns.Add(myCol131);
|
||||
// gridview.Columns.Add(myCol132);
|
||||
gridview.Columns.Add(myCol23);
|
||||
// gridview.Columns.Add(myCol133);
|
||||
/*
|
||||
gridview.Columns.Add(myCol5);
|
||||
gridview.Columns.Add(myCol17);
|
||||
gridview.Columns.Add(myCol24);
|
||||
gridview.Columns.Add(myCol191);
|
||||
gridview.Columns.Add(myCol192);
|
||||
// gridview.Columns.Add(myCol133);
|
||||
/*
|
||||
gridview.Columns.Add(myCol5);
|
||||
gridview.Columns.Add(myCol17);
|
||||
gridview.Columns.Add(myCol24);
|
||||
|
||||
gridview.Columns.Add(myCol7);
|
||||
gridview.Columns.Add(myCol7);
|
||||
|
||||
|
||||
gridview.Columns.Add(myCol3);
|
||||
|
||||
gridview.Columns.Add(myCol15);
|
||||
gridview.Columns.Add(myCol16);
|
||||
gridview.Columns.Add(myCol3);
|
||||
gridview.Columns.Add(myCol8);
|
||||
//gridview.Columns.Add(myCol9);
|
||||
gridview.Columns.Add(myCol2);
|
||||
// gridview.Columns.Add(myCol6);
|
||||
gridview.Columns.Add(myCol4);
|
||||
gridview.Columns.Add(myCol12);
|
||||
gridview.Columns.Add(myCol1);
|
||||
gridview.Columns.Add(myCol18);
|
||||
gridview.Columns.Add(myCol3);
|
||||
|
||||
*/
|
||||
gridview.Columns.Add(myCol15);
|
||||
gridview.Columns.Add(myCol16);
|
||||
gridview.Columns.Add(myCol3);
|
||||
gridview.Columns.Add(myCol8);
|
||||
//gridview.Columns.Add(myCol9);
|
||||
gridview.Columns.Add(myCol2);
|
||||
// gridview.Columns.Add(myCol6);
|
||||
gridview.Columns.Add(myCol4);
|
||||
gridview.Columns.Add(myCol12);
|
||||
gridview.Columns.Add(myCol1);
|
||||
gridview.Columns.Add(myCol18);
|
||||
|
||||
*/
|
||||
|
||||
//to show bottom scroll bar
|
||||
gridview.OptionsView.ColumnAutoWidth = false;
|
||||
|
|
@ -1072,6 +1077,8 @@ namespace DeiNiu.wms.win
|
|||
lbCustmer.Text = currentPickOrder;
|
||||
lbCustmer.Text = currentRow["customerName"].ToString();
|
||||
currentWave = currentRow["dpsOrder"].ToString();
|
||||
spinBulkBox.Text = currentRow["bulkBox"].ToString();
|
||||
spinBulkBag.Text = currentRow["bulkBag"].ToString();
|
||||
return true;
|
||||
|
||||
}
|
||||
|
|
@ -1170,7 +1177,7 @@ namespace DeiNiu.wms.win
|
|||
gridViewValidated.RowCellStyle += gridView_RowCellStyle;
|
||||
//gridView1.RowCellStyle += gridView_RowCellStyle;
|
||||
gridViewValidated.CustomColumnDisplayText += gridView2_CustomColumnDisplayText;
|
||||
gridViewPickDetails.CustomColumnDisplayText += gridView2_CustomColumnDisplayText;
|
||||
gridViewPickDetails.CustomColumnDisplayText += gridViewPickDetails_CustomColumnDisplayText;
|
||||
this.gridViewException.CustomColumnDisplayText += gridView2_CustomColumnDisplayText;
|
||||
|
||||
this.gvBox.IndicatorWidth = 40;
|
||||
|
|
@ -1178,9 +1185,36 @@ namespace DeiNiu.wms.win
|
|||
|
||||
}
|
||||
|
||||
private void gridViewPickDetails_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
|
||||
{
|
||||
if (e.Column.FieldName == WmsOutPickDetail.fields.state.ToString())
|
||||
{
|
||||
if (!pickOrNot.ContainsValue(e.DisplayText))
|
||||
{
|
||||
|
||||
int display = -100;
|
||||
string disTxt = e.DisplayText;
|
||||
|
||||
try
|
||||
{
|
||||
display = Convert.ToInt16(e.DisplayText);
|
||||
|
||||
e.DisplayText = pickOrNot[display];
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
// e.DisplayText = pickOrNot.ContainsKey(display) ? pickOrNot[display] : display+"";
|
||||
}
|
||||
else if (e.Column.FieldName == "pickTime")
|
||||
{
|
||||
e.Column.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
|
||||
}
|
||||
|
||||
}
|
||||
private void gridView2_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
|
||||
{
|
||||
//if (sender == gridViewValidated)
|
||||
|
|
@ -2138,21 +2172,24 @@ namespace DeiNiu.wms.win
|
|||
|
||||
private void btnPrint_Click(object sender, EventArgs e)
|
||||
{
|
||||
printCodes();
|
||||
printCodes(currentPickOrder);
|
||||
}
|
||||
|
||||
printIn reqportPrint = new printIn();
|
||||
void completeValidation()
|
||||
{
|
||||
try
|
||||
{
|
||||
// pickClient.completeBulkValidation(tmpOrder,boxcnt, bagcnt, dtPickOrdersValidated);
|
||||
{
|
||||
|
||||
|
||||
|
||||
// pickClient.completeBulkValidation(tmpOrder,boxcnt, bagcnt, dtPickOrdersValidated);
|
||||
pickClient.completeBulkValidation(tmpOrder, boxcnt, bagcnt);
|
||||
pickClient.Close();
|
||||
|
||||
//TODO: print bulk boxs\bags label
|
||||
//t_tmsStock
|
||||
printCodes();
|
||||
printCodes(tmpOrder);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
@ -2165,24 +2202,26 @@ namespace DeiNiu.wms.win
|
|||
// currentPickOrder = null;
|
||||
}
|
||||
|
||||
private void printCodes()
|
||||
private void printCodes(string pickOrderNo)
|
||||
{
|
||||
try
|
||||
{
|
||||
boxcnt = Convert.ToInt32(spinBulkBox.Value);
|
||||
bagcnt = Convert.ToInt32(spinBulkBag.Value);
|
||||
|
||||
|
||||
if (boxcnt + bagcnt == 0)
|
||||
{
|
||||
// showErrorMsg("请设置零货拼箱、拼袋数量");
|
||||
// return;
|
||||
boxcnt = Convert.ToInt32(spinBulkBox.Value);
|
||||
bagcnt = Convert.ToInt32(spinBulkBag.Value);
|
||||
// showErrorMsg("请设置零货拼箱、拼袋数量");
|
||||
// return;
|
||||
}
|
||||
|
||||
tmpOrder = string.IsNullOrEmpty(tmpOrder) ? currentPickOrder : tmpOrder;
|
||||
// tmpOrder = string.IsNullOrEmpty(tmpOrder) ? currentPickOrder : tmpOrder;
|
||||
// tmpOrder="PK20210812025228";
|
||||
DataTable dt = tmsClient.getTmsStockBulkDetail(tmpOrder);
|
||||
DataTable dt = tmsClient.getTmsStockBulkDetail(pickOrderNo);
|
||||
|
||||
reqportPrint.printBulkPackingNoStore(dt, boxcnt, bagcnt);
|
||||
// tmsClient.deletTmsRec(tmpOrder);
|
||||
tmsClient.Close();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
@ -2477,12 +2516,14 @@ namespace DeiNiu.wms.win
|
|||
{
|
||||
rd2.Checked = !rd1.Checked;
|
||||
setOrderFilter();
|
||||
getValidationOrders();
|
||||
}
|
||||
|
||||
private void rd2_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
rd1.Checked = !rd2.Checked;
|
||||
setOrderFilter();
|
||||
getValidationOrders();
|
||||
}
|
||||
string filter = "orderState=" + (int)enumOutStockPickStatus.正在分拣;
|
||||
private void setOrderFilter()
|
||||
|
|
@ -2507,8 +2548,10 @@ namespace DeiNiu.wms.win
|
|||
|
||||
if (boxcnt + bagcnt == 0)
|
||||
{
|
||||
// showErrorMsg("请设置零货拼箱、拼袋数量");
|
||||
// return;
|
||||
showErrorMsg("请设置零货拼箱、拼袋数量");
|
||||
spinBulkBox.SelectAll();
|
||||
spinBulkBox.Focus();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue