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

some updates4.16提交

This commit is contained in:
bobwang 2024-04-16 09:29:04 +08:00
parent 256d896fbb 5e8d241523
commit b6d0f525fc
16 changed files with 251 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,7 @@ namespace DeiNiu.wms.Data.Model
break;
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()
+ " GROUP BY ownerName ";
sqlCmd.CommandText = _strSql;
@ -516,7 +516,7 @@ namespace DeiNiu.wms.Data.Model
break;
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()
+ " GROUP BY ownerName ,taskDay";

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

@ -418,9 +418,17 @@ namespace DeiNiu.wms.Data.Model
get {
decimal tmp = _stockSumCount - _stockSumCountOuting + _stockSumAjustCount + _stockSumVirtialCount;
try
{
tmp = isWeightOut() ? tmp : ((int)(tmp / minOperateCount)) * minOperateCount;
}
catch
{
}
return tmp >= 0? tmp : 0;
}

4
Utils/Enums.cs
View File

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

3
Utils/Utils.cs
View File

@ -769,6 +769,9 @@ namespace DeiNiu.Utils
case enumStockRecordType.入库直接上架:
return EnumFlowTaskType.入库上架;
case enumStockRecordType.手持盘点:
return EnumFlowTaskType.日常理货;
default:
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 SEEDS_WEIGHT_OUT_RATE = 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_STOCK_PROCESS_MAX_TIME_MINUTE =5;

38
WcfService1/BLL/lWmsInRequest.cs
View File

@ -3237,7 +3237,8 @@ namespace DeiNiu.wms.Logical
{
logIn.Error(er);
scope.Dispose();
return er.Message;
// return er.Message;
throw er;
}
scope.Complete();
@ -3267,7 +3268,7 @@ namespace DeiNiu.wms.Logical
eprp.purch_d_id = id;
if (eprp.ID > 0)
{
LogHelper.debug(GetType(), String.Format("明细预到数量累积 "));
logIn.Debug( String.Format("明细预到数量累积 "));
eprp.arriveCount += arriveNumber; //同一个采购单下，未生成预到单的，明细预到数量累积 ,同一个预到单号下，预到明细ID唯一，预到数量不累加。
//prp.arriveCount = eprp.arriveCount > 0 ? eprp.arriveCount : 0;
if (eprp.arriveCount <= 0)
@ -3278,7 +3279,7 @@ namespace DeiNiu.wms.Logical
}
else if (arriveNumber > 0)
{
LogHelper.debug(GetType(), String.Format("新增预到明细数量 "));
logIn.Debug(String.Format("新增预到明细数量 "));
eprp.orderType = (int)ordeType;
eprp.arriveCount = arriveNumber;
@ -3300,7 +3301,7 @@ namespace DeiNiu.wms.Logical
/// <returns></returns>
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);
@ -3315,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);
LogHelper.debug(GetType(), String.Format("receiveByOrderPre,处理完毕......")+ preNo);
logIn.Debug( String.Format("receiveByOrderPre,处理完毕......")+ preNo);
return preNo;
@ -3337,13 +3338,18 @@ namespace DeiNiu.wms.Logical
{
if (WmsConstants.IN_STOCK_PREIN_AUTO_RECEIVE)
{
try {
/* try {
receivePreDetailAuto(preInNo);
} catch (Exception ex) {
logIn.Error(ex);
return "";
}
*/
// throw new Exception("TEST事务(进程 ID 57)与另一个进程被死锁在 锁 资源上，并且已被选作死锁牺牲品。请重新运行该事务");
receivePreDetailAuto(preInNo);
}
return preInNo;
@ -3366,7 +3372,7 @@ namespace DeiNiu.wms.Logical
Erp_purch_receive_pre eprd;
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();
}
@ -3855,12 +3861,24 @@ namespace DeiNiu.wms.Logical
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 = ((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
|| wg.isWeightOut() &&overRate < WmsConstants.OVER_WEIGHT_PERCENT_ALLOW
|| havePermission(WmsConstants.SPECIAL_OVER_RECEIVE)
@ -4070,6 +4088,7 @@ namespace DeiNiu.wms.Logical
/// <returns></returns>
internal bool retrieveValidByPreNo(string preInNo, int skuId = 0)
{
logIn.Debug("do retrieve by preInNo " + preInNo);
WmsInRequestDetail wid = new WmsInRequestDetail();
DataTable dt = wid.getByPreInOrder(preInNo);
@ -4139,6 +4158,7 @@ namespace DeiNiu.wms.Logical
|| wip.state == (int)enumInStockDetailStatus.部分上架)
{
//continue;
logIn.Debug(" return false, wip.state " + (enumInStockDetailStatus)wip.state);
return false;
}

2
WcfService1/BLL/lWmsOutPickRequest.cs
View File

@ -1056,7 +1056,7 @@ namespace DeiNiu.wms.Logical
{
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.Update();

23
WcfService1/BLL/lWmsStock.cs
View File

@ -464,8 +464,29 @@ namespace DeiNiu.wms.Logical
{
// 变化进盘点虚拟库
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();
}
}

43
WcfService1/BLL/lWmsStockPandian.cs
View File

@ -471,11 +471,13 @@ namespace DeiNiu.wms.Logical
int cnt = 0;
using (TransactionScope scope = new TransactionScope())
{
if (wr.ID > 0)
{
cnt = wr.Update();
}else
}
else
{
@ -497,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));
return cnt > 0;
@ -531,13 +538,17 @@ namespace DeiNiu.wms.Logical
}
WmsFlow flow = new WmsFlow(wps.orderNo);
WmsStockPandianResult wr = new WmsStockPandianResult(wps.orderNo, wps.locationId, wps.skuId,wps.goodsId);
using (TransactionScope scope = new TransactionScope())
{
flow.finishedCnt++;
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));
@ -631,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:
WmsConstants.IN_STOCK_DEFAULT_WAREHOUSE = Convert.ToInt32(intValue);
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/WmsWcfService.csproj.user
View File

