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

abc

This commit is contained in:
bobwang 2024-05-11 09:51:39 +08:00
parent eb2b204016 ab1dae9d2c
commit a864bfba82
34 changed files with 1149 additions and 725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Model/wms/data/Erp_purch_Imp.cs
View File

@ -259,7 +259,13 @@ namespace DeiNiu.wms.Data.Model
case 1500: //get by vender case 1500: //get by vender
_strSql = "SELECT top 100 * FROM t_erp_purch where erp_state =@status or (wms_state>=3 and erp_state=0) order by createtime desc"; _strSql = " SELECT top 100 * FROM t_erp_purch where erp_state =@status and lastmodified + 3 > getdate()";
if (mObj.CmdParameters[1]!=null && Convert.ToBoolean(mObj.CmdParameters[1]))
{
_strSql = " SELECT top 100 * FROM t_erp_purch where ( erp_state =@status or (wms_state >= 3 and erp_state = 0) ) and createtime + 3 < getdate() ";
}
_strSql += " order by createtime desc";
sqlCmd.Parameters.AddWithValue("@status", mObj.CmdParameters[0]); sqlCmd.Parameters.AddWithValue("@status", mObj.CmdParameters[0]);
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;

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

@ -213,6 +213,7 @@ namespace DeiNiu.wms.Data.Model
_strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 " + _strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 " +
" and flowType=@flowType " + " and flowType=@flowType " +
" and (state =@state or state =@statepart) " + " and (state =@state or state =@statepart) " +
" and partion is not null " +
// " and stackState=@taskState "; // " and stackState=@taskState ";
" and stackState<@taskState "; " and stackState<@taskState ";
sqlCmd.Parameters.AddWithValue("@flowType",(int)EnumFlowTaskType.入库上架); sqlCmd.Parameters.AddWithValue("@flowType",(int)EnumFlowTaskType.入库上架);

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

@ -270,9 +270,21 @@ namespace DeiNiu.wms.Data.Model
sqlCmd.Parameters.AddWithValue("@batch", mObj.CmdParameters[2]); sqlCmd.Parameters.AddWithValue("@batch", mObj.CmdParameters[2]);
break; break;
case 1002: //by flowno and seedsNo
_strSql = "SELECT * FROM v_stockOutPort WHERE pickOrderNo=@seedsNo and flowNo = @flowNo and goodsId=@goodsId and isnull(batch,@batch )=@batch ";
LogHelper.debug(GetType(), _strSql);
sqlCmd.CommandText = _strSql;
sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[1]);
sqlCmd.Parameters.AddWithValue("@batch", mObj.CmdParameters[2]);
sqlCmd.Parameters.AddWithValue("@seedsNo", mObj.CmdParameters[3]);
break;
case 1100: //getFreeTasks case 1100: //getFreeTasks
_strSql = "SELECT * FROM [v_stockOutBatchPickDetail] a WHERE " + _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] a WHERE cast(createtime as date) = cast(getdate() as date) " +
" jobNo is not null" + " and jobNo is not null" +
" and isnull(takeBy,0) =0 "; " and isnull(takeBy,0) =0 ";
if (Convert.ToInt32(mObj.CmdParameters[4]) > 0) if (Convert.ToInt32(mObj.CmdParameters[4]) > 0)
@ -331,8 +343,8 @@ namespace DeiNiu.wms.Data.Model
case 1110: //getFreeTasks by jobNo case 1110: //getFreeTasks by jobNo
_strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] a WHERE " + _strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] a WHERE cast(createtime as date) = cast(getdate() as date) " +
" jobNo is not null" + " and jobNo is not null" +
" and elabId =0 " + " and elabId =0 " +
" and isnull(takeBy,0) =0 " + " and isnull(takeBy,0) =0 " +
" and ( isWeightSeeds=0 or isWeightSeeds =1 and partion =@partion )"; //区的任务可跨区获取，或获取指定区的任务 " and ( isWeightSeeds=0 or isWeightSeeds =1 and partion =@partion )"; //区的任务可跨区获取，或获取指定区的任务
@ -452,10 +464,11 @@ namespace DeiNiu.wms.Data.Model
case 1120: //getFreeTasks by pickorder case 1120: //getFreeTasks by pickorder
_strSql = "SELECT * FROM [v_stockOutBatchPickDetail] WHERE " + _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] WHERE " +
" jobNo is not null" + " jobNo is not null" +
" and elabId =0 " + // " and elabId =0 " +
" and isnull(takeBy,0) =0 "+ " and isnull(takeBy,0) =0 "+
" and pickorderNo =@pickorderNo "+ " and pickorderNo =@pickorderNo "+
" order by priority desc,lineId,lineorder, pickorderNo , virtialCnt, warehouse,partion,channel,shelf,col,layer,goodsid"; // " order by priority desc,lineId,lineorder, pickorderNo , virtialCnt," +
" order by warehouse,partion,channel,shelf,col,layer,goodsid";
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
// LogHelper.debug(GetType(), _strSql); // LogHelper.debug(GetType(), _strSql);
//sqlCmd.Parameters.AddWithValue("@takeBy", 5000); //sqlCmd.Parameters.AddWithValue("@takeBy", 5000);
@ -466,8 +479,9 @@ namespace DeiNiu.wms.Data.Model
case 1200: //getAssignedTasks by takeby case 1200: //getAssignedTasks by takeby
_strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] WHERE 1=1 " + _strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] WHERE 1=1 ";
" and elabId = 0 " ;
// + " and elabId = 0 " ;
if (Convert.ToInt32(mObj.CmdParameters[10]) <= 0) if (Convert.ToInt32(mObj.CmdParameters[10]) <= 0)
{ {
_strSql += " and state = 0 "; //未拣任务 _strSql += " and state = 0 "; //未拣任务
@ -527,7 +541,9 @@ namespace DeiNiu.wms.Data.Model
else else
{ {
_strSql += " order by priority desc,linepriority desc, pickorderNo ,/* virtialCnt,*/ warehouse,partion,locationId,channel,shelf,col,layer,goodsid"; // _strSql += " order by priority desc,linepriority desc, pickorderNo ,/* virtialCnt,*/ warehouse,partion,locationId,channel,shelf,col,layer,goodsid";
_strSql += " order by priority desc,lineId,lineorder, pickorderNo , /* virtialCnt,*/ warehouse,partion,channel,shelf,col,layer,goodsid";
} }

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

@ -1145,7 +1145,8 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 2900: // get by transNo ( vihicle type plateId ) case 2900: // get by transNo ( vihicle type plateId )
_strSql = "SELECT * FROM [t_wmsoutpickrequest] where transNo =@transNo"; _strSql = "SELECT * FROM [t_wmsoutpickrequest] r where transNo =@transNo" +
" or exists( select 1 FROM [t_wmsoutpickrequest] where seedspickno =r.pickOrderNo and transNo =@transNo )";
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
sqlCmd.Parameters.AddWithValue("@transNo", mObj.CmdParameters[0]); sqlCmd.Parameters.AddWithValue("@transNo", mObj.CmdParameters[0]);

15
Model/wms/data/WmsStock_Imp.cs
View File

@ -209,7 +209,8 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 401: //by skuId to get stock info case 401: //by skuId to get stock info
_strSql = "SELECT * FROM v_stockGoods s WHERE goodsId = @goodsId "; _strSql = "SELECT * FROM v_stockGoods s WHERE goodsId = @goodsId " +
" and volType < 4 "; //零库1 = -1, 零库, 小整, 中整, 大整,
int skuId = Convert.ToInt32(mObj.CmdParameters[1].ToString()); int skuId = Convert.ToInt32(mObj.CmdParameters[1].ToString());
if ((enumWhType)mObj.CmdParameters[3] == enumWhType.合格库) if ((enumWhType)mObj.CmdParameters[3] == enumWhType.合格库)
{ {
@ -270,13 +271,14 @@ namespace DeiNiu.wms.Data.Model
case 600: //get stock detail by location id , goodsId case 600: //get stock detail by location id , goodsId
_strSql = " SELECT * FROM v_stockGoods where locationid =@locId"; _strSql = " SELECT * FROM v_stockgoodsonshelf where locationid =@locId";
if (mObj.CmdParameters[1] != null) if (mObj.CmdParameters[1] != null)
{ {
_strSql += " and goodsId =@goodsId"; _strSql += " and goodsId =@goodsId";
sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[1]); sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[1]);
} }
_strSql += " order by avcount desc ,goodsId";
sqlCmd.Parameters.AddWithValue("@locId", mObj.CmdParameters[0]); sqlCmd.Parameters.AddWithValue("@locId", mObj.CmdParameters[0]);
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
break; break;
@ -506,7 +508,7 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 1810: // query perfomance kpi by sum case 1810: // query perfomance kpi by sum
_strSql = " SELECT ownerName, SUM(入库验收) AS 入库验收, SUM(入库上架) AS 入库上架, SUM(出库下架) AS 出库下架, SUM(播种分货) AS 播种分货, SUM(补货下架) AS 补货下架, SUM(补货上架) AS 补货上架, SUM(移库下架) AS 移库下架, SUM(移库上架) AS 移库上架, SUM(报废下架) AS 报废下架, SUM(退供应商下架) AS 退供应商下架, SUM(退供应商上架) AS 退供应商上架, SUM(装车运输) AS 装车运输, SUM(盘点采集) AS 盘点采集, SUM(直通分货) AS 直通分货, SUM(客户集货) AS 客户集货,SUM(总数) AS 总数 FROM dbo.v_flowTasksDetailTermSumKPI where 1=1 " _strSql = " SELECT ownerName, SUM(入库验收) AS 入库验收, SUM(入库上架) AS 入库上架, SUM(出库下架) AS 出库下架, SUM(播种分货) AS 播种分货, SUM(补货下架) AS 补货下架, SUM(补货上架) AS 补货上架, SUM(移库下架) AS 移库下架, SUM(移库上架) AS 移库上架, SUM(报废下架) AS 报废下架, SUM(退供应商下架) AS 退供应商下架, SUM(退供应商上架) AS 退供应商上架, SUM(装车运输) AS 装车运输, SUM(盘点采集) AS 盘点采集, SUM(直通分货) AS 直通分货, SUM(客户集货) AS 客户集货,SUM(总数) AS 总数 ,sum(日常理货) as 日常理货 FROM dbo.v_flowTasksDetailTermSumKPI where 1=1 "
+ mObj.CmdParameters[0].ToString() + mObj.CmdParameters[0].ToString()
+ " GROUP BY ownerName "; + " GROUP BY ownerName ";
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
@ -514,7 +516,7 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 1820: // query perfomance kpi by day case 1820: // query perfomance kpi by day
_strSql = " SELECT ownerName, taskDay,SUM(入库验收) AS 入库验收, SUM(入库上架) AS 入库上架, SUM(出库下架) AS 出库下架, SUM(播种分货) AS 播种分货, SUM(补货下架) AS 补货下架, SUM(补货上架) AS 补货上架, SUM(移库下架) AS 移库下架, SUM(移库上架) AS 移库上架, SUM(报废下架) AS 报废下架, SUM(退供应商下架) AS 退供应商下架, SUM(退供应商上架) AS 退供应商上架, SUM(装车运输) AS 装车运输, SUM(盘点采集) AS 盘点采集, SUM(直通分货) AS 直通分货, SUM(客户集货) AS 客户集货,SUM(总数) AS 总数 FROM dbo.v_flowTasksDetailTermSumKPI where 1=1 " _strSql = " SELECT ownerName, taskDay,SUM(入库验收) AS 入库验收, SUM(入库上架) AS 入库上架, SUM(出库下架) AS 出库下架, SUM(播种分货) AS 播种分货, SUM(补货下架) AS 补货下架, SUM(补货上架) AS 补货上架, SUM(移库下架) AS 移库下架, SUM(移库上架) AS 移库上架, SUM(报废下架) AS 报废下架, SUM(退供应商下架) AS 退供应商下架, SUM(退供应商上架) AS 退供应商上架, SUM(装车运输) AS 装车运输, SUM(盘点采集) AS 盘点采集, SUM(直通分货) AS 直通分货, SUM(客户集货) AS 客户集货,SUM(总数) AS 总数 ,sum(日常理货) as 日常理货 FROM dbo.v_flowTasksDetailTermSumKPI where 1=1 "
+ mObj.CmdParameters[0].ToString() + mObj.CmdParameters[0].ToString()
+ " GROUP BY ownerName ,taskDay"; + " GROUP BY ownerName ,taskDay";
@ -551,7 +553,12 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 2300: //clean stock for pandian
_strSql = " delete from t_wmsstock where count<=countout ";
sqlCmd.CommandText = _strSql;
break;
} }
} }

3
Model/wms/tables/Erp_purch.cs
View File

@ -237,9 +237,10 @@ namespace DeiNiu.wms.Data.Model
return CustQuery(1600).Tables[0]; return CustQuery(1600).Tables[0];
} }
public DataTable getByErpNoticeFailure() public DataTable getByErpNoticeFailure(bool isForce= false)
{ {
cmdParameters[0] = (int)enumErpOrderStatus.通知失败; cmdParameters[0] = (int)enumErpOrderStatus.通知失败;
cmdParameters[1] = isForce;
return CustQuery(1500).Tables[0]; return CustQuery(1500).Tables[0];
} }

2
Model/wms/tables/WmsFlow.cs
View File