@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>E:\ldj\source\vs\WcfService1\Properties\PublishProfiles\IISProfile1.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\ldj\source\vs\WcfService1\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>

2
winform/入库/GoodsPreReceiveMultiDetails.cs
View File

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

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

@ -81,6 +81,13 @@
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
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.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@ -103,13 +110,6 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = 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();
((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
@ -155,6 +155,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).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.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@ -177,13 +184,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).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();
//
// ribbon
@ -835,6 +835,79 @@
this.layoutControlGroup10,
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
//
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@ -1135,79 +1208,6 @@
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
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
//
this.btnQuery.Location = new System.Drawing.Point(1144, 33);
@ -1272,6 +1272,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).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.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@ -1294,13 +1301,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).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.PerformLayout();

10
winform/在库/PerfomanceForm.cs
View File

@ -122,6 +122,7 @@ namespace DeiNiu.wms.win
GridColumn myCol17 = new GridColumn() { Caption = "盘点采集", Visible = true, FieldName = "盘点采集" };
GridColumn myCol18 = 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" };
@ -134,6 +135,7 @@ namespace DeiNiu.wms.win
}
gridview.Columns.Add(myCol1);
gridview.Columns.Add(myCol21);
gridview.Columns.Add(myCol2);
gridview.Columns.Add(myCol3);
@ -142,6 +144,7 @@ namespace DeiNiu.wms.win
// gridview.Columns.Add(myCol6);
// gridview.Columns.Add(myCol7);
gridview.Columns.Add(myCol8);
gridview.Columns.Add(myCol22);
gridview.Columns.Add(myCol9);
gridview.Columns.Add(myCol10);
gridview.Columns.Add(myCol11);
@ -153,7 +156,7 @@ namespace DeiNiu.wms.win
gridview.Columns.Add(myCol17);
gridview.Columns.Add(myCol18);
gridview.Columns.Add(myCol19);
gridview.Columns.Add(myCol21);
//to show bottom scroll bar
gridview.OptionsView.ColumnAutoWidth = false;
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;
// 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;
initialDataGridColumns(this.gridView1);
//update selected row index to the last updated one.