@ -86,6 +86,8 @@ namespace DeiNiu.wms.Data.Model
public void finishedTasksPlus(int ownerId,decimal finishedPcs, bool isChildTasksOperation=false,bool isDone=false) 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}",
ownerId, finishedPcs, isChildTasksOperation, isDone,state ,orderNo));
if (!isChildTasksOperation && state == (int)enumFlowTaskStatus.已完成) if (!isChildTasksOperation && state == (int)enumFlowTaskStatus.已完成)
{ {
return; return;

37
Model/wms/tables/WmsGoods.cs
View File

@ -123,7 +123,7 @@ namespace DeiNiu.wms.Data.Model
public bool isZhitong public bool isZhitong
{ {
get { return /*_canZhitong || */!String.IsNullOrEmpty(_isZhitong) &&_isZhitong.Equals("1"); } get { return /*_canZhitong || */!String.IsNullOrEmpty(_isZhitong) &&(_isZhitong.Equals("1") || _isZhitong.Equals("True")); }
} }
public bool isZhitongFromStore public bool isZhitongFromStore
{ {
@ -418,6 +418,17 @@ namespace DeiNiu.wms.Data.Model
get { get {
decimal tmp = _stockSumCount - _stockSumCountOuting + _stockSumAjustCount + _stockSumVirtialCount; decimal tmp = _stockSumCount - _stockSumCountOuting + _stockSumAjustCount + _stockSumVirtialCount;
try
{
tmp = isWeightOut() ? tmp : ((int)(tmp / minOperateCount)) * minOperateCount;
}
catch
{
}
return tmp >= 0? tmp : 0; return tmp >= 0? tmp : 0;
} }
@ -484,7 +495,8 @@ namespace DeiNiu.wms.Data.Model
public decimal stockBatchAvCount public decimal stockBatchAvCount
{ {
get { get {
return _stockSumCount - _stockSumCountOuting - stockBulkAvCount; return stockAvCount - stockBulkAvCount;
// return _stockSumCount - _stockSumCountOuting - stockBulkAvCount;
} }
} }
@ -642,9 +654,23 @@ namespace DeiNiu.wms.Data.Model
continue; continue;
} }
if ( ( isWeightOut() ? st.getAvCount() : ((int)(st.getAvCount() / minOperateCount)) * minOperateCount) <=0 )
{
LogHelper.debug(GetType(), String.Format(" 达不到可拣选的最小数量 to get stk info, stk {0}", st.ToString()));
continue;
}
_stocks.Add(st); _stocks.Add(st);
decimal cnt = st.count - st.countOut; decimal cnt = st.count - st.countOut;
cnt = isWeightOut() ? cnt : ((int)(cnt / minOperateCount)) * minOperateCount; //取可拣选的最小单位的倍数
_stockSumCount += cnt; _stockSumCount += cnt;
_stockSumCountIn +=st.countIn; _stockSumCountIn +=st.countIn;
_stockSumCountOuting += st.countOuting; _stockSumCountOuting += st.countOuting;
@ -719,13 +745,6 @@ namespace DeiNiu.wms.Data.Model
return WmsConstants.GOODS_WEIGHT_UNITS.Contains(this.minOperateUnit); return WmsConstants.GOODS_WEIGHT_UNITS.Contains(this.minOperateUnit);
} }
public bool isSeedsOut2del()
{
return !isZhitong //直通不参与
&& ( canSeedOut //商品可取总
|| WmsConstants.SEEDS_PICK_ALL
&& ( !isWeightOut() || !WmsConstants.SEEDS_OUT_NOT_WITH_WEIGHT));
}
public bool isSeedsOut() public bool isSeedsOut()
{ {

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

@ -223,6 +223,15 @@ namespace DeiNiu.wms.Data.Model
cmdParameters[2] = batch; cmdParameters[2] = batch;
return CustQuery(1001).Tables[0]; return CustQuery(1001).Tables[0];
} }
public DataTable getFlowNoDetails(string seedsNo,string flowNo, string goodsId, string batch)
{
cmdParameters[0] = flowNo;
cmdParameters[1] = goodsId;
cmdParameters[2] = batch;
cmdParameters[3] = seedsNo;
return CustQuery(1002).Tables[0];
}
public DataTable getFreeTasks(int partion, int lineId, bool batchOnly,enumOrderType orderType,int empId=0) public DataTable getFreeTasks(int partion, int lineId, bool batchOnly,enumOrderType orderType,int empId=0)
{ {
@ -234,7 +243,7 @@ namespace DeiNiu.wms.Data.Model
return CustQuery(1100).Tables[0]; return CustQuery(1100).Tables[0];
} }
public DataTable getFreeTasks(string pickOrderNo) public DataTable getFreeTasksByPickOrder(string pickOrderNo)
{ {
cmdParameters[0] = pickOrderNo; cmdParameters[0] = pickOrderNo;

17
Model/wms/tables/WmsStock.cs
View File

@ -124,9 +124,12 @@ public WmsStock( string locationId)
{ {
cnt = cnt - countOuting; cnt = cnt - countOuting;
} }
return cnt; return cnt;
} }
/// <summary> /// <summary>
/// query same goods locations,存储整货位只含同品同批的情况 ( VOLTYPE=0 OR STORETYPE =0 ) /// query same goods locations,存储整货位只含同品同批的情况 ( VOLTYPE=0 OR STORETYPE =0 )
/// </summary> /// </summary>
@ -280,14 +283,17 @@ public WmsStock( string locationId)
{ {
if (String.IsNullOrEmpty(plateId)) if (String.IsNullOrEmpty(plateId))
{ {
if(ID == 0)
{
return 0;
}
// if (countIn <= 0 && count - countOut <= 0 && countOuting <= 0) //负库存 允许存在 // if (countIn <= 0 && count - countOut <= 0 && countOuting <= 0) //负库存 允许存在
if (isCanDelete()) //待下架库存 if (isCanDelete()) //待下架库存
{ {
LogHelper.debug(typeof(WmsStock), LogHelper.debug(typeof(WmsStock),
string.Format(" locationid {6}, {0} 库存扣完删除库存记录,countIn: {1} ,count: {2},countOut: {3} ,countIn: {4},plateCount {5}", string.Format("stk id {7}: locationid {6}, goodsId {0}, 库存扣完删除库存记录,countIn: {1} ,count: {2},countOut: {3} ,countIn: {4},plateCount {5}",
goodsId, countIn, count, countOut, countIn,plateCount,locationId) goodsId, countIn, count, countOut, countIn,plateCount,locationId,ID)
); );
return Delete(); // 库存扣完，删除记录 return Delete(); // 库存扣完，删除记录
} }
@ -509,6 +515,11 @@ public WmsStock( string locationId)
} }
public void cleanPandiane()
{
CustOper(2300);
}
public DataTable getFreeStockLocations(string goodsId, int count) public DataTable getFreeStockLocations(string goodsId, int count)
{ {
cmdParameters[0] = goodsId; cmdParameters[0] = goodsId;

3
Model/wms/tables/WmsStockPandian.cs
View File

@ -58,7 +58,8 @@ namespace DeiNiu.wms.Data.Model
string wherePlus = " and skuid >0 and voltype<=3 and whtype =0 and shelfCount>0 "; string wherePlus = " and skuid >0 and voltype<=3 and whtype =0 and shelfCount>0 ";
if ((enumPandianType)type == enumPandianType.拣货位盘点) if ((enumPandianType)type == enumPandianType.拣货位盘点)
{ {
wherePlus = " and voltype=0 and ( createtime +1 >= getdate() or lastmodified +1>=getdate() )"; // wherePlus = " and voltype=0 and ( createtime +1 >= getdate() or lastmodified +1>=getdate() )";
wherePlus = " and ( cast( createtime as date) = cast( getdate() as date) or cast( lastmodified as date) = cast( getdate() as date) )";
} }
else if ((enumPandianType)type == enumPandianType.存储位盘点) else if ((enumPandianType)type == enumPandianType.存储位盘点)
{ {

4
Utils/Enums.cs
View File

@ -39,7 +39,7 @@ namespace DeiNiu.Utils
public enum EnumFlowTaskType { 入库验收= 0,入库上架,播种分货, 补货下架, 补货上架, 出库下架,移库下架,移库上架, 不良品入库, public enum EnumFlowTaskType { 入库验收= 0,入库上架,播种分货, 补货下架, 补货上架, 出库下架,移库下架,移库上架, 不良品入库,
报废下架, 退供应商下架, 退供应商上架,出库检验,装车运输,盘点采集,直通分货,客户集货}; 报废下架, 退供应商下架, 退供应商上架,出库检验,装车运输,盘点采集,直通分货,客户集货,日常理货};
public enum enumFlowTaskStatus{ 未开始=0,进行中,暂停,取消,已完成}; public enum enumFlowTaskStatus{ 未开始=0,进行中,暂停,取消,已完成};
public enum enumFlowTaskResult { 成功 = 0,失败, 已被他人开始,状态不允许,任务不存在 }; public enum enumFlowTaskResult { 成功 = 0,失败, 已被他人开始,状态不允许,任务不存在 };
@ -289,7 +289,7 @@ namespace DeiNiu.Utils
public enum enumPlateLevel { 临时容器 = 0, 固定容器,客户集货, 线路集货,运输车 }; public enum enumPlateLevel { 临时容器 = 0, 固定容器,客户集货, 线路集货,运输车 };
public enum enumValidInResult { 成功 = 0, 失败, 流水码已使用, 货位不足,请维护效期天数 ,临期商品 ,过期商品,效期错误,已封板,已完验, public enum enumValidInResult { 成功 = 0, 失败, 流水码已使用, 货位不足,请维护效期天数 ,临期商品 ,过期商品,效期错误,已封板,已完验,
无虚拟库抵扣,不允许超收,直通商品不可入库上架}; 无虚拟库抵扣,不允许超收,直通商品不可入库上架,超过最大允许收货数量};
public enum enumPickResult { 成功 = 0, 失败, 容器已被其他客户占用,任务已经分拣完成,任务不存在,库存不存在,修改下架数量需要授权 }; public enum enumPickResult { 成功 = 0, 失败, 容器已被其他客户占用,任务已经分拣完成,任务不存在,库存不存在,修改下架数量需要授权 };

3
Utils/Utils.cs
View File

@ -769,6 +769,9 @@ namespace DeiNiu.Utils
case enumStockRecordType.入库直接上架: case enumStockRecordType.入库直接上架:
return EnumFlowTaskType.入库上架; return EnumFlowTaskType.入库上架;
case enumStockRecordType.手持盘点:
return EnumFlowTaskType.日常理货;
default: default:
return EnumFlowTaskType.出库下架; return EnumFlowTaskType.出库下架;

3
Utils/WmsConstants.cs
View File

@ -235,6 +235,9 @@ namespace DeiNiu.Utils
public static int OUT_PROCESS_STOCK_DAYS = 2; //处理分拣单库存定位的最大天数，几天内的进行处理，超过期限的不予处理 public static int OUT_PROCESS_STOCK_DAYS = 2; //处理分拣单库存定位的最大天数，几天内的进行处理，超过期限的不予处理
public static int SEEDS_WEIGHT_OUT_RATE = 20; //称重类型的先总拣后分播时，总拣数量需大于总需求的比例，防止不够分； 总拣分播剩余部分将自动归还库存。 public static int SEEDS_WEIGHT_OUT_RATE = 20; //称重类型的先总拣后分播时，总拣数量需大于总需求的比例，防止不够分； 总拣分播剩余部分将自动归还库存。
public static decimal OVER_WEIGHT_PERCENT_ALLOW = 20; // 称重商品允许超收超拣百分比 public static decimal OVER_WEIGHT_PERCENT_ALLOW = 20; // 称重商品允许超收超拣百分比
public static decimal IN_MAX_OVER_TIMES= 8; // 最大超收比例 , 订货100 ,最大收1000
public static int OUT_MIN_DAYS_VALIDTION_LEFT = 30; public static int OUT_MIN_DAYS_VALIDTION_LEFT = 30;
public static int OUT_STOCK_PROCESS_MAX_TIME_MINUTE =5; public static int OUT_STOCK_PROCESS_MAX_TIME_MINUTE =5;

2
WcfService1/Android.svc.cs
View File

@ -2095,6 +2095,8 @@ namespace DeiNiu.Wcf
try try
{ {
return new FormatedResult(lplate.getGoodsById( goodsId)); return new FormatedResult(lplate.getGoodsById( goodsId));
} }

4
WcfService1/BLL/lLot.cs
View File

@ -225,8 +225,10 @@ namespace DeiNiu.wms.Logical
internal Dictionary<int, string> getSKU(string prdDate, string goodsId, string batch ) internal Dictionary<int, string> getSKU(string prdDate, string goodsId, string batch )
{ {
Dictionary<string, string> skuValues = getSku(prdDate, goodsId, batch); Dictionary<string, string> skuValues = getSku(prdDate, goodsId, batch);
log.Debug("to get goodsId sku of " + goodsId);
WmsGoods wg = new WmsGoods(goodsId); WmsGoods wg = new WmsGoods(goodsId);
log.Debug( string.Format(" to get goodsId sku of {0}, expireDays {1}" , goodsId,wg.expiryDays));
string skuCode = ""; string skuCode = "";
int lotId = 0; int lotId = 0;
DataTable lotAtts = getLotAtts(goodsId); DataTable lotAtts = getLotAtts(goodsId);

124
WcfService1/BLL/lWmsInRequest.cs
View File

@ -277,7 +277,6 @@ namespace DeiNiu.wms.Logical
throw err; throw err;
} }
} }
@ -538,10 +537,13 @@ namespace DeiNiu.wms.Logical
if (dvDetail.Count == 0) if (dvDetail.Count == 0)
{ {
_erpPurchObj = new Erp_purch(requestDetail.orderNo); _erpPurchObj = new Erp_purch(requestDetail.orderNo);
if (_erpPurchObj.wms_state < (int)enumInStockOrderStatus.已上架)
{
_erpPurchObj.wms_state = (int)enumInStockOrderStatus.已上架; _erpPurchObj.wms_state = (int)enumInStockOrderStatus.已上架;
_erpPurchObj.operater = operId; _erpPurchObj.operater = operId;
_erpPurchObj.Update(); _erpPurchObj.Update();
} }
}
@ -1569,25 +1571,54 @@ namespace DeiNiu.wms.Logical
internal enumRepResult preInDone(string preInNo,bool isZhitongAuto = false) internal enumRepResult preInDone(string preInNo,bool isZhitongAuto = false)
{ {
logIn.Debug("start to 完验 "+preInNo); logIn.Debug("start to 完验 "+preInNo);
WmsFlow wmsFlow = new WmsFlow(preInNo);
if(wmsFlow.state == (int)enumFlowTaskStatus.已完成)
{
logIn.Debug("start to 完验 " + (enumFlowTaskStatus)wmsFlow.state);
// return enumRepResult.成功;
}
int cnt = 0; int cnt = 0;
List<Erp_purch> lst = preInObj.getPuchObjescts(preInNo);
foreach (Erp_purch obj in lst)
{
if (obj.wms_state >= (int)enumInStockOrderStatus.完验)
{
return enumRepResult.成功;
}
// obj.Update();
}
using (TransactionScope scope = new TransactionScope()) using (TransactionScope scope = new TransactionScope())
{ {
new WmsFlow().startAllTask(preInNo);
wmsFlow.startAllTask(preInNo);
if (isZhitongAuto && WmsConstants.IN_STOCK_ZHITONG_PREDONE_AUTO_VALIDATION) if (isZhitongAuto && WmsConstants.IN_STOCK_ZHITONG_PREDONE_AUTO_VALIDATION)
{ {
logIn.Debug("start to auto valid zhitong items "); logIn.Debug("start to auto valid zhitong items ");
autoValidInZhitong2(preInNo); autoValidInZhitong2(preInNo);
wmsFlow.finishedTasksPlus(operId,0,true,true);
logIn.Debug("end auto valid zhitong items "); logIn.Debug("end auto valid zhitong items ");
} }
cnt = preInObj.preDone(preInNo, operId); cnt = preInObj.preDone(preInNo, operId);
logIn.Debug(" 完验 更新 记录 " + cnt); logIn.Debug(" 完验 更新 记录 " + cnt);
foreach (Erp_purch obj in lst)
{
obj.wms_state = (int)enumInStockOrderStatus.完验;
obj.Update();
}
scope.Complete(); scope.Complete();
} }
List<Erp_purch> lst = preInObj.getPuchObjescts(preInNo);
logIn.Debug(" 完验 to notice erp purch order cnt " + lst.Count); logIn.Debug(" 完验 to notice erp purch order cnt " + lst.Count);
@ -1729,6 +1760,7 @@ namespace DeiNiu.wms.Logical
wop.flowNo = flowNo; wop.flowNo = flowNo;
wop.recordId = wsr.ID; wop.recordId = wsr.ID;
wop.pickBy = operId; wop.pickBy = operId;
wop.takeBy = operId;
wop.pickTime = wop.getDateTime(); wop.pickTime = wop.getDateTime();
wop.partion = wid.partion; wop.partion = wid.partion;
wop.pickCount = seedCnt; wop.pickCount = seedCnt;
@ -1908,10 +1940,17 @@ namespace DeiNiu.wms.Logical
if (inStoreType == enumInStoreType.直接上架 || inStoreType== enumInStoreType.虚拟入库冲抵) if (inStoreType == enumInStoreType.直接上架 || inStoreType== enumInStoreType.虚拟入库冲抵)
{ {
wmsflow.finishedCnt = wmsflow.taskCnt; /* wmsflow.finishedCnt = wmsflow.taskCnt;
wmsflow.owner = operId; wmsflow.owner = operId;
wmsflow.state = (int)enumFlowTaskStatus.已完成; wmsflow.state = (int)enumFlowTaskStatus.已完成;
wmsflow.Update(); wmsflow.Update();
wmsflow.finishedPcs = 1;
*/
decimal finishedPcs = requestDetail.outDetailId > 0 //直通
?( wmsflow.flowNo.StartsWith("zt") //强制完验
? wmsflow.taskCnt : count )
: 1;
wmsflow.finishedTasksPlus(operId, finishedPcs); // 直通强制
return; return;
} }
@ -2708,7 +2747,20 @@ namespace DeiNiu.wms.Logical
flow.finishedCnt = flow.finishedCnt > flow.taskCnt ? flow.taskCnt : flow.finishedCnt; flow.finishedCnt = flow.finishedCnt > flow.taskCnt ? flow.taskCnt : flow.finishedCnt;
*/ */
WmsGoods wg = new WmsGoods(epd.goods_id); WmsGoods wg = new WmsGoods(epd.goods_id);
flow.finishedTasksPlus(operId, epd.validCount/wg.bigCount);
logIn.Debug(string.Format("wg name {0}, wg bigcount {1}, wg iszhitong {2}",wg.goodsName,wg.bigCount,wg.isZhitong));
logIn.Debug(wg);
decimal finishedPcs = validIn.valid_count / wg.bigCount;
finishedPcs= validIn.outPickDetailId > 0 //直通
? (validIn.flowNo.StartsWith("zt") //强制完验
? 1: finishedPcs)
: finishedPcs;
flow.finishedTasksPlus(operId, finishedPcs, validIn.outPickDetailId>0 || wg.isZhitong);// 直通商品
} }
@ -2828,6 +2880,7 @@ namespace DeiNiu.wms.Logical
wid.whType = validIn.whType; wid.whType = validIn.whType;
wid.entid = epd.entid; wid.entid = epd.entid;
wid.outDetailId = validIn.outPickDetailId; wid.outDetailId = validIn.outPickDetailId;
wid.Add(); wid.Add();
if (isInStockNow) if (isInStockNow)
{ {
@ -2904,10 +2957,10 @@ namespace DeiNiu.wms.Logical
return true; return true;
} }
public string retryNoticeErpValidIn() public string retryNoticeErpValidIn(bool isForce=false)
{ {
//enumErpOrderStatus status = enumErpOrderStatus.通知失败; //enumErpOrderStatus status = enumErpOrderStatus.通知失败;
DataTable dt = erpPurchObj.getByErpNoticeFailure(); DataTable dt = erpPurchObj.getByErpNoticeFailure(isForce);
if (dt.Rows.Count > 0) if (dt.Rows.Count > 0)
{ {
logERP.Debug(string.Format(" to retry notice ERP purch orders count {0} ", dt.Rows.Count)); logERP.Debug(string.Format(" to retry notice ERP purch orders count {0} ", dt.Rows.Count));
@ -2991,7 +3044,7 @@ namespace DeiNiu.wms.Logical
logERP.Debug(string.Format(" notice ERP purch order {0},response {1}", ((Erp_purch)purchObj).pur_order, responseText)); logERP.Debug(string.Format(" notice ERP purch order {0},response {1}", ((Erp_purch)purchObj).pur_order, responseText));
((Erp_purch)purchObj).erp_state = (int)enumErpOrderStatus.通知失败; ((Erp_purch)purchObj).erp_state = (int)enumErpOrderStatus.通知失败;
((Erp_purch)purchObj).wms_state = (int)enumInStockOrderStatus.已验收; //辣得叫 不存在多次收货情况，到货通知单完验 ((Erp_purch)purchObj).wms_state = (int)enumInStockOrderStatus.完验; //辣得叫 不存在多次收货情况，到货通知单完验
if (response.StatusCode == HttpStatusCode.OK) if (response.StatusCode == HttpStatusCode.OK)
{ {
@ -3007,7 +3060,7 @@ namespace DeiNiu.wms.Logical
// ((Erp_purch)purchObj).ext1 = res.Messag; // ((Erp_purch)purchObj).ext1 = res.Messag;
} }
logIn.Debug(" to update purch order status to: " + (enumErpOrderStatus)((Erp_purch)purchObj).erp_state); logIn.Debug(" to update purch order status to: " + (enumInStockOrderStatus)((Erp_purch)purchObj).wms_state);
try try
{ {
@ -3184,7 +3237,8 @@ namespace DeiNiu.wms.Logical
{ {
logIn.Error(er); logIn.Error(er);
scope.Dispose(); scope.Dispose();
return er.Message; // return er.Message;
throw er;
} }
scope.Complete(); scope.Complete();
@ -3214,7 +3268,7 @@ namespace DeiNiu.wms.Logical
eprp.purch_d_id = id; eprp.purch_d_id = id;
if (eprp.ID > 0) if (eprp.ID > 0)
{ {
LogHelper.debug(GetType(), String.Format("明细预到数量累积 ")); logIn.Debug( String.Format("明细预到数量累积 "));
eprp.arriveCount += arriveNumber; //同一个采购单下，未生成预到单的，明细预到数量累积 ,同一个预到单号下，预到明细ID唯一，预到数量不累加。 eprp.arriveCount += arriveNumber; //同一个采购单下，未生成预到单的，明细预到数量累积 ,同一个预到单号下，预到明细ID唯一，预到数量不累加。
//prp.arriveCount = eprp.arriveCount > 0 ? eprp.arriveCount : 0; //prp.arriveCount = eprp.arriveCount > 0 ? eprp.arriveCount : 0;
if (eprp.arriveCount <= 0) if (eprp.arriveCount <= 0)
@ -3225,7 +3279,7 @@ namespace DeiNiu.wms.Logical
} }
else if (arriveNumber > 0) else if (arriveNumber > 0)
{ {
LogHelper.debug(GetType(), String.Format("新增预到明细数量 ")); logIn.Debug(String.Format("新增预到明细数量 "));
eprp.orderType = (int)ordeType; eprp.orderType = (int)ordeType;
eprp.arriveCount = arriveNumber; eprp.arriveCount = arriveNumber;
@ -3247,7 +3301,7 @@ namespace DeiNiu.wms.Logical
/// <returns></returns> /// <returns></returns>
internal string receiveByOrderPre(string orderNo,string vender, enumInOrderType orderType, string inRemark, int shipId) internal string receiveByOrderPre(string orderNo,string vender, enumInOrderType orderType, string inRemark, int shipId)
{ {
log.Debug( String.Format("receiveByOrderPre, orderNo {0},vender {1},orderType {2}", orderNo,vender,orderType.ToString())); logIn.Debug( String.Format("receiveByOrderPre, orderNo {0},vender {1},orderType {2}", orderNo,vender,orderType.ToString()));
DataTable dt = getRequestInDetail(orderNo); DataTable dt = getRequestInDetail(orderNo);
@ -3262,9 +3316,9 @@ namespace DeiNiu.wms.Logical
} }
log.Debug( String.Format("receiveByOrderPre, 开始处理明细...数量{0}", lst.Count)); logIn.Debug( String.Format("receiveByOrderPre, 开始处理明细...数量{0}", lst.Count));
string preNo = receiveDetailsPre(orderType, null, 0, vender, lst); string preNo = receiveDetailsPre(orderType, null, 0, vender, lst);
LogHelper.debug(GetType(), String.Format("receiveByOrderPre,处理完毕......")+ preNo); logIn.Debug( String.Format("receiveByOrderPre,处理完毕......")+ preNo);
return preNo; return preNo;
@ -3284,13 +3338,18 @@ namespace DeiNiu.wms.Logical
{ {
if (WmsConstants.IN_STOCK_PREIN_AUTO_RECEIVE) if (WmsConstants.IN_STOCK_PREIN_AUTO_RECEIVE)
{ {
try { /* try {
receivePreDetailAuto(preInNo); receivePreDetailAuto(preInNo);
} catch (Exception ex) { } catch (Exception ex) {
logIn.Error(ex); logIn.Error(ex);
return ""; return "";
} }
*/
// throw new Exception("TEST事务(进程 ID 57)与另一个进程被死锁在 锁 资源上，并且已被选作死锁牺牲品。请重新运行该事务");
receivePreDetailAuto(preInNo);
} }
return preInNo; return preInNo;
@ -3313,7 +3372,7 @@ namespace DeiNiu.wms.Logical
Erp_purch_receive_pre eprd; Erp_purch_receive_pre eprd;
List<WmsStock> stks = null; List<WmsStock> stks = null;
if (WmsConstants.OUT_STOCK_LACK_VIR_OUT_AUTO) //扣除预出部分 if (WmsConstants.OUT_STOCK_LACK_VIR_IN_AUTO && WmsConstants.OUT_STOCK_LACK_VIR_OUT_AUTO) //扣除预出部分
{ {
stks = new WmsStock().getLackStockObjs(); stks = new WmsStock().getLackStockObjs();
} }
@ -3802,12 +3861,24 @@ namespace DeiNiu.wms.Logical
if (i == dv.Count) //if (epdMax <= 0) if (i == dv.Count) //if (epdMax <= 0)
{ {
logIn.Debug(string.Format("epdMax {0} ,i {1}, dv.count {2}, 超收.........", epdMax,i,dv.Count));
// decimal overRate = Math.Abs((epdMax - batchCount )) * 100 / epdMax; // decimal overRate = Math.Abs((epdMax - batchCount )) * 100 / epdMax;
decimal overRate = ((eprd.validCount + batchCount) - eprd.receiveCount) * 100 / eprd.receiveCount; decimal overRate = ((eprd.validCount + batchCount) - eprd.receiveCount) * 100 / eprd.receiveCount;
logIn.Debug(string.Format("epdMax {0} ,i {1}, dv.count {2}, 超收比例......... {3}, 最大允许超收比例 {4}", epdMax,i,dv.Count, overRate, WmsConstants.IN_MAX_OVER_TIMES*100));
if (!isZhitong
//&& !wg.isWeightOut()
&& overRate / 100>WmsConstants.IN_MAX_OVER_TIMES
&& !havePermission(WmsConstants.SPECIAL_AUTHS_SUPER))
{
logIn.Debug(string.Format(" 超收比例 {0} > 最大允许比例 {1}", overRate / 100 , WmsConstants.IN_MAX_OVER_TIMES ));
return enumValidInResult.超过最大允许收货数量;
}
if (WmsConstants.IN_STOCK_OVER_RECEIVE if (WmsConstants.IN_STOCK_OVER_RECEIVE
|| wg.isWeightOut() &&overRate < WmsConstants.OVER_WEIGHT_PERCENT_ALLOW || wg.isWeightOut() &&overRate < WmsConstants.OVER_WEIGHT_PERCENT_ALLOW
|| havePermission(WmsConstants.SPECIAL_OVER_RECEIVE) || havePermission(WmsConstants.SPECIAL_OVER_RECEIVE)
@ -4017,6 +4088,7 @@ namespace DeiNiu.wms.Logical
/// <returns></returns> /// <returns></returns>
internal bool retrieveValidByPreNo(string preInNo, int skuId = 0) internal bool retrieveValidByPreNo(string preInNo, int skuId = 0)
{ {
logIn.Debug("do retrieve by preInNo " + preInNo);
WmsInRequestDetail wid = new WmsInRequestDetail(); WmsInRequestDetail wid = new WmsInRequestDetail();
DataTable dt = wid.getByPreInOrder(preInNo); DataTable dt = wid.getByPreInOrder(preInNo);
@ -4086,6 +4158,7 @@ namespace DeiNiu.wms.Logical
|| wip.state == (int)enumInStockDetailStatus.部分上架) || wip.state == (int)enumInStockDetailStatus.部分上架)
{ {
//continue; //continue;
logIn.Debug(" return false, wip.state " + (enumInStockDetailStatus)wip.state);
return false; return false;
} }
@ -4199,10 +4272,19 @@ namespace DeiNiu.wms.Logical
wid.validCount -= seedCnt; wid.validCount -= seedCnt;
wid.Update(); wid.Update();
WmsOutPickPort wop = new WmsOutPickPort();
DataTable dt = wop.getFlowNoDetails(wid.flowNo, wid.goodsId, wid.batch);
foreach(DataRow dr in dt.Rows)
{
wop = new WmsOutPickPort(dr);
wop.state = (int)enumPickState.已关闭;
wop.description = "验收取消";
wop.Update();
}
WmsPlateStock_tmp wps = new WmsPlateStock_tmp(); WmsPlateStock_tmp wps = new WmsPlateStock_tmp();
DataTable dt = wps.getPlateStockDetail(flowNo); dt = wps.getPlateStockDetail(flowNo);
foreach (DataRow dr in dt.Rows) foreach (DataRow dr in dt.Rows)
{ {
@ -4211,6 +4293,8 @@ namespace DeiNiu.wms.Logical
} }
} }
@ -4840,7 +4924,7 @@ namespace DeiNiu.wms.Logical
log.Debug(" 开始自动入库直通验收...............................> " + preNo); log.Debug(" 开始自动入库直通验收...............................> " + preNo);
DataTable dt = new WmsInRequest().getZhiTongOrderByCust(preNo, "0"); DataTable dt = new WmsInRequest().getZhiTongOrderByCust(preNo, "0");
// logTest.Debug(" 需入库记录数量 " + dt.Rows.Count); logTest.Debug(" 需入库记录数量 " + dt.Rows.Count);
Erp_purch_d pd; Erp_purch_d pd;
string preInNo, goodsId, flowNo; string preInNo, goodsId, flowNo;
decimal orderCnt = 0, seeded = 0, batchCnt = 0; decimal orderCnt = 0, seeded = 0, batchCnt = 0;

75
WcfService1/BLL/lWmsOutPickPort.cs
View File

@ -1128,7 +1128,7 @@ namespace DeiNiu.wms.Logical
if (isWholePickOrder) if (isWholePickOrder)
{ {
dtFreeTasks = getWmsOutPickPort.getFreeTasks(locationId); dtFreeTasks = getWmsOutPickPort.getFreeTasksByPickOrder(locationId);
} }
else else
@ -1366,7 +1366,7 @@ namespace DeiNiu.wms.Logical
dv.Sort = ""; dv.Sort = " warehouse,partion,channel,shelf,col,layer,goodsid";
string lastOrder = ""; string lastOrder = "";
@ -1404,7 +1404,7 @@ namespace DeiNiu.wms.Logical
lotcnt++; lotcnt++;
boxcnt += Convert.ToInt32(drv["boxcnt"].ToString()); boxcnt += Convert.ToInt32(drv["boxcnt"].ToString());
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT) if (/*lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 ||*/ lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
{ {
logOut.Debug(string.Format("2 can't assign more tasks , loc cnt :{0}, box cnt: {1}, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100: {2}", lotcnt, boxcnt, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100)); logOut.Debug(string.Format("2 can't assign more tasks , loc cnt :{0}, box cnt: {1}, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100: {2}", lotcnt, boxcnt, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100));
break; break;
@ -1417,6 +1417,8 @@ namespace DeiNiu.wms.Logical
return jobs; return jobs;
} }
internal decimal seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, internal decimal seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId,
decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose) decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose)
@ -1462,7 +1464,9 @@ namespace DeiNiu.wms.Logical
} }
WmsOutPickDetail wod = new WmsOutPickDetail(outDetailId); WmsOutPickDetail wod = new WmsOutPickDetail(outDetailId);
// logTest.Debug(string.Format("seeds pickdetail {0}", wod.ToString()));
logTest.Debug(string.Format("seeds pickdetail {0}", wod.ToString()));
if (wod.ID==0 || !isZhitongSeed && string.IsNullOrEmpty(wod.seedsPickNo) ) if (wod.ID==0 || !isZhitongSeed && string.IsNullOrEmpty(wod.seedsPickNo) )
{ {
logTest.Debug(string.Format(" detialId {0}, seedsNo is null, {1}", outDetailId, enumRepResult.不适合播种)); logTest.Debug(string.Format(" detialId {0}, seedsNo is null, {1}", outDetailId, enumRepResult.不适合播种));
@ -1482,7 +1486,7 @@ namespace DeiNiu.wms.Logical
// WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo+wod.goodsId+batch, flowNo); // WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo+wod.goodsId+batch, flowNo);
WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo, flowNo); WmsFlow wmsflow = new WmsFlow(wod.seedsPickNo, flowNo);
// logTest.Debug(string.Format("orderNo {0}, flowNo {1}, wmsflow {2}", wod.seedsPickNo + wod.goodsId + batch, flowNo, wmsflow.ToString())); // logTest.Debug(string.Format("orderNo {0}, flowNo {1}, wmsflow {2}", wod.seedsPickNo + wod.goodsId + batch, flowNo, wmsflow.ToString()));
/*
enumRepResult rs= wmsflow.checkFlow(operId, wmsflow.type); enumRepResult rs= wmsflow.checkFlow(operId, wmsflow.type);
if (rs!=enumRepResult.成功) if (rs!=enumRepResult.成功)
{ {
@ -1490,6 +1494,7 @@ namespace DeiNiu.wms.Logical
// return rs;// enumRepResult.任务已被他人抢占; // return rs;// enumRepResult.任务已被他人抢占;
} }
*/
//to check the toFlowNo plate //to check the toFlowNo plate
@ -1556,9 +1561,9 @@ namespace DeiNiu.wms.Logical
// pickport with flowno can be multi records, update the finished seeds count in loop // 更新总拣记录 pickport with flowno can be multi records, update the finished seeds count in loop
DataTable dt = getWmsOutPickPort.getFlowNoDetails(flowNo, wod.goodsId, batch); DataTable dt = getWmsOutPickPort.getFlowNoDetails(wod.seedsPickNo, flowNo, wod.goodsId, batch);
List<WmsOutPickPort> lstSeeds = new List<WmsOutPickPort>(); List<WmsOutPickPort> lstSeeds = new List<WmsOutPickPort>();
List<WmsPlateStock_tmp> lstUpdate = new List<WmsPlateStock_tmp>(); List<WmsPlateStock_tmp> lstUpdate = new List<WmsPlateStock_tmp>();
; ;
@ -1677,7 +1682,7 @@ namespace DeiNiu.wms.Logical
using (TransactionScope scope = new TransactionScope()) using (TransactionScope scope = new TransactionScope())
{ {
logTest.Debug(string.Format("start update 分播 tasks ,operid {0}, wmsflow : {1}",operId, wmsflow.ToString() )); logTest.Debug(string.Format("seeds out start update 分播 tasks ,operid {0}, wmsflow : {1}",operId, wmsflow.ToString() ));
@ -1748,9 +1753,25 @@ namespace DeiNiu.wms.Logical
// t.Delete(); // t.Delete();
} }
logTest.Debug(string.Format("2 seeds done cnt {0}, totalcnt of task{1}", seedsDoneCnt, dt.Rows.Count)); log.Debug(string.Format("2 seeds done cnt {0}, totalcnt of task {1}, lstUpdate.Count {2}", seedsDoneCnt, dt.Rows.Count, lstUpdate.Count));
wmsflow.finishedTasksPlus(operId, seedCnt / wod.goods.minOperateCount, true, false); //下架任务更新分播数据
WmsFlow wmsflowCust = new WmsFlow(wmsflow.orderNo, wod.customerId + "-" + operId); //按分播单 和客户ID 分播ID 创建分播任务
if (wmsflowCust.ID == 0)
{
wmsflowCust.operater = operId;
wmsflowCust.orderNo = wmsflow.orderNo;// + sr.goodsId + sr.batch;
wmsflowCust.flowNo = wod.customerId + "-" + operId;
wmsflowCust.type = wmsflow.type;
wmsflowCust.typeName = wmsflow.typeName;
wmsflowCust.task = Util.getOrderNo(enumCreateOrderType.pickJobNo, _obj.getNextSeq(enumCreateOrderType.pickJobNo));
wmsflowCust.taskCnt = 1;
wmsflowCust.Add();
}
wmsflowCust.finishedTasksPlus(operId, seedCnt / wod.goods.minOperateCount, true); //更新分播任务
wmsflow.finishedTasksPlus(operId, seedCnt/wod.goods.bigCount,true, seedsDoneCnt == dt.Rows.Count);
// log.Debug(" 2 WmsPlateStock_tmp lstUpdate count " + lstUpdate.Count); // log.Debug(" 2 WmsPlateStock_tmp lstUpdate count " + lstUpdate.Count);
@ -1772,6 +1793,8 @@ namespace DeiNiu.wms.Logical
} }
} }
log.Debug(" 2 WmsPlateStock_tmp lstUpdate count " + lstUpdate.Count);
if (lstUpdate.Count > 0) if (lstUpdate.Count > 0)
{ {
WmsPlateStock_tmp stk = lstUpdate[0]; //copy source tmp stk info WmsPlateStock_tmp stk = lstUpdate[0]; //copy source tmp stk info
@ -1783,7 +1806,7 @@ namespace DeiNiu.wms.Logical
stk.skuId = skuId; stk.skuId = skuId;
stk.productDate = productDate; stk.productDate = productDate;
stk.jobNo = stk.orderNo + toFlowNo; ; stk.jobNo = stk.orderNo + toFlowNo; ;
stk.operater = operId;
stk.customerId = wod.customerId; stk.customerId = wod.customerId;
@ -1842,8 +1865,6 @@ namespace DeiNiu.wms.Logical
toP.Update(); toP.Update();
// logTest.Debug("4 " + toP);
wmsflow.Add();
} }
@ -2032,7 +2053,7 @@ namespace DeiNiu.wms.Logical
wid.Update(); wid.Update();
flow.finishedTasksPlus(operId,seedCnt/wod.goods.bigCount,true,wid.seedOutCnt>=wid.validCount); flow.finishedTasksPlus(operId,seedCnt/wod.goods.minOperateCount,true,wid.seedOutCnt>=wid.validCount);
wod.Update(); wod.Update();
@ -2239,7 +2260,10 @@ namespace DeiNiu.wms.Logical
} }
} }
if(partion ==0 && !string.IsNullOrEmpty(locationid)) bool isWholePickOrder = !string.IsNullOrEmpty(locationid) && locationid.StartsWith("PK");
if ( partion == 0 && !string.IsNullOrEmpty(locationid) && !isWholePickOrder)
{ {
WmsLocation loc = new WmsLocation(locationid); WmsLocation loc = new WmsLocation(locationid);
partion = loc.partion; partion = loc.partion;
@ -2257,22 +2281,39 @@ namespace DeiNiu.wms.Logical
dt = getWmsOutPickPort.getAssignedTasks(taskBy, 0, lineId, batchOnly, orderType, state); dt = getWmsOutPickPort.getAssignedTasks(taskBy, 0, lineId, batchOnly, orderType, state);
} }
if (state == 1) //分拣的历史记录 if (state == 1 || isWholePickOrder ) //分拣的历史记录 或 整单分拣
{ {
return dt; return dt;
} }
bool isWeightOut=false; bool isWeightOut=false;
foreach(DataRow dr in dt.Rows) foreach(DataRow dr in dt.Rows)
{ {
try
{
if (WmsConstants.GOODS_WEIGHT_UNITS.Contains(dr["pickUnit"].ToString())) if (WmsConstants.GOODS_WEIGHT_UNITS.Contains(dr["pickUnit"].ToString()))
{ {
isWeightOut = true; // isWeightOut = true;
isWeightOut = Convert.ToInt32(dr["recType"].ToString()) == (int)enumStockRecordType.销售出库;
if (isWeightOut)
{
break; break;
} }
} }
}
catch
{
}
}
if (isWeightOut ) if (isWeightOut )
{ {
DataView dv = dt.DefaultView; DataView dv = dt.DefaultView;

99
WcfService1/BLL/lWmsOutPickRequest.cs
View File

@ -1056,7 +1056,7 @@ namespace DeiNiu.wms.Logical
{ {
if (wop.takeBy > 0) if (wop.takeBy > 0)
{ {
wop.description += " 原任务所有者 为 " + wop.takeBy + ",reassign to " + empId + ", " + DateTime.Now; wop.description = " 原任务所有者 为 " + wop.takeBy + ",reassign to " + empId + ", " + DateTime.Now;
} }
wop.takeBy = empId; wop.takeBy = empId;
wop.Update(); wop.Update();
@ -3422,7 +3422,7 @@ namespace DeiNiu.wms.Logical
enumPickResult updatePortPickStateStk(int id, string flowNo, enumPickState state, decimal pickCount = 0) enumPickResult updatePortPickStateStk(int id, string flowNo, enumPickState state, decimal pickCount = 0)
{ {
logOut.Debug(string.Format("{0},flowNO:{1},{2},{3}", id, flowNo, state, pickCount)); logOut.Debug(string.Format("1 下架任务 {0},flowNO:{1},状态 {2}, 下架数量{3}", id, flowNo, state, pickCount));
WmsPlateStock_tmp ptmp = new WmsPlateStock_tmp(); WmsPlateStock_tmp ptmp = new WmsPlateStock_tmp();
@ -3456,11 +3456,15 @@ namespace DeiNiu.wms.Logical
WmsGoods goods = new WmsGoods(sr.goodsId); WmsGoods goods = new WmsGoods(sr.goodsId);
pickCount = goods.isWeightOut() ? pickCount : ((int)(pickCount / goods.minOperateCount)) * goods.minOperateCount;
logOut.Debug(string.Format(" 下架任务 {0},flowNO:{1},状态 {2}, 下架数量{3}， gooddsname {4} ,minOperateCount {5}", id, flowNo, state, pickCount,goods.goodsName, goods.minOperateCount));
if (pickCount > 0) if (pickCount > 0)
{ {
outPickPort.pickCount += pickCount; //pickCount 仅用于校验补货入库用，不用于记录实际拣货数量 outPickPort.pickCount += pickCount; //pickCount 仅用于校验补货入库用，不用于记录实际拣货数量
decimal overRate = Math.Abs((pickCount - outPickPort.count)) * 100 / outPickPort.count;
// logSpec.Debug(string.Format("goodsid {3}, is weightout? {4}, over rate {5} , pick count {0}, count of task {1}, operId {2}, need special permission {6}" // logSpec.Debug(string.Format("goodsid {3}, is weightout? {4}, over rate {5} , pick count {0}, count of task {1}, operId {2}, need special permission {6}"
// , pickCount, outPickPort.count, operId, goods.goodsId, goods.isWeightOut(), overRate // , pickCount, outPickPort.count, operId, goods.goodsId, goods.isWeightOut(), overRate
@ -3468,7 +3472,10 @@ namespace DeiNiu.wms.Logical
if (pickCount != outPickPort.count) if (pickCount != outPickPort.count)
{ {
logSpec.Debug(" count not match "); decimal overRate = Math.Abs((pickCount - outPickPort.count)) * 100 / outPickPort.count;
logSpec.Debug(string.Format(" count not match ,pickCount {0}, want count {1}, overrRate {2}",pickCount, outPickPort.count,overRate));
if (!goods.isWeightOut() && overRate > WmsConstants.OVER_WEIGHT_PERCENT_ALLOW) if (!goods.isWeightOut() && overRate > WmsConstants.OVER_WEIGHT_PERCENT_ALLOW)
{ {
@ -3495,9 +3502,6 @@ namespace DeiNiu.wms.Logical
if (WmsConstants.OUT_STOCK_DEDUCT) if (WmsConstants.OUT_STOCK_DEDUCT)
{ {
//更新库存 //更新库存
@ -3513,7 +3517,15 @@ namespace DeiNiu.wms.Logical
{ {
log.Error(string.Format("库存异常, goodsId {0}, skuId {1},batch {2},location {3}, stk id {4}, stockrecord id {5}",sr.goodsId,sr.skuId,sr.batch,sr.location,stk.ID,sr.ID )); log.Error(string.Format("库存异常, goodsId {0}, skuId {1},batch {2},location {3}, stk id {4}, stockrecord id {5}",sr.goodsId,sr.skuId,sr.batch,sr.location,stk.ID,sr.ID ));
return enumPickResult.库存不存在; stk.goodsId = sr.goodsId;
stk.skuId = sr.skuId;
stk.skuCode = sr.skuCode;
stk.batch = sr.batch;
stk.productDate = sr.productDate;
stk.validDate = sr.validDate;
stk.locationId = sr.locationId;
stk.Add();
// return enumPickResult.库存不存在; //可能有超出计划拣货数量的可能,使得库存提前捡完并,删除了记录
} }
if (pickCount == 0) //允许打零 if (pickCount == 0) //允许打零
{ {
@ -3521,8 +3533,27 @@ namespace DeiNiu.wms.Logical
{ {
outPickPort.Update(); outPickPort.Update();
stk.countOuting -= outPickPort.count; stk.countOuting -= outPickPort.count;
flow.finishedTasksPlus(operId, pickCount / goods.bigCount);
stk.updateCountOut();
if (outPickPort.virtialCnt > 0) //还回未出库虚拟库存
{
stk.virtialCount -= outPickPort.virtialCnt;
stk.virtialCount = stk.virtialCount > 0 ? stk.virtialCount : 0;
WmsStock virSt = stk.getVirStock(stk.goodsId);
virSt.countOuting -= outPickPort.virtialCnt;
// virSt.updateCountOut();
virSt.Update();
}
// stk.updateCountOut();
stk.Update();
flow.finishedTasksPlus(operId, pickCount / goods.minOperateCount);
scope.Complete(); scope.Complete();
return enumPickResult.成功; return enumPickResult.成功;
//TODO: 当订单所有明细都打零时，如何装车出库？ //TODO: 当订单所有明细都打零时，如何装车出库？
@ -3534,6 +3565,7 @@ namespace DeiNiu.wms.Logical
logOut.Debug("拣货更新库存前: " + stk); logOut.Debug("拣货更新库存前: " + stk);
logOut.Debug("拣货更新库存前,虚拟库: " + stkVir);
enumStockRecordType type = (enumStockRecordType)outPickPort.recType; enumStockRecordType type = (enumStockRecordType)outPickPort.recType;
@ -3542,7 +3574,7 @@ namespace DeiNiu.wms.Logical
type.ToString(), pickCount, ""); type.ToString(), pickCount, "");
// stk.countOuting -= pickCount; _outPickPort.count // stk.countOuting -= pickCount; _outPickPort.count
stk.countOuting -= _outPickPort.count > pickCount ? _outPickPort.count : pickCount; // 计划分拣数量可能不同于实际数量,只分拣一次 stk.countOuting -= _outPickPort.count > pickCount ? _outPickPort.count : pickCount; // 计划分拣数量可能不同于实际数量,只分拣一次
stk.countOuting = stk.countOuting > 0 ? stk.countOuting : 0; //????can countouting <0? stk.countOuting = stk.countOuting > 0 ? stk.countOuting : 0; //????can countouting <0? // 称重或修改出库数量可能出现出库数量大于预计数量
stk.countOut += pickCount; stk.countOut += pickCount;
stk.plateCount += pickCount; stk.plateCount += pickCount;
@ -3551,14 +3583,15 @@ namespace DeiNiu.wms.Logical
if ( WmsConstants.OUT_STOCK_LACK_VIR_OUT_AUTO && stk.virtialCount > 0 && outPickPort.virtialCnt>0 ) if ( WmsConstants.OUT_STOCK_LACK_VIR_OUT_AUTO && stk.virtialCount > 0 && outPickPort.virtialCnt>0 )
{ {
// logOut.Debug(string.Format("扣虚拟库存， 原库存 {0}， 虚拟库存 {1} ", stk.ToString(), stkVir.ToString())); logOut.Debug(string.Format("扣虚拟库存， 原库存 {0}， 虚拟库存 {1}, outPickPort.virtialCnt {2} ", stk.ToString(), stkVir.ToString(), outPickPort.virtialCnt));
stk.virtialCount -= outPickPort.virtialCnt; stk.virtialCount -= pickCount;// outPickPort.virtialCnt;
stk.virtialCount = stk.virtialCount<0?0: stk.virtialCount; stk.virtialCount = stk.virtialCount<0?0: stk.virtialCount; // 称重或修改出库数量可能出现出库数量大于预计数量
stk.count += outPickPort.virtialCnt; stk.count += pickCount; // outPickPort.virtialCnt;
stkVir.countOuting -= pickCount;// outPickPort.virtialCnt;
stkVir.countOut += pickCount;
stkVir.countOuting -= outPickPort.virtialCnt;
stkVir.countOut += outPickPort.virtialCnt;
} }
@ -3591,6 +3624,7 @@ namespace DeiNiu.wms.Logical
plateStock.recType = _outPickPort.recType; plateStock.recType = _outPickPort.recType;
plateStock.recordId = _outPickPort.recordId; plateStock.recordId = _outPickPort.recordId;
plateStock.customerId=_outRequest.customerId; plateStock.customerId=_outRequest.customerId;
plateStock.operater = operId;
if(string.IsNullOrEmpty(plateStock.goodsId)) if(string.IsNullOrEmpty(plateStock.goodsId))
{ {
logOut.Error("new plateStock value " + plateStock); logOut.Error("new plateStock value " + plateStock);
@ -3734,6 +3768,10 @@ namespace DeiNiu.wms.Logical
// logOut.Debug("拣货更新库存: " + stk); // logOut.Debug("拣货更新库存: " + stk);
logOut.Debug("更新库存前: " + stk);
logOut.Debug("更新库存前,虚拟库: " + stkVir);
stk.updateCountOut(); stk.updateCountOut();
stkVir.updateCountOut(); stkVir.updateCountOut();
@ -3834,7 +3872,30 @@ namespace DeiNiu.wms.Logical
} }
} }
flow.finishedTasksPlus(operId, pickCount / goods.bigCount); flow.finishedTasksPlus(operId, pickCount / goods.minOperateCount);
try
{
log.Debug("flow.owner: " + flow.owner);
//if (flow.owner != operId)
//下架的Job 可能被多人轮流获取，在一定的几率上会造成在 t_wmsflow 表，某一时刻对某个拣货人来说不存在拣货的job，造成下架绩效不能统计
// 虚拟一个拣货任务给每个拣货人，保证绩效得到统计
{
string todayPickTask = DateTime.Now.ToShortDateString() + "-" + operId;
if (new WmsFlow(todayPickTask).ID == 0)
{
flow.task = todayPickTask;
flow.owner = operId;
flow.taskCnt = 1;
flow.finishedCnt = 1;
flow.finishedPcs = 1;
flow.Add();
log.Debug(" add flow " + flow);
}
}
}
catch { }
scope.Complete(); scope.Complete();
} }
} }
@ -5967,7 +6028,7 @@ namespace DeiNiu.wms.Logical
// logIn.Error("WmsConstants.ERP_API_ORDER_NOTICE " + WmsConstants.ERP_API_ORDER_NOTICE); // logIn.Error("WmsConstants.ERP_API_ORDER_NOTICE " + WmsConstants.ERP_API_ORDER_NOTICE);
// logIn.Error("WmsConstants.ERP_API_KEY " + WmsConstants.ERP_API_KEY); // logIn.Error("WmsConstants.ERP_API_KEY " + WmsConstants.ERP_API_KEY);
// logIn.Error(url); logERP.Debug(url);
try try
{ {

68
WcfService1/BLL/lWmsOutRequest.cs
View File

@ -2261,7 +2261,8 @@ namespace DeiNiu.wms.Logical
requestDetail.bulkCount = requestDetail.count - requestDetail.batch1Count - requestDetail.batch2Count; requestDetail.bulkCount = requestDetail.count - requestDetail.batch1Count - requestDetail.batch2Count;
} }
if (requestDetail.goods.stockBatchAvCount == 0) // if (requestDetail.goods.stockBatchAvCount == 0)
if (requestDetail.goods.stockBatchAvCount <= 0)
{ {
requestDetail.bulkCount = requestDetail.count; requestDetail.bulkCount = requestDetail.count;
@ -2270,7 +2271,14 @@ namespace DeiNiu.wms.Logical
} }
else else
{ {
log.Error(" 有整库库存！！！！！！！！！！！！！？？？？？？？");
log.Error(" 有整库库存！！！！！！！！！！！！！？？？？？？？: " + requestDetail.goods);
//没有整库 辣得叫
requestDetail.bulkCount = requestDetail.count;
requestDetail.batch1Count = 0;
requestDetail.batch2Count = 0;
} }
@ -2281,17 +2289,17 @@ namespace DeiNiu.wms.Logical
// decimal batch3Cnt = requestDetail.bat; // decimal batch3Cnt = requestDetail.bat;
// logSpec.Debug(string.Format("{3} 出库需求明细: bulkCnt：{0} , batch1Cnt：{1} , batch2Cnt：{2} ", bulkCnt, batch1Cnt, batch2Cnt, goods.goodsId)); logSpec.Debug(string.Format("{3} 出库需求明细: bulkCnt：{0} , batch1Cnt：{1} , batch2Cnt：{2} ", bulkCnt, batch1Cnt, batch2Cnt, goods.goodsId));
if (goods.stockAvCount < requestDetail.count // 库存不足 if (goods.stockAvCount < requestDetail.count // 库存不足
&& !goods.isZhitong // && !goods.isZhitong
) )
{ {
// logSpec.Debug(string.Format("goods stockSumCount: {0},goods countOuting :{1}, required count:{2}", goods.stockSumCount, countOuting, requestDetail.count)); // logSpec.Debug(string.Format("goods stockSumCount: {0},goods countOuting :{1}, required count:{2}", goods.stockSumCount, countOuting, requestDetail.count));
// logSpec.Debug(string.Format("库存不足: 总库存:{0}, 需求库存{1}", goods.stockSumCount - countOuting, requestDetail.count)); logSpec.Debug(string.Format("库存不足: 可用总库存:{0}, 需求库存{1}", goods.stockAvCount, requestDetail.count));
if (isRep) if (isRep)
{ {
@ -2394,7 +2402,14 @@ namespace DeiNiu.wms.Logical
decimal lackCnt = requestDetail.lackCount; decimal lackCnt = requestDetail.lackCount;
logSpec.Debug("库存不足，出虚拟库......数量 " + lackCnt); logSpec.Debug(" 1 库存不足，出虚拟库......数量 " + lackCnt);
if (!goods.isWeightOut() && lackCnt % goods.minOperateCount > 0) //借货取整件
{
logSpec.Debug("库存 有非整件数量, 余数 " + lackCnt % goods.minOperateCount);
lackCnt = ((int)(lackCnt/goods.minOperateCount)) * goods.minOperateCount + goods.minOperateCount;
logSpec.Debug("2 库存不足，出虚拟库......数量 " + lackCnt);
}
WmsLocation loc = new WmsLocation(); WmsLocation loc = new WmsLocation();
@ -2534,7 +2549,7 @@ namespace DeiNiu.wms.Logical
goods = new WmsGoods(requestDetail.goodsId, requestDetail.skuId, requestDetail.batch); goods = new WmsGoods(requestDetail.goodsId, requestDetail.skuId, requestDetail.batch);
// logOut.Debug(" goods av bulk cnt after virtual operation : " + goods.stockBulkAvCount); logOut.Debug(" goods av bulk cnt after virtual operation : " + goods.stockBulkAvCount);
stkVir.countOuting += lackCnt; stkVir.countOuting += lackCnt;
@ -2755,6 +2770,14 @@ namespace DeiNiu.wms.Logical
} }
} }
if (!goods.isWeightOut() && goods.minOperateCount > 0)
{
tmpBulkCnt -= tmpBulkCnt % goods.minOperateCount;
tmpBatch1Cnt -= tmpBatch1Cnt % goods.minOperateCount;
tmpBatch2Cnt -= tmpBatch2Cnt % goods.minOperateCount;
}
if (tmpBulkCnt >= bulkCnt && tmpBatch1Cnt >= batch1Cnt && tmpBatch2Cnt >= batch2Cnt) if (tmpBulkCnt >= bulkCnt && tmpBatch1Cnt >= batch1Cnt && tmpBatch2Cnt >= batch2Cnt)
{ {
break; break;
@ -3040,7 +3063,7 @@ namespace DeiNiu.wms.Logical
} }
else else
{ {
logSpec.Debug("！！！！ 需要补零或库存不足"); logSpec.Debug("！！！！ 需要补零或库存不足或不满足最小分拣数量");
@ -3087,6 +3110,7 @@ namespace DeiNiu.wms.Logical
} }
if (goods.isZhitong) if (goods.isZhitong)
{ {
logOut.Debug("goods is zhitong!!!");
requestDetail.state = (int)enumOutStockDetailStatus.另单播种; requestDetail.state = (int)enumOutStockDetailStatus.另单播种;
} }
else if (!isRep) else if (!isRep)
@ -3125,14 +3149,14 @@ namespace DeiNiu.wms.Logical
List<WmsStock> stks = useTemp ? goods.tmpStocks : goods.stocks; List<WmsStock> stks = useTemp ? goods.tmpStocks : goods.stocks;
// logSpec.Debug(string.Format("开始定位 {0}，待定位数量 {1}", locVol, targetCnt)); logSpec.Debug(string.Format(" {2} 开始定位 {0}，待定位数量 {1}", locVol, targetCnt,goods.goodsName));
if (locVol == enumWhLocVol.零库) //零库出库单笔捡货不能超过9999 //TODO: to test the logic if (locVol == enumWhLocVol.零库) //零库出库单笔捡货不能超过9999 //TODO: to test the logic
{ {
decimal tmpCnt = 0; decimal tmpCnt = 0;
while (stks.Count > 0 && targetCnt > 0) // while (stks.Count > 0 && targetCnt > 0)
{ {
// logSpec.Debug(string.Format("targetcnt {0} ", targetCnt)); logSpec.Debug(string.Format("targetcnt {0} ", targetCnt));
if (WmsConstants.OUT_LIGHT_ENABLE && targetCnt/goods.minOperateCount > WmsConstants.MAX_PICK_CNT_BULK) if (WmsConstants.OUT_LIGHT_ENABLE && targetCnt/goods.minOperateCount > WmsConstants.MAX_PICK_CNT_BULK)
{ {
@ -3152,7 +3176,7 @@ namespace DeiNiu.wms.Logical
int i = 0; int i = 0;
foreach (WmsStock st in stks) foreach (WmsStock st in stks)
{ {
// logSpec.Debug(string.Format("零库。。。tmpCnt {0} ,location volType {1}, av cnt {2}", tmpCnt, st.location.volType, st.getAvCount())); logSpec.Debug(string.Format("零库。。。tmpCnt {0} ,location volType {1}, av cnt {2}", tmpCnt, st.location.volType, st.getAvCount()));
if (tmpCnt == 0) if (tmpCnt == 0)
{ {
break; break;
@ -3162,6 +3186,18 @@ namespace DeiNiu.wms.Logical
decimal cnt = st.getAvCount(); decimal cnt = st.getAvCount();
decimal reductCnt = cnt >= tmpCnt ? tmpCnt : cnt; decimal reductCnt = cnt >= tmpCnt ? tmpCnt : cnt;
/*if ( goods.minOperateCount > 1 && !goods.isWeightOut() )
{
reductCnt = ((int)(reductCnt/goods.minOperateCount)) * goods.minOperateCount;
}
*/
if ( !goods.isWeightOut() && goods.minOperateCount>0)
{
reductCnt -= reductCnt % goods.minOperateCount ;
}
if (reductCnt <= 0) if (reductCnt <= 0)
{ {
continue; continue;
@ -3193,7 +3229,7 @@ namespace DeiNiu.wms.Logical
{ {
logSpec.Debug("零库扣库存异常"); logSpec.Debug("零库扣库存异常");
// logSpec.Debug("零库扣库存异常"); // logSpec.Debug("零库扣库存异常");
throw new DeiNiuStockBulkCountException(); // throw new DeiNiuStockBulkCountException();
} }
targetCnt += tmpCnt; targetCnt += tmpCnt;
@ -3239,7 +3275,7 @@ namespace DeiNiu.wms.Logical
} }
} }
//logSpec.Debug(string.Format( "{0} 定位完成，未定位数量{1}" , locVol, targetCnt)); logSpec.Debug(string.Format( "{0} 定位完成，未定位数量{1}" , locVol, targetCnt));
return targetCnt; return targetCnt;
} }
@ -3315,14 +3351,14 @@ namespace DeiNiu.wms.Logical
} }
*/ */
r.partion = stock.location.partion; r.partion = stock.location.partion;
r.Add(); int i = r.Add();
if (stock.location.volType == (int)enumWhLocVol.虚拟) if (stock.location.volType == (int)enumWhLocVol.虚拟)
{ {
leftCnt = 0;// return; leftCnt = 0;// return;
} }
log.Debug(string.Format("2 goodsId {4},maxFull {0}, leftCnt:{1},recCnt {2}, locId {3},lackCnt {5},stock virtialCnt {6}", maxFull, leftCnt, recCnt, stock.locationId, goods.goodsId, lackCnt, stock.virtialCount)); log.Debug(string.Format("2 goodsId {4},maxFull {0}, leftCnt:{1},recCnt {2}, locId {3},lackCnt {5},stock virtialCnt {6}, new rec id {7}", maxFull, leftCnt, recCnt, stock.locationId, goods.goodsId, lackCnt, stock.virtialCount ,i));
} }

39
WcfService1/BLL/lWmsPlate.cs
View File

@ -985,6 +985,9 @@ namespace DeiNiu.wms.Logical
{ {
return enumRegPlateResult.已发车; return enumRegPlateResult.已发车;
} }
if (WmsConstants.IS_PLATE_IN_LINE) if (WmsConstants.IS_PLATE_IN_LINE)
{ {
List<WmsPlate> lst = getWmsPlate.getSubPlates(plateId); List<WmsPlate> lst = getWmsPlate.getSubPlates(plateId);
@ -1017,6 +1020,9 @@ namespace DeiNiu.wms.Logical
logPlate.Debug("装车后续处理。。。。开始, plateId " + tranP.plateId); logPlate.Debug("装车后续处理。。。。开始, plateId " + tranP.plateId);
WmsPlateStock_tmp wpt = new WmsPlateStock_tmp(); WmsPlateStock_tmp wpt = new WmsPlateStock_tmp();
// new lWmsInRequest(operId).retryNoticeErpValidIn(true);
using (TransactionScope scope = new TransactionScope()) using (TransactionScope scope = new TransactionScope())
{ {
@ -1053,18 +1059,21 @@ namespace DeiNiu.wms.Logical
wop = new WmsOutPickPort(dr); wop = new WmsOutPickPort(dr);
WmsStock st = new WmsStock(wop.locationId, Convert.ToInt32(dr["skuId"].ToString()), dr["goodsId"].ToString()); WmsStock st = new WmsStock(wop.locationId, Convert.ToInt32(dr["skuId"].ToString()), dr["goodsId"].ToString());
log.Debug(string.Format(" get 未拣货记录 {0}", wop.ToString()));
if (wop.virtialCnt > 0) //还回未出库虚拟库存 if (wop.virtialCnt > 0) //还回未出库虚拟库存
{ {
st.virtialCount -= wop.virtialCnt; st.virtialCount -= wop.virtialCnt;
st.virtialCount = st.virtialCount > 0 ? st.virtialCount : 0; st.virtialCount = st.virtialCount > 0 ? st.virtialCount : 0;
WmsStock virSt = st.getVirStock(st.goodsId); WmsStock virSt = st.getVirStock(st.goodsId);
log.Debug(string.Format(" 借入的虚拟库存: {0}", virSt.ToString()));
virSt.countOuting -= wop.virtialCnt; virSt.countOuting -= wop.virtialCnt;
// virSt.updateCountOut(); // virSt.updateCountOut();
virSt.Update(); virSt.Update();
} }
log.Debug(string.Format(" 实际库存: {0}", st.ToString()));
st.countOuting -= wop.count; st.countOuting -= wop.count;
st.countOuting = st.countOuting > 0 ? st.countOuting : 0; ; st.countOuting = st.countOuting > 0 ? st.countOuting : 0; ;
@ -1253,8 +1262,8 @@ namespace DeiNiu.wms.Logical
internal enumOutValidResult plateValidation(string plateId, int portId, int skuId, string productDate, string validDate, string batch, decimal validationCnt, string validReason, bool finialValidation = true) internal enumOutValidResult plateValidation(string plateId, int portId, int skuId, string productDate, string validDate, string batch, decimal validationCnt, string validReason, bool finialValidation = true)
{ {
log.Debug(string.Format("容器复核。。。。 portId {0}, skuId {1}, productDate {2}, validDate {3}, batch {4}, validationCnt {5}, validReason {6}, finialValidation {7}", log.Debug(string.Format("容器复核。。。。plateId {8}, portId {0}, skuId {1}, productDate {2}, validDate {3}, batch {4}, validationCnt {5}, validReason {6}, finialValidation {7}",
portId, skuId, productDate, validDate, batch, validationCnt, validReason, finialValidation)); portId, skuId, productDate, validDate, batch, validationCnt, validReason, finialValidation,plateId));
WmsPlateStock_tmp wst = new WmsPlateStock_tmp().getModelByOutPort(plateId, portId); WmsPlateStock_tmp wst = new WmsPlateStock_tmp().getModelByOutPort(plateId, portId);
WmsOutPickPort wpp = new WmsOutPickPort(portId); WmsOutPickPort wpp = new WmsOutPickPort(portId);
@ -1288,7 +1297,14 @@ namespace DeiNiu.wms.Logical
wsr = new WmsStockRecord(wpp.recordId); wsr = new WmsStockRecord(wpp.recordId);
stk = new WmsStock(wpp.locationId, skuId); stk = new WmsStock(wpp.locationId, skuId);
// stk.adjustingCnt += diffCnt; // stk.adjustingCnt += diffCnt;
if(skuId>0) //非借入出库
{
stk.count += diffCnt ; stk.count += diffCnt ;
}
log.Debug(string.Format("容器复核 volType {0}, 差异 {1}, pickdetail id {2} ,pick bulk cnt {3}, seeded cnt {4} pick batch cnt {5} ", wst.count, diffCnt, wpd.ID, wpd.bulkPicked, wpd.seeded, wpd.batchPicked)); log.Debug(string.Format("容器复核 volType {0}, 差异 {1}, pickdetail id {2} ,pick bulk cnt {3}, seeded cnt {4} pick batch cnt {5} ", wst.count, diffCnt, wpd.ID, wpd.bulkPicked, wpd.seeded, wpd.batchPicked));
@ -1313,6 +1329,7 @@ namespace DeiNiu.wms.Logical
if (diffCnt != 0) if (diffCnt != 0)
{ {
string description = string.Format("\n 业务类型：{0} {5}，拣货任务{1},计划数量 {2}， 实际数量{3}， 备注：{4}", "容器复核", string description = string.Format("\n 业务类型：{0} {5}，拣货任务{1},计划数量 {2}， 实际数量{3}， 备注：{4}", "容器复核",
wpp.ID, wpp.count, validationCnt, validReason, finialValidation ? " 按拣货数量发货" : " 实物多退少补,按需求发"); wpp.ID, wpp.count, validationCnt, validReason, finialValidation ? " 按拣货数量发货" : " 实物多退少补,按需求发");
@ -1323,7 +1340,7 @@ namespace DeiNiu.wms.Logical
log.Debug(" pick detail count updated rows " + i); log.Debug(" pick detail count updated rows " + i);
wst.Update(); wst.Update();
if (stk.Update() == 0) if (skuId>0 && stk.Update() == 0)
{ {
stk.locationId = new WmsLocation().getLocation(enumWhLocVol.零库, wpd.goods.part, wpd.goods.ABC).locationId; stk.locationId = new WmsLocation().getLocation(enumWhLocVol.零库, wpd.goods.part, wpd.goods.ABC).locationId;
stk.goodsId = wsr.goodsId; stk.goodsId = wsr.goodsId;
@ -1333,12 +1350,15 @@ namespace DeiNiu.wms.Logical
stk.validDate = validDate; stk.validDate = validDate;
stk.Add(); stk.Add();
} }
if (string.IsNullOrEmpty(stk.locationId))
{
}
wsr.description = description; wsr.description = description;
wsr.Update(); //更新记录 wsr.Update(); //更新记录
wsr.count = validationCnt; wsr.count = validationCnt;
wsr.count1 = diffCnt; wsr.count1 = diffCnt;
wsr.locationId = stk.locationId; wsr.locationId = wpp.locationId;
wsr.operater = operId; wsr.operater = operId;
wsr.rectype = (int)enumStockRecordType.容器复核; wsr.rectype = (int)enumStockRecordType.容器复核;
@ -1373,6 +1393,13 @@ namespace DeiNiu.wms.Logical
internal string getGoodsById(string goodsId) internal string getGoodsById(string goodsId)
{ {
// WmsGoods wg = new WmsGoods(goodsId);
//
// logIn.Debug(string.Format("wg name {0}, wg bigcount {1}, wg iszhitong {2}", wg.goodsName, wg.bigCount, wg.isZhitong));
// logIn.Debug(wg);
WmsGoods goods = new WmsGoods(goodsId, 0, ""); WmsGoods goods = new WmsGoods(goodsId, 0, "");
return goods.stockAvCount + ""; return goods.stockAvCount + "";

34
WcfService1/BLL/lWmsStock.cs
View File

@ -464,8 +464,29 @@ namespace DeiNiu.wms.Logical
{ {
// 变化进盘点虚拟库 // 变化进盘点虚拟库
logPandianStock(skuId, goodsId, adjustCnt); logPandianStock(skuId, goodsId, adjustCnt);
} }
try
{
string task = type + operId + Utils.Util.getShortDateString(this.wmsStock.getDateTime());// this.wmsStock.getDateTime
WmsFlow wmsFlow = new WmsFlow(task);
if (wmsFlow.ID == 0)
{
wmsFlow.type = (int)Util.getTaskType((int)type); // ; (int)EnumFlowTaskType.日常理货;
wmsFlow.typeName = Util.getTaskType((int)type).ToString();
wmsFlow.task = task;
wmsFlow.orderNo = task;
wmsFlow.state = (int)enumFlowTaskStatus.进行中;
wmsFlow.Add();
}
wmsFlow.finishedTasksPlus(operId, adjustCnt / new WmsGoods(goodsId).minOperateCount, true);
}
catch (Exception er)
{
log.Error(er);
}
scope.Complete(); scope.Complete();
} }
} }
@ -490,6 +511,15 @@ namespace DeiNiu.wms.Logical
_obj.deleteLocByType(locType); _obj.deleteLocByType(locType);
} }
/// <summary>
/// 清理零库存及负库存
/// </summary>
internal void cleanPandiane()
{
_obj.cleanPandiane();
}
public void logPandianStock(int skuId,string goodsId,decimal adjustCnt) public void logPandianStock(int skuId,string goodsId,decimal adjustCnt)
{ {
WmsLocation loc = new WmsLocation(); WmsLocation loc = new WmsLocation();
@ -1222,6 +1252,8 @@ namespace DeiNiu.wms.Logical
{ {
// initialLocaitons(); // initialLocaitons();
if (isDownOnly) if (isDownOnly)
{ {
downAll(start); downAll(start);

57
WcfService1/BLL/lWmsStockPandian.cs
View File

@ -236,6 +236,7 @@ namespace DeiNiu.wms.Logical
public bool finishPandian(string orderNo) public bool finishPandian(string orderNo)
{ {
log.Debug("to stop pandian " + orderNo);
WmsConstants.CURRENT_PANDIAN_ORDER = ""; WmsConstants.CURRENT_PANDIAN_ORDER = "";
WmsStockPandian pandian = new WmsStockPandian(orderNo); WmsStockPandian pandian = new WmsStockPandian(orderNo);
pandian.operater = operId; pandian.operater = operId;
@ -253,6 +254,10 @@ namespace DeiNiu.wms.Logical
new lWmsOutPickRequest(operId).noticeErpOrder(wor); new lWmsOutPickRequest(operId).noticeErpOrder(wor);
} }
else
{
log.Debug("------------------------- not to notice erp pandian result.");
}
WmsFlow flow = new WmsFlow(pandian.orderNo); WmsFlow flow = new WmsFlow(pandian.orderNo);
flow.finishedCnt = flow.taskCnt; flow.finishedCnt = flow.taskCnt;
flow.state = (int)enumFlowTaskStatus.已完成; flow.state = (int)enumFlowTaskStatus.已完成;
@ -261,7 +266,7 @@ namespace DeiNiu.wms.Logical
} }
WmsConstants.CURRENT_PANDIAN_ORDER = ""; WmsConstants.CURRENT_PANDIAN_ORDER = "";
log.Debug(" completed pandian " + orderNo);
return ret; return ret;
} }
@ -288,12 +293,15 @@ namespace DeiNiu.wms.Logical
if (wsp.type == (int)enumPandianType.全仓盘点) if (wsp.type == (int)enumPandianType.全仓盘点)
{ {
// delete pandian stk // delete pandian stk
lstk.cleanPandiane();
lstk.deleteLocByType(enumWhLocVol.盘点); lstk.deleteLocByType(enumWhLocVol.盘点);
lstk.deleteLocByType(enumWhLocVol.虚拟); lstk.deleteLocByType(enumWhLocVol.虚拟);
lstk.deleteLocBySkuId(0); lstk.deleteLocBySkuId(0);
} }
if (isRollBack) if (isRollBack)
@ -441,7 +449,7 @@ namespace DeiNiu.wms.Logical
wr.goodsId = wg.goodsId; wr.goodsId = wg.goodsId;
wr.validDate = dtValid; wr.validDate = dtValid;
wr.batch = batch; wr.batch = batch;
wr.mirrorId = mirrroId; // wr.mirrorId = mirrroId;
wr.productDate = prdDate; wr.productDate = prdDate;
@ -463,11 +471,13 @@ namespace DeiNiu.wms.Logical
int cnt = 0; int cnt = 0;
using (TransactionScope scope = new TransactionScope())
{
if (wr.ID > 0) if (wr.ID > 0)
{ {
cnt = wr.Update(); cnt = wr.Update();
}else }
else
{ {
@ -480,7 +490,7 @@ namespace DeiNiu.wms.Logical
sm.productDate = wr.productDate; sm.productDate = wr.productDate;
sm.validDate = wr.validDate; sm.validDate = wr.validDate;
sm.skuCode = wr.skuCode; sm.skuCode = wr.skuCode;
sm.shelfCount = wr.avCount; // sm.shelfCount = wr.avCount;
wr.mirrorId = sm.Add(); wr.mirrorId = sm.Add();
@ -489,6 +499,11 @@ namespace DeiNiu.wms.Logical
} }
flowTaskCount(wr.orderNo, wr.goodsId, count);
scope.Complete();
}
logPandian.Debug(" done... new pandian result: " + wr +" , success? " +(cnt > 0)); logPandian.Debug(" done... new pandian result: " + wr +" , success? " +(cnt > 0));
return cnt > 0; return cnt > 0;
@ -523,13 +538,17 @@ namespace DeiNiu.wms.Logical
} }
WmsFlow flow = new WmsFlow(wps.orderNo); WmsFlow flow = new WmsFlow(wps.orderNo);
WmsStockPandianResult wr = new WmsStockPandianResult(wps.orderNo, wps.locationId, wps.skuId,wps.goodsId);
using (TransactionScope scope = new TransactionScope()) using (TransactionScope scope = new TransactionScope())
{ {
flow.finishedCnt++; flow.finishedCnt++;
flow.Update(); flow.Update();
WmsStockPandianResult wr = new WmsStockPandianResult(wps.orderNo, wps.locationId, wps.skuId,wps.goodsId); flowTaskCount(wps.orderNo,wps.goodsId, count);
logPandian.Debug(" result item exists ? " +( wr.ID>0)); logPandian.Debug(" result item exists ? " +( wr.ID>0));
@ -623,6 +642,32 @@ namespace DeiNiu.wms.Logical
} }
void flowTaskCount(string panOrder,string goodsId,decimal count)
{
try
{
string task = EnumFlowTaskType.盘点采集 + operId + Utils.Util.getShortDateString(getWmsStockPandian.getDateTime());// this.wmsStock.getDateTime
WmsFlow wmsFlow = new WmsFlow(task);
if (wmsFlow.ID == 0)
{
wmsFlow.type = (int)EnumFlowTaskType.盘点采集; // ; (int)EnumFlowTaskType.日常理货;
wmsFlow.typeName = EnumFlowTaskType.盘点采集.ToString();
wmsFlow.task = task;
wmsFlow.orderNo = panOrder;
wmsFlow.state = (int)enumFlowTaskStatus.进行中;
wmsFlow.Add();
}
wmsFlow.finishedTasksPlus(operId, count / new WmsGoods(goodsId).minOperateCount, true);
}
catch (Exception er)
{
log.Error(er);
}
}

4
WcfService1/BLL/lbase.cs
View File

@ -954,7 +954,9 @@ namespace DeiNiu.wms.Logical
case 5: case 5:
WmsConstants.IN_STOCK_DEFAULT_WAREHOUSE = Convert.ToInt32(intValue); WmsConstants.IN_STOCK_DEFAULT_WAREHOUSE = Convert.ToInt32(intValue);
break; break;
case 6:
WmsConstants.IN_MAX_OVER_TIMES = Convert.ToInt32(intValue);
break;
} }

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
WcfService1/ScheduledService.svc.cs
View File

@ -327,7 +327,9 @@ namespace DeiNiu.Wcf
public void truncateDataForTestOnly() public void truncateDataForTestOnly()
{ {
try { try {
#if DEBUG
lir.createDataForTestOnly(); lir.createDataForTestOnly();
#endif
}catch(Exception er) }catch(Exception er)
{ {
log.Error(er); log.Error(er);

2
WcfService1/WmsWcfService.csproj
View File

@ -337,6 +337,8 @@
<DevelopmentServerPort>12349</DevelopmentServerPort> <DevelopmentServerPort>12349</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:12349/</IISUrl> <IISUrl>http://localhost:12349/</IISUrl>
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
<IISAppRootUrl>http://localhost:12349/</IISAppRootUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>False</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>

4
WcfService1/WmsWcfService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>D:\vssrc\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\ldj\source\vs\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>

2
winform/main.cs
View File

@ -193,6 +193,8 @@ namespace DeiNiu.wms.win
private new void showLogin() private new void showLogin()
{ {
// showErrorMsg(DateTime.Now.ToShortDateString());
int uid = LoginInfo.UserId; int uid = LoginInfo.UserId;
Login lg = new Login(); Login lg = new Login();
lg.ShowDialog(); lg.ShowDialog();

2
winform/入库/GoodsPreReceiveMultiDetails.cs
View File

@ -1082,7 +1082,7 @@ namespace DeiNiu.wms.win
setCurrentVenderPreIn(); setCurrentVenderPreIn();
btnIn.Enabled = selectedRequest.wms_state < (int)enumInStockOrderStatus.待验收; btnIn.Enabled = selectedRequest.wms_state < (int)enumInStockOrderStatus.已验收;
// clearShipInfo(); // clearShipInfo();

188
winform/出库/GoodsOutTasks.Designer.cs generated
View File

@ -81,6 +81,13 @@
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup(); this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@ -103,13 +110,6 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem();
this.btnQuery = new DevExpress.XtraEditors.SimpleButton(); this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
@ -155,6 +155,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@ -177,13 +184,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// ribbon // ribbon
@ -835,6 +835,79 @@
this.layoutControlGroup10, this.layoutControlGroup10,
this.layoutControlGroup2}); this.layoutControlGroup2});
// //
// layoutControlGroup2
//
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem17,
this.emptySpaceItem9,
this.emptySpaceItem5,
this.emptySpaceItem8});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup2.Size = new System.Drawing.Size(1775, 136);
this.layoutControlGroup2.Text = "分配任务";
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtEmpId;
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.MinSize = new System.Drawing.Size(111, 36);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.Size = new System.Drawing.Size(372, 69);
this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem24.Text = "员工名称";
this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.simpleButton1;
this.layoutControlItem25.Location = new System.Drawing.Point(392, 0);
this.layoutControlItem25.MinSize = new System.Drawing.Size(88, 46);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.Size = new System.Drawing.Size(136, 68);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbemp;
this.layoutControlItem17.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.Size = new System.Drawing.Size(372, 67);
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
// emptySpaceItem9
//
this.emptySpaceItem9.AllowHotTrack = false;
this.emptySpaceItem9.Location = new System.Drawing.Point(392, 68);
this.emptySpaceItem9.MaxSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.MinSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.Name = "emptySpaceItem9";
this.emptySpaceItem9.Size = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem5
//
this.emptySpaceItem5.AllowHotTrack = false;
this.emptySpaceItem5.Location = new System.Drawing.Point(528, 0);
this.emptySpaceItem5.Name = "emptySpaceItem5";
this.emptySpaceItem5.Size = new System.Drawing.Size(1247, 136);
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem8
//
this.emptySpaceItem8.AllowHotTrack = false;
this.emptySpaceItem8.Location = new System.Drawing.Point(372, 0);
this.emptySpaceItem8.Name = "emptySpaceItem8";
this.emptySpaceItem8.Size = new System.Drawing.Size(20, 136);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup10 // layoutControlGroup10
// //
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@ -1135,79 +1208,6 @@
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false; this.layoutControlItem30.TextVisible = false;
// //
// layoutControlGroup2
//
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem17,
this.emptySpaceItem9,
this.emptySpaceItem5,
this.emptySpaceItem8});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup2.Size = new System.Drawing.Size(1775, 136);
this.layoutControlGroup2.Text = "分配任务";
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtEmpId;
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.MinSize = new System.Drawing.Size(111, 36);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.Size = new System.Drawing.Size(372, 69);
this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem24.Text = "员工名称";
this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.simpleButton1;
this.layoutControlItem25.Location = new System.Drawing.Point(392, 0);
this.layoutControlItem25.MinSize = new System.Drawing.Size(88, 46);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.Size = new System.Drawing.Size(136, 68);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbemp;
this.layoutControlItem17.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.Size = new System.Drawing.Size(372, 67);
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
// emptySpaceItem9
//
this.emptySpaceItem9.AllowHotTrack = false;
this.emptySpaceItem9.Location = new System.Drawing.Point(392, 68);
this.emptySpaceItem9.MaxSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.MinSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.Name = "emptySpaceItem9";
this.emptySpaceItem9.Size = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem5
//
this.emptySpaceItem5.AllowHotTrack = false;
this.emptySpaceItem5.Location = new System.Drawing.Point(528, 0);
this.emptySpaceItem5.Name = "emptySpaceItem5";
this.emptySpaceItem5.Size = new System.Drawing.Size(1247, 136);
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem8
//
this.emptySpaceItem8.AllowHotTrack = false;
this.emptySpaceItem8.Location = new System.Drawing.Point(372, 0);
this.emptySpaceItem8.Name = "emptySpaceItem8";
this.emptySpaceItem8.Size = new System.Drawing.Size(20, 136);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
//
// btnQuery // btnQuery
// //
this.btnQuery.Location = new System.Drawing.Point(1144, 33); this.btnQuery.Location = new System.Drawing.Point(1144, 33);
@ -1272,6 +1272,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@ -1294,13 +1301,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

10
winform/在库/PerfomanceForm.cs
View File

@ -122,6 +122,7 @@ namespace DeiNiu.wms.win
GridColumn myCol17 = new GridColumn() { Caption = "盘点采集", Visible = true, FieldName = "盘点采集" }; GridColumn myCol17 = new GridColumn() { Caption = "盘点采集", Visible = true, FieldName = "盘点采集" };
GridColumn myCol18 = new GridColumn() { Caption = "直通分货", Visible = true, FieldName = "直通分货" }; GridColumn myCol18 = new GridColumn() { Caption = "直通分货", Visible = true, FieldName = "直通分货" };
GridColumn myCol19 = new GridColumn() { Caption = "客户集货", Visible = true, FieldName = "客户集货" }; GridColumn myCol19 = new GridColumn() { Caption = "客户集货", Visible = true, FieldName = "客户集货" };
GridColumn myCol22 = new GridColumn() { Caption = "日常理货", Visible = true, FieldName = "日常理货" };
GridColumn myCol20 = new GridColumn() { Caption = "日期", Visible = true, FieldName = "taskDay" }; GridColumn myCol20 = new GridColumn() { Caption = "日期", Visible = true, FieldName = "taskDay" };
@ -134,6 +135,7 @@ namespace DeiNiu.wms.win
} }
gridview.Columns.Add(myCol1); gridview.Columns.Add(myCol1);
gridview.Columns.Add(myCol21);
gridview.Columns.Add(myCol2); gridview.Columns.Add(myCol2);
gridview.Columns.Add(myCol3); gridview.Columns.Add(myCol3);
@ -142,6 +144,7 @@ namespace DeiNiu.wms.win
// gridview.Columns.Add(myCol6); // gridview.Columns.Add(myCol6);
// gridview.Columns.Add(myCol7); // gridview.Columns.Add(myCol7);
gridview.Columns.Add(myCol8); gridview.Columns.Add(myCol8);
gridview.Columns.Add(myCol22);
gridview.Columns.Add(myCol9); gridview.Columns.Add(myCol9);
gridview.Columns.Add(myCol10); gridview.Columns.Add(myCol10);
gridview.Columns.Add(myCol11); gridview.Columns.Add(myCol11);
@ -153,7 +156,7 @@ namespace DeiNiu.wms.win
gridview.Columns.Add(myCol17); gridview.Columns.Add(myCol17);
gridview.Columns.Add(myCol18); gridview.Columns.Add(myCol18);
gridview.Columns.Add(myCol19); gridview.Columns.Add(myCol19);
gridview.Columns.Add(myCol21);
//to show bottom scroll bar //to show bottom scroll bar
gridview.OptionsView.ColumnAutoWidth = false; gridview.OptionsView.ColumnAutoWidth = false;
gridview.BestFitColumns(); gridview.BestFitColumns();
@ -198,7 +201,10 @@ namespace DeiNiu.wms.win
//dt = lgt.Query(query, start, end); //string.IsNullOrEmpty(query) ? lgt.GetGoodType.getAllData(start, end) : lgt.g; //dt = lgt.Query(query, start, end); //string.IsNullOrEmpty(query) ? lgt.GetGoodType.getAllData(start, end) : lgt.g;
// dtDiffs.PrimaryKey = new DataColumn[] { dtDiffs.Columns["goodsId"], dtDiffs.Columns["batch"] }; // dtDiffs.PrimaryKey = new DataColumn[] { dtDiffs.Columns["goodsId"], dtDiffs.Columns["batch"] };
this.gridControl1.DataSource = dtRecs;//.DefaultView; DataView dv = dtRecs.DefaultView;
dv.Sort = "总数 desc";
this.gridControl1.DataSource = dv;//.DefaultView;
// gridView1.OptionsView.ColumnAutoWidth = true; // gridView1.OptionsView.ColumnAutoWidth = true;
initialDataGridColumns(this.gridView1); initialDataGridColumns(this.gridView1);
//update selected row index to the last updated one. //update selected row index to the last updated one.

882
winform/基础资料/GoodsForm.designer.cs generated
View File

@ -93,29 +93,15 @@
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup(); this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem17 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem18 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup();
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup(); this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
@ -155,15 +141,29 @@
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem(); this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem17 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem18 = new DevExpress.XtraLayout.EmptySpaceItem();
this.tabbedControlGroup3 = new DevExpress.XtraLayout.TabbedControlGroup(); this.tabbedControlGroup3 = new DevExpress.XtraLayout.TabbedControlGroup();
this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@ -215,29 +215,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
@ -277,15 +263,29 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@ -1037,288 +1037,13 @@
// //
this.tabbedControlGroup2.Location = new System.Drawing.Point(0, 0); this.tabbedControlGroup2.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup2.Name = "tabbedControlGroup2"; this.tabbedControlGroup2.Name = "tabbedControlGroup2";
this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup8; this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup2;
this.tabbedControlGroup2.SelectedTabPageIndex = 1; this.tabbedControlGroup2.SelectedTabPageIndex = 0;
this.tabbedControlGroup2.Size = new System.Drawing.Size(1924, 186); this.tabbedControlGroup2.Size = new System.Drawing.Size(1924, 186);
this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup2, this.layoutControlGroup2,
this.layoutControlGroup8}); this.layoutControlGroup8});
// //
// layoutControlGroup2
//
this.layoutControlGroup2.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.layoutControlGroup2.AppearanceGroup.Options.UseFont = true;
this.layoutControlGroup2.ExpandButtonVisible = true;
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
this.layoutControlItem6,
this.layoutControlItem4,
this.layoutControlItem21,
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem22,
this.layoutControlItem26,
this.layoutControlItem5,
this.layoutControlItem27,
this.layoutControlItem29,
this.layoutControlItem40,
this.layoutControlItem35,
this.layoutControlItem43,
this.layoutControlItem7,
this.emptySpaceItem12,
this.emptySpaceItem7,
this.layoutControlItem47,
this.emptySpaceItem17,
this.emptySpaceItem18});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.Size = new System.Drawing.Size(1885, 112);
this.layoutControlGroup2.Text = "查询";
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txtBarcode;
this.layoutControlItem3.Location = new System.Drawing.Point(574, 0);
this.layoutControlItem3.MaxSize = new System.Drawing.Size(174, 26);
this.layoutControlItem3.MinSize = new System.Drawing.Size(174, 26);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.Size = new System.Drawing.Size(174, 26);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem3.Text = "条码";
this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem3.TextSize = new System.Drawing.Size(36, 22);
this.layoutControlItem3.TextToControlDistance = 5;
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txtRegcode;
this.layoutControlItem6.Location = new System.Drawing.Point(748, 0);
this.layoutControlItem6.MaxSize = new System.Drawing.Size(240, 26);
this.layoutControlItem6.MinSize = new System.Drawing.Size(240, 26);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.Size = new System.Drawing.Size(240, 26);
this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem6.Text = "批准文号";
this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txtType;
this.layoutControlItem4.Location = new System.Drawing.Point(574, 26);
this.layoutControlItem4.MinSize = new System.Drawing.Size(93, 24);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.Size = new System.Drawing.Size(174, 24);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem4.Text = "剂型";
this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem4.TextSize = new System.Drawing.Size(36, 22);
this.layoutControlItem4.TextToControlDistance = 5;
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txtpinyin;
this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem21.MaxSize = new System.Drawing.Size(177, 26);
this.layoutControlItem21.MinSize = new System.Drawing.Size(177, 26);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.Size = new System.Drawing.Size(177, 26);
this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem21.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem21.Text = "拼音简码";
this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txtGoodId;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem1.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem1.Size = new System.Drawing.Size(177, 26);
this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem1.Text = "商品编号";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txtGoodName;
this.layoutControlItem2.Location = new System.Drawing.Point(177, 0);
this.layoutControlItem2.MaxSize = new System.Drawing.Size(214, 26);
this.layoutControlItem2.MinSize = new System.Drawing.Size(214, 26);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem2.Text = "商品名称";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.comboGoodsTypeQuery;
this.layoutControlItem22.CustomizationFormText = "商品类型";
this.layoutControlItem22.Location = new System.Drawing.Point(391, 0);
this.layoutControlItem22.MaxSize = new System.Drawing.Size(183, 26);
this.layoutControlItem22.MinSize = new System.Drawing.Size(183, 26);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.Size = new System.Drawing.Size(183, 26);
this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem22.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem22.Text = "商品类型";
this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.comboRepQuery;
this.layoutControlItem26.CustomizationFormText = "商品类型";
this.layoutControlItem26.Location = new System.Drawing.Point(391, 26);
this.layoutControlItem26.MaxSize = new System.Drawing.Size(183, 26);
this.layoutControlItem26.MinSize = new System.Drawing.Size(183, 26);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.Size = new System.Drawing.Size(183, 26);
this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem26.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem26.Text = "补货策略";
this.layoutControlItem26.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 22);
this.layoutControlItem26.TextToControlDistance = 5;
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtStockCondition;
this.layoutControlItem5.Location = new System.Drawing.Point(177, 26);
this.layoutControlItem5.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem5.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem5.Text = "存储条件";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txtManufacturer;
this.layoutControlItem27.Location = new System.Drawing.Point(748, 26);
this.layoutControlItem27.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.Size = new System.Drawing.Size(240, 26);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem27.Text = "生产厂家";
this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.comABCQ;
this.layoutControlItem29.Location = new System.Drawing.Point(0, 52);
this.layoutControlItem29.MaxSize = new System.Drawing.Size(177, 34);
this.layoutControlItem29.MinSize = new System.Drawing.Size(177, 34);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.Size = new System.Drawing.Size(177, 34);
this.layoutControlItem29.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem29.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem29.Text = "ABC类别";
this.layoutControlItem29.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem40
//
this.layoutControlItem40.Control = this.comWarehouseQuery;
this.layoutControlItem40.Location = new System.Drawing.Point(574, 50);
this.layoutControlItem40.MinSize = new System.Drawing.Size(141, 34);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.Size = new System.Drawing.Size(174, 36);
this.layoutControlItem40.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem40.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem40.Text = "存储分区";
this.layoutControlItem40.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.comLotQ;
this.layoutControlItem35.CustomizationFormText = "批次规则";
this.layoutControlItem35.Location = new System.Drawing.Point(177, 52);
this.layoutControlItem35.MaxSize = new System.Drawing.Size(214, 34);
this.layoutControlItem35.MinSize = new System.Drawing.Size(214, 34);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.Size = new System.Drawing.Size(214, 34);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem35.Text = "批次规则";
this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem43
//
this.layoutControlItem43.Control = this.comSeedsQ;
this.layoutControlItem43.Location = new System.Drawing.Point(391, 52);
this.layoutControlItem43.MaxSize = new System.Drawing.Size(183, 34);
this.layoutControlItem43.MinSize = new System.Drawing.Size(183, 34);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.Size = new System.Drawing.Size(183, 34);
this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem43.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem43.Text = "取总拣货";
this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.btnQuery;
this.layoutControlItem7.Location = new System.Drawing.Point(988, 0);
this.layoutControlItem7.MaxSize = new System.Drawing.Size(162, 63);
this.layoutControlItem7.MinSize = new System.Drawing.Size(162, 63);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.Size = new System.Drawing.Size(162, 63);
this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
//
// emptySpaceItem12
//
this.emptySpaceItem12.AllowHotTrack = false;
this.emptySpaceItem12.Location = new System.Drawing.Point(977, 52);
this.emptySpaceItem12.Name = "emptySpaceItem12";
this.emptySpaceItem12.Size = new System.Drawing.Size(11, 34);
this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem7
//
this.emptySpaceItem7.AllowHotTrack = false;
this.emptySpaceItem7.Location = new System.Drawing.Point(1150, 0);
this.emptySpaceItem7.MinSize = new System.Drawing.Size(106, 26);
this.emptySpaceItem7.Name = "emptySpaceItem7";
this.emptySpaceItem7.Size = new System.Drawing.Size(735, 112);
this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem47
//
this.layoutControlItem47.Control = this.comZhitongQ;
this.layoutControlItem47.Location = new System.Drawing.Point(748, 52);
this.layoutControlItem47.Name = "layoutControlItem47";
this.layoutControlItem47.Size = new System.Drawing.Size(229, 34);
this.layoutControlItem47.Text = "直通拣货";
this.layoutControlItem47.TextSize = new System.Drawing.Size(72, 22);
//
// emptySpaceItem17
//
this.emptySpaceItem17.AllowHotTrack = false;
this.emptySpaceItem17.Location = new System.Drawing.Point(0, 86);
this.emptySpaceItem17.Name = "emptySpaceItem17";
this.emptySpaceItem17.Size = new System.Drawing.Size(988, 26);
this.emptySpaceItem17.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem18
//
this.emptySpaceItem18.AllowHotTrack = false;
this.emptySpaceItem18.Location = new System.Drawing.Point(988, 63);
this.emptySpaceItem18.Name = "emptySpaceItem18";
this.emptySpaceItem18.Size = new System.Drawing.Size(162, 49);
this.emptySpaceItem18.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup8 // layoutControlGroup8
// //
this.layoutControlGroup8.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup8.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@ -1345,6 +1070,86 @@
this.layoutControlGroup3, this.layoutControlGroup3,
this.layoutControlGroup11}); this.layoutControlGroup11});
// //
// layoutControlGroup11
//
this.layoutControlGroup11.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13,
this.layoutControlItem28,
this.layoutControlItem42,
this.layoutControlItem44,
this.emptySpaceItem1,
this.emptySpaceItem2});
this.layoutControlGroup11.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup11.Name = "layoutControlGroup11";
this.layoutControlGroup11.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup11.Size = new System.Drawing.Size(1714, 38);
this.layoutControlGroup11.Text = "其他";
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.comABC;
this.layoutControlItem13.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem13.MaxSize = new System.Drawing.Size(198, 38);
this.layoutControlItem13.MinSize = new System.Drawing.Size(198, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 2, 2, 2);
this.layoutControlItem13.Size = new System.Drawing.Size(198, 38);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "ABC类别";
this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.btnSaveABC;
this.layoutControlItem28.Location = new System.Drawing.Point(198, 0);
this.layoutControlItem28.MaxSize = new System.Drawing.Size(53, 38);
this.layoutControlItem28.MinSize = new System.Drawing.Size(53, 38);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.Size = new System.Drawing.Size(53, 38);
this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
//
// layoutControlItem42
//
this.layoutControlItem42.Control = this.comSeeds;
this.layoutControlItem42.Location = new System.Drawing.Point(261, 0);
this.layoutControlItem42.MaxSize = new System.Drawing.Size(165, 38);
this.layoutControlItem42.MinSize = new System.Drawing.Size(165, 38);
this.layoutControlItem42.Name = "layoutControlItem42";
this.layoutControlItem42.Size = new System.Drawing.Size(165, 38);
this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem42.Text = "取总拣货";
this.layoutControlItem42.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem44
//
this.layoutControlItem44.Control = this.btnSeeds;
this.layoutControlItem44.Location = new System.Drawing.Point(426, 0);
this.layoutControlItem44.MaxSize = new System.Drawing.Size(53, 38);
this.layoutControlItem44.MinSize = new System.Drawing.Size(53, 38);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.Size = new System.Drawing.Size(53, 38);
this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem44.TextVisible = false;
//
// emptySpaceItem1
//
this.emptySpaceItem1.AllowHotTrack = false;
this.emptySpaceItem1.Location = new System.Drawing.Point(251, 0);
this.emptySpaceItem1.Name = "emptySpaceItem1";
this.emptySpaceItem1.Size = new System.Drawing.Size(10, 38);
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem2
//
this.emptySpaceItem2.AllowHotTrack = false;
this.emptySpaceItem2.Location = new System.Drawing.Point(479, 0);
this.emptySpaceItem2.Name = "emptySpaceItem2";
this.emptySpaceItem2.Size = new System.Drawing.Size(1235, 38);
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup6 // layoutControlGroup6
// //
this.layoutControlGroup6.CustomizationFormText = "商品信息修改"; this.layoutControlGroup6.CustomizationFormText = "商品信息修改";
@ -1826,86 +1631,6 @@
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false; this.layoutControlItem34.TextVisible = false;
// //
// layoutControlGroup11
//
this.layoutControlGroup11.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13,
this.layoutControlItem28,
this.layoutControlItem42,
this.layoutControlItem44,
this.emptySpaceItem1,
this.emptySpaceItem2});
this.layoutControlGroup11.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup11.Name = "layoutControlGroup11";
this.layoutControlGroup11.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup11.Size = new System.Drawing.Size(1714, 38);
this.layoutControlGroup11.Text = "其他";
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.comABC;
this.layoutControlItem13.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem13.MaxSize = new System.Drawing.Size(198, 38);
this.layoutControlItem13.MinSize = new System.Drawing.Size(198, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 2, 2, 2);
this.layoutControlItem13.Size = new System.Drawing.Size(198, 38);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "ABC类别";
this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.btnSaveABC;
this.layoutControlItem28.Location = new System.Drawing.Point(198, 0);
this.layoutControlItem28.MaxSize = new System.Drawing.Size(53, 38);
this.layoutControlItem28.MinSize = new System.Drawing.Size(53, 38);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.Size = new System.Drawing.Size(53, 38);
this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
//
// layoutControlItem42
//
this.layoutControlItem42.Control = this.comSeeds;
this.layoutControlItem42.Location = new System.Drawing.Point(261, 0);
this.layoutControlItem42.MaxSize = new System.Drawing.Size(165, 38);
this.layoutControlItem42.MinSize = new System.Drawing.Size(165, 38);
this.layoutControlItem42.Name = "layoutControlItem42";
this.layoutControlItem42.Size = new System.Drawing.Size(165, 38);
this.layoutControlItem42.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem42.Text = "取总拣货";
this.layoutControlItem42.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem44
//
this.layoutControlItem44.Control = this.btnSeeds;
this.layoutControlItem44.Location = new System.Drawing.Point(426, 0);
this.layoutControlItem44.MaxSize = new System.Drawing.Size(53, 38);
this.layoutControlItem44.MinSize = new System.Drawing.Size(53, 38);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.Size = new System.Drawing.Size(53, 38);
this.layoutControlItem44.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem44.TextVisible = false;
//
// emptySpaceItem1
//
this.emptySpaceItem1.AllowHotTrack = false;
this.emptySpaceItem1.Location = new System.Drawing.Point(251, 0);
this.emptySpaceItem1.Name = "emptySpaceItem1";
this.emptySpaceItem1.Size = new System.Drawing.Size(10, 38);
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem2
//
this.emptySpaceItem2.AllowHotTrack = false;
this.emptySpaceItem2.Location = new System.Drawing.Point(479, 0);
this.emptySpaceItem2.Name = "emptySpaceItem2";
this.emptySpaceItem2.Size = new System.Drawing.Size(1235, 38);
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem20 // layoutControlItem20
// //
this.layoutControlItem20.Control = this.btnSaveAll; this.layoutControlItem20.Control = this.btnSaveAll;
@ -1927,6 +1652,281 @@
this.emptySpaceItem8.Size = new System.Drawing.Size(132, 39); this.emptySpaceItem8.Size = new System.Drawing.Size(132, 39);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0); this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
// //
// layoutControlGroup2
//
this.layoutControlGroup2.AppearanceGroup.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.layoutControlGroup2.AppearanceGroup.Options.UseFont = true;
this.layoutControlGroup2.ExpandButtonVisible = true;
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
this.layoutControlItem6,
this.layoutControlItem4,
this.layoutControlItem21,
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem22,
this.layoutControlItem26,
this.layoutControlItem5,
this.layoutControlItem27,
this.layoutControlItem29,
this.layoutControlItem40,
this.layoutControlItem35,
this.layoutControlItem43,
this.layoutControlItem7,
this.emptySpaceItem12,
this.emptySpaceItem7,
this.layoutControlItem47,
this.emptySpaceItem17,
this.emptySpaceItem18});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.Size = new System.Drawing.Size(1885, 112);
this.layoutControlGroup2.Text = "查询";
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txtBarcode;
this.layoutControlItem3.Location = new System.Drawing.Point(574, 0);
this.layoutControlItem3.MaxSize = new System.Drawing.Size(174, 26);
this.layoutControlItem3.MinSize = new System.Drawing.Size(174, 26);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.Size = new System.Drawing.Size(174, 26);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem3.Text = "条码";
this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem3.TextSize = new System.Drawing.Size(36, 22);
this.layoutControlItem3.TextToControlDistance = 5;
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txtRegcode;
this.layoutControlItem6.Location = new System.Drawing.Point(748, 0);
this.layoutControlItem6.MaxSize = new System.Drawing.Size(240, 26);
this.layoutControlItem6.MinSize = new System.Drawing.Size(240, 26);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.Size = new System.Drawing.Size(240, 26);
this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem6.Text = "批准文号";
this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txtType;
this.layoutControlItem4.Location = new System.Drawing.Point(574, 26);
this.layoutControlItem4.MinSize = new System.Drawing.Size(93, 24);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.Size = new System.Drawing.Size(174, 24);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem4.Text = "剂型";
this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem4.TextSize = new System.Drawing.Size(36, 22);
this.layoutControlItem4.TextToControlDistance = 5;
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txtpinyin;
this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem21.MaxSize = new System.Drawing.Size(177, 26);
this.layoutControlItem21.MinSize = new System.Drawing.Size(177, 26);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.Size = new System.Drawing.Size(177, 26);
this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem21.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem21.Text = "拼音简码";
this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txtGoodId;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem1.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem1.Size = new System.Drawing.Size(177, 26);
this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem1.Text = "商品编号";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txtGoodName;
this.layoutControlItem2.Location = new System.Drawing.Point(177, 0);
this.layoutControlItem2.MaxSize = new System.Drawing.Size(214, 26);
this.layoutControlItem2.MinSize = new System.Drawing.Size(214, 26);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem2.Text = "商品名称";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.comboGoodsTypeQuery;
this.layoutControlItem22.CustomizationFormText = "商品类型";
this.layoutControlItem22.Location = new System.Drawing.Point(391, 0);
this.layoutControlItem22.MaxSize = new System.Drawing.Size(183, 26);
this.layoutControlItem22.MinSize = new System.Drawing.Size(183, 26);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.Size = new System.Drawing.Size(183, 26);
this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem22.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem22.Text = "商品类型";
this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.comboRepQuery;
this.layoutControlItem26.CustomizationFormText = "商品类型";
this.layoutControlItem26.Location = new System.Drawing.Point(391, 26);
this.layoutControlItem26.MaxSize = new System.Drawing.Size(183, 26);
this.layoutControlItem26.MinSize = new System.Drawing.Size(183, 26);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.Size = new System.Drawing.Size(183, 26);
this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem26.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem26.Text = "补货策略";
this.layoutControlItem26.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 22);
this.layoutControlItem26.TextToControlDistance = 5;
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtStockCondition;
this.layoutControlItem5.Location = new System.Drawing.Point(177, 26);
this.layoutControlItem5.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem5.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem5.Text = "存储条件";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txtManufacturer;
this.layoutControlItem27.Location = new System.Drawing.Point(748, 26);
this.layoutControlItem27.MinSize = new System.Drawing.Size(115, 24);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.Size = new System.Drawing.Size(240, 26);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem27.Text = "生产厂家";
this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.comABCQ;
this.layoutControlItem29.Location = new System.Drawing.Point(0, 52);
this.layoutControlItem29.MaxSize = new System.Drawing.Size(177, 34);
this.layoutControlItem29.MinSize = new System.Drawing.Size(177, 34);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.Size = new System.Drawing.Size(177, 34);
this.layoutControlItem29.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem29.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem29.Text = "ABC类别";
this.layoutControlItem29.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem40
//
this.layoutControlItem40.Control = this.comWarehouseQuery;
this.layoutControlItem40.Location = new System.Drawing.Point(574, 50);
this.layoutControlItem40.MinSize = new System.Drawing.Size(141, 34);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.Size = new System.Drawing.Size(174, 36);
this.layoutControlItem40.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem40.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem40.Text = "存储分区";
this.layoutControlItem40.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.comLotQ;
this.layoutControlItem35.CustomizationFormText = "批次规则";
this.layoutControlItem35.Location = new System.Drawing.Point(177, 52);
this.layoutControlItem35.MaxSize = new System.Drawing.Size(214, 34);
this.layoutControlItem35.MinSize = new System.Drawing.Size(214, 34);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.Size = new System.Drawing.Size(214, 34);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem35.Text = "批次规则";
this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem43
//
this.layoutControlItem43.Control = this.comSeedsQ;
this.layoutControlItem43.Location = new System.Drawing.Point(391, 52);
this.layoutControlItem43.MaxSize = new System.Drawing.Size(183, 34);
this.layoutControlItem43.MinSize = new System.Drawing.Size(183, 34);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.Size = new System.Drawing.Size(183, 34);
this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem43.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0);
this.layoutControlItem43.Text = "取总拣货";
this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.btnQuery;
this.layoutControlItem7.Location = new System.Drawing.Point(988, 0);
this.layoutControlItem7.MaxSize = new System.Drawing.Size(162, 63);
this.layoutControlItem7.MinSize = new System.Drawing.Size(162, 63);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.Size = new System.Drawing.Size(162, 63);
this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
//
// emptySpaceItem12
//
this.emptySpaceItem12.AllowHotTrack = false;
this.emptySpaceItem12.Location = new System.Drawing.Point(977, 52);
this.emptySpaceItem12.Name = "emptySpaceItem12";
this.emptySpaceItem12.Size = new System.Drawing.Size(11, 34);
this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem7
//
this.emptySpaceItem7.AllowHotTrack = false;
this.emptySpaceItem7.Location = new System.Drawing.Point(1150, 0);
this.emptySpaceItem7.MinSize = new System.Drawing.Size(106, 26);
this.emptySpaceItem7.Name = "emptySpaceItem7";
this.emptySpaceItem7.Size = new System.Drawing.Size(735, 112);
this.emptySpaceItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem47
//
this.layoutControlItem47.Control = this.comZhitongQ;
this.layoutControlItem47.Location = new System.Drawing.Point(748, 52);
this.layoutControlItem47.Name = "layoutControlItem47";
this.layoutControlItem47.Size = new System.Drawing.Size(229, 34);
this.layoutControlItem47.Text = "直通拣货";
this.layoutControlItem47.TextSize = new System.Drawing.Size(72, 22);
//
// emptySpaceItem17
//
this.emptySpaceItem17.AllowHotTrack = false;
this.emptySpaceItem17.Location = new System.Drawing.Point(0, 86);
this.emptySpaceItem17.Name = "emptySpaceItem17";
this.emptySpaceItem17.Size = new System.Drawing.Size(988, 26);
this.emptySpaceItem17.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem18
//
this.emptySpaceItem18.AllowHotTrack = false;
this.emptySpaceItem18.Location = new System.Drawing.Point(988, 63);
this.emptySpaceItem18.Name = "emptySpaceItem18";
this.emptySpaceItem18.Size = new System.Drawing.Size(162, 49);
this.emptySpaceItem18.TextSize = new System.Drawing.Size(0, 0);
//
// tabbedControlGroup3 // tabbedControlGroup3
// //
this.tabbedControlGroup3.Location = new System.Drawing.Point(0, 186); this.tabbedControlGroup3.Location = new System.Drawing.Point(0, 186);
@ -2051,29 +2051,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
@ -2113,15 +2099,29 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();