diff --git a/Model/wms/data/WmsOutPickPort_Imp.cs b/Model/wms/data/WmsOutPickPort_Imp.cs index e35dd47..de45017 100644 --- a/Model/wms/data/WmsOutPickPort_Imp.cs +++ b/Model/wms/data/WmsOutPickPort_Imp.cs @@ -732,7 +732,7 @@ namespace DeiNiu.wms.Data.Model break; - + /* case 2210:// get by light _strSql = " SELECT * FROM [v_stockOutPortSumLight] WHERE state =@state"; if (Convert.ToInt16(mObj.CmdParameters[1].ToString()) > 0) @@ -761,14 +761,7 @@ namespace DeiNiu.wms.Data.Model _strSql = " SELECT * FROM [v_stockOutPortSumNoLightByPickOrder] WHERE state =@state"; - /* - if (Convert.ToInt16(mObj.CmdParameters[1].ToString()) > 0) - { - _strSql += " and part=@partion "; - sqlCmd.Parameters.AddWithValue("@partion", mObj.CmdParameters[1]); - - }*/ - + if (Convert.ToInt16(mObj.CmdParameters[4].ToString()) > 0) @@ -794,6 +787,37 @@ namespace DeiNiu.wms.Data.Model sqlCmd.CommandText = _strSql; break; + */ + case 2230:// 分区按jobNo 获取任务 + + + _strSql = " SELECT * FROM " + mObj.CmdParameters[6] + " WHERE state =@state"; + + if (Convert.ToInt16(mObj.CmdParameters[4].ToString()) > 0) + { + _strSql += " and warehouse=@warehouse "; + sqlCmd.Parameters.AddWithValue("@warehouse", mObj.CmdParameters[4]); + + } + + if (Convert.ToInt16(mObj.CmdParameters[2].ToString()) > 0) + { + _strSql += " and lineId=@lineId "; + sqlCmd.Parameters.AddWithValue("@lineId", mObj.CmdParameters[2]); + + } + _strSql += " and orderDate=@orderDate "; + + _strSql += mObj.CmdParameters[5].ToString(); + _strSql += " order by lineId,customerName "; + sqlCmd.Parameters.AddWithValue("@orderDate", mObj.CmdParameters[3]); + + sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]); + + sqlCmd.CommandText = _strSql; + break; + + case 2300:// _strSql = " SELECT id as portId, * FROM v_stockoutport WHERE jobNo =@jobNo " + " and elabId>0 order by lineid desc"; diff --git a/Model/wms/data/WmsOutPickRequest_Imp.cs b/Model/wms/data/WmsOutPickRequest_Imp.cs index 497e79c..4f6971d 100644 --- a/Model/wms/data/WmsOutPickRequest_Imp.cs +++ b/Model/wms/data/WmsOutPickRequest_Imp.cs @@ -234,6 +234,7 @@ namespace DeiNiu.wms.Data.Model sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.PAGER_SIZE/2); // sqlCmd.Parameters.AddWithValue("@cnt", 200); sqlCmd.CommandText = _strSql; + break; case 302: //get pickrequest for stock reduct diff --git a/Model/wms/data/WmsOutRequest_Imp.cs b/Model/wms/data/WmsOutRequest_Imp.cs index 042eca4..f9307d5 100644 --- a/Model/wms/data/WmsOutRequest_Imp.cs +++ b/Model/wms/data/WmsOutRequest_Imp.cs @@ -165,6 +165,13 @@ namespace DeiNiu.wms.Data.Model sqlCmd.CommandText = _strSql; + break; + case 505: + + _strSql = " SELECT * FROM v_stockOutRequest_Available_tmp order by timeFromErp desc"; + sqlCmd.CommandText = _strSql; + + break; case 600: //get new orders to sync with erp @@ -481,13 +488,30 @@ namespace DeiNiu.wms.Data.Model case 1900: - _strSql = "select * from [v_stockOutRequestDetail_available] where skuId is null or skuId=0"; + _strSql = "select * from [v_stockOutRequestDetail_available] where 1=1 and" + + " batch is not null " + + " and productDate is not null" + + " and validDate is not null " + + "and ( skuId is null or skuId=0) "; sqlCmd.CommandText = _strSql; break; - case 2000: + case 1910: + _strSql = " select * FROM [custErp_suzou2].[dbo].[t_erp_sale_d] d where 1=1" + + " and exists(select 1 from v_stockOutRequestDetail_available where id=d.id) " + + " and batch is not null " + + " and product_date is not null " + + " and save_date is not null" + + " and ( skuId is null or skuId=0) "; + + sqlCmd.CommandText = _strSql; + + break; + + + case 2000: _strSql = "select * from t_wmsOutRequest where pickOrderno=@pickorder"; sqlCmd.CommandText = _strSql; diff --git a/Model/wms/tables/WmsOutPickPort.cs b/Model/wms/tables/WmsOutPickPort.cs index d7f98a5..35a2b0e 100644 --- a/Model/wms/tables/WmsOutPickPort.cs +++ b/Model/wms/tables/WmsOutPickPort.cs @@ -427,13 +427,22 @@ namespace DeiNiu.wms.Data.Model cmdParameters[3] = date; cmdParameters[4] = wareHouse; cmdParameters[5] = query; - - if (isLight) + string viewName = "[v_stockOutPortSumLight]"; + if (isLight) { - return CustQuery(2210).Tables[0]; - } + viewName = "[v_stockOutPortSumLight]";//按jobNo亮灯摘果 - return CustQuery(2220).Tables[0]; + } else + if (wareHouse > 0) + { + viewName = "[v_stockOutPortSumNoLightByJobNo]";//分区按jobNo 获取任务 + } + else + { + viewName = "[v_stockOutPortSumNoLightByPickOrder]"; //按pickOrder 全仓按单拣选 + } + cmdParameters[6] = viewName; + return CustQuery(2230).Tables[0]; } diff --git a/Model/wms/tables/WmsOutRequest.cs b/Model/wms/tables/WmsOutRequest.cs index fccfb10..f0cecb0 100644 --- a/Model/wms/tables/WmsOutRequest.cs +++ b/Model/wms/tables/WmsOutRequest.cs @@ -131,6 +131,7 @@ namespace DeiNiu.wms.Data.Model return CustQuery(504).Tables[0]; } + /// /// 自动审核立即分拣类型的出库单，即刻进入订单合并分拣环节 /// 分店客户需集单出库的情况不适用，按订单约定日期出库的需要手动核准 @@ -440,9 +441,10 @@ namespace DeiNiu.wms.Data.Model public DataTable getAvErpDetailNoSkuId() { - return CustQuery(1900).Tables[0]; + return CustQuery(1910).Tables[0]; } + public DataTable getRequestByPickOrder(string pickOrderNo) { diff --git a/Utils/Utils.cs b/Utils/Utils.cs index aa243fe..04dbdda 100644 --- a/Utils/Utils.cs +++ b/Utils/Utils.cs @@ -643,9 +643,11 @@ namespace DeiNiu.Utils string prefix = getPrefix(orderType); - string orderno = string.Format("{0}{1:D2}{2:D2}{6}{3:D2}{4}{5:D6}", prefix, DateTime.Now.Year - 2000, - DateTime.Now.Month, DateTime.Now.Day, GenerateRandomNumber(2), seq, GenerateRandomNumber(1)); - //LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}", seq,orderno)); + // string orderno = string.Format("{0}{1:D2}{2:D2}{6}{3:D2}{4}{5:D6}", prefix, DateTime.Now.Year - 2000, + // DateTime.Now.Month, DateTime.Now.Day, GenerateRandomNumber(2), seq, GenerateRandomNumber(1)); + //LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}", seq,orderno)); + string orderno = string.Format("{0}{1:D2}{2:D2}{3:D2}{4}{5:D6}", prefix, DateTime.Now.Year - 2000, + DateTime.Now.Month, DateTime.Now.Day, GenerateRandomNumber(1), seq); return orderno; } public static enumStockRecordType getStockRecordType(int outStoretype) diff --git a/Utils/WmsConstants.cs b/Utils/WmsConstants.cs index 49e1033..647226a 100644 --- a/Utils/WmsConstants.cs +++ b/Utils/WmsConstants.cs @@ -269,6 +269,7 @@ namespace DeiNiu.Utils public static bool OUT_STOCK_BULK_PDA_SCAN = false; public static bool OUT_STOCK_BATCH_FIFO = true; public static bool OUT_LIGHT_ENABLE = true; + public static bool OUT_BULK_REP_FROM_BATCH = true; public static bool VALIDATION_SEEDS_PACK_DESK_SPLIT = false; //是否独立启用打包台 diff --git a/WcfService1/BLL/lLot.cs b/WcfService1/BLL/lLot.cs index 880ee8e..ed29ecc 100644 --- a/WcfService1/BLL/lLot.cs +++ b/WcfService1/BLL/lLot.cs @@ -224,6 +224,7 @@ namespace DeiNiu.wms.Logical // internal Dictionary getSKU(Dictionary skuValues, string goodsId) internal Dictionary getSKU(string prdDate, string goodsId, string batch ) { + goodsId = goodsId.Trim(); Dictionary skuValues = getSku(prdDate, goodsId, batch); WmsGoods wg = new WmsGoods(goodsId); diff --git a/WcfService1/BLL/lWmsOutPickRequest.cs b/WcfService1/BLL/lWmsOutPickRequest.cs index b50fd44..010d066 100644 --- a/WcfService1/BLL/lWmsOutPickRequest.cs +++ b/WcfService1/BLL/lWmsOutPickRequest.cs @@ -29,8 +29,8 @@ namespace DeiNiu.wms.Logical private WmsOutDesk _seedsDesk; private WmsOutPickDetail_tmp _outPickTmp; private WmsPlate _plate; - - WmsPlate plate + private log4net.ILog loglw = log4net.LogManager.GetLogger("lightWave"); + WmsPlate plate { get { @@ -360,7 +360,7 @@ namespace DeiNiu.wms.Logical } - LogHelper.debug(typeof(lWmsOutPickRequest), "开始新波次。。。。。。。。。。。。。。。。。。"); + loglw.Debug( "开始新波次。。。。。。。。。。。。。。。。。。"); // System.Diagnostics.Debug.WriteLine("begin make new wave .....{0}" ,DateTime.Now); @@ -370,11 +370,14 @@ namespace DeiNiu.wms.Logical DataSet ds = outRequest.getRequests4DpsWave(enumOrderType.销售出库, wr); - DataTable dtSeeds = ds.Tables[1]; + DataTable dtOne = ds.Tables[0]; List requests = new List(); - + + //TODO: check below, where is the table[1] for seeds? + /* + DataTable dtSeeds = ds.Tables[1]; foreach (DataRow dr in dtSeeds.Rows)//播种订单 { WmsOutPickRequest wo = new WmsOutPickRequest(dr); @@ -383,8 +386,9 @@ namespace DeiNiu.wms.Logical requests.Add(wo); } } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理 SEEDS 订单数量：{0}",dtSeeds.Rows.Count)); + loglw.Debug( string.Format("待处理 SEEDS 订单数量：{0}",dtSeeds.Rows.Count)); + */ foreach (string order in noSeeds) // 等待播种订单转入摘果 { WmsOutPickRequest wo = new WmsOutPickRequest(order); @@ -397,17 +401,17 @@ namespace DeiNiu.wms.Logical requests.Add(new WmsOutPickRequest(dr)); } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理 摘果 订单数量：{0}", dtOne.Rows.Count)); + loglw.Debug( string.Format("待处理 摘果 订单数量：{0}", dtOne.Rows.Count)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理 等待Seeds 订单数量：{0}", noSeeds.Count)); + loglw.Debug( string.Format("待处理 等待Seeds 订单数量：{0}", noSeeds.Count)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理订单数量：{0}", requests.Count)); + loglw.Debug( string.Format("待处理订单数量：{0}", requests.Count)); if (requests.Count == 0) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("无订单需要处理，波次结束")); + loglw.Debug( string.Format("无订单需要处理，波次结束")); checkRepAndNoStockOrders(); return; } @@ -429,7 +433,7 @@ namespace DeiNiu.wms.Logical // List strecs = null; waveOrder = Util.getOrderNo(enumCreateOrderType.dpsOrder, _obj.getNextSeq(enumCreateOrderType.dpsOrder)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("new waveNo {0}", waveOrder)); + loglw.Debug( string.Format("new waveNo {0}", waveOrder)); //waveOrder = "WV" + System.DateTime.Now.ToString("yyyyMMddHHmmss"); int pickDetailMaxInWave = WmsConstants.MAX_CONTROL_DATA_IN_A_WAVE; //一个控制器最大存储1200条 @@ -478,25 +482,25 @@ namespace DeiNiu.wms.Logical string lastAddress = ""; foreach (WmsOutPickRequest request in requests) { - LogHelper.debug(this.GetType(), string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); + loglw.Debug( string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); _desk = getRandomFreeDesk(); if (desk.ID == 0) // no free pick desk { - LogHelper.debug(this.GetType(), " no pick desk available....."); + loglw.Debug( " no pick desk available....."); if (isSeedsEnabled) { if (seedsDesk.ID == 0) { - LogHelper.debug(this.GetType(), "no pick no seeds desk ,break 1"); + loglw.Debug( "no pick no seeds desk ,break 1"); break; } else { if (request.seedsLabelId != WmsConstants.SEEDS_LABLEID_MARK_VALUE)//仅剩下摘果的订单 { - LogHelper.debug(this.GetType(), "no pick no seeds order ,break 2"); - break; + loglw.Debug( "to process next request...."); + continue;// why not continiue? } } } @@ -514,7 +518,7 @@ namespace DeiNiu.wms.Logical { if (seedsDesk.ID == 0) { - LogHelper.debug(this.GetType(), " no seed desk available.....,continue"); + loglw.Debug( " no seed desk available.....,continue"); continue; } @@ -678,7 +682,7 @@ namespace DeiNiu.wms.Logical if (isReachLimit) { isReachLimit = false; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("超过限制，继续下条数据.... ")); + loglw.Debug( string.Format("超过限制，继续下条数据.... ")); continue; } @@ -703,14 +707,14 @@ namespace DeiNiu.wms.Logical ) */ { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入播种拣选 seedsRequests.Count：{0} ,_seedsDesk.ID :{1}" + + loglw.Debug( string.Format("进入播种拣选 seedsRequests.Count：{0} ,_seedsDesk.ID :{1}" + ",seedsRequests contains {2}: {3}", seedsRequests.Count, _seedsDesk.ID, request.pickOrderNo, seedsRequests.Contains(request))); foreach (WmsOutPickRequest wor in seedsRequests) { if (wor.pickOrderNo == request.pickOrderNo) { - LogHelper.debug(typeof(lWmsOutPickRequest), "seedsRequests.Contains(request): " + seedsRequests.Contains(request)); - LogHelper.debug(typeof(lWmsOutPickRequest), "seedsRequests contains " + request.pickOrderNo); + loglw.Debug( "seedsRequests.Contains(request): " + seedsRequests.Contains(request)); + loglw.Debug( "seedsRequests contains " + request.pickOrderNo); continue; } } @@ -771,13 +775,13 @@ namespace DeiNiu.wms.Logical else //no free seeds desk { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("播种拣选,no free seeds desk")); + loglw.Debug( string.Format("播种拣选,no free seeds desk")); if (!isSeedPickInSameWave) //播、摘同波次 { break; } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); + loglw.Debug( string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); continue; } @@ -789,12 +793,12 @@ namespace DeiNiu.wms.Logical { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" + loglw.Debug( string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" , seedsRequests.Count, lstBulk.Count, sumBulkCnt)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入摘果式拣选")); + loglw.Debug( string.Format("进入摘果式拣选")); - LogHelper.debug(typeof(lWmsOutPickRequest), + loglw.Debug( string.Format("last address: {0},current address: {1}", lastAddress, request.customerName + request.custAddress)); @@ -811,7 +815,7 @@ namespace DeiNiu.wms.Logical } - LogHelper.debug(typeof(lWmsOutPickRequest), " 摘果式 保存整货和零货出库分拣数据"); + loglw.Debug( " 摘果式 保存整货和零货出库分拣数据"); WmsOutPickLable_tmp wpl; foreach (WmsStockRecord rec in lstBulk) @@ -892,7 +896,7 @@ namespace DeiNiu.wms.Logical request.Update(); bulkRequests.Add(request); int count = outRequest.saveTempData4Validation(waveOrder, request.pickOrderNo); - LogHelper.debug(typeof(lWmsOutPickRequest), "---------- insert into detail temp data count " + count); + loglw.Debug( "---------- insert into detail temp data count " + count); } //if (lstPort.Count > 0) // { @@ -932,18 +936,18 @@ namespace DeiNiu.wms.Logical */ if (isSeedsEnabled && seedsRequests.Count > 0) { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("not full seeds pool detetcted, size {0}", seedsRequests.Count)); + loglw.Debug( String.Format("not full seeds pool detetcted, size {0}", seedsRequests.Count)); if (seedsRequests.Count == seedsCount || seedsRequests.Count >= seedsDesk.seedsMinCount) // || seedsRequests.Count < seedsCount && canSeedPickLessThanseedsCount { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format(" mini seeds cnt meet for seeds desk {0} , size {1}",_seedsDesk.ID, seedsRequests.Count)); + loglw.Debug( String.Format(" mini seeds cnt meet for seeds desk {0} , size {1}",_seedsDesk.ID, seedsRequests.Count)); createSeedsRequest(seedsRequests, seedsBulks, lstSeedsBulk);//生成播种拣选单 } else { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format(" seedsWaiting size {0} ", seedsWaiting.Count)); + loglw.Debug( String.Format(" seedsWaiting size {0} ", seedsWaiting.Count)); foreach (WmsOutPickRequest pr in seedsRequests) { @@ -959,7 +963,7 @@ namespace DeiNiu.wms.Logical { seedsWaiting.Remove(pr.pickOrderNo); noSeeds.Add(pr.pickOrderNo); - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("pr {0} waited {1},noseeds marked", pr.pickOrderNo, dte.CompareTo(DateTime.Now))); + loglw.Debug( String.Format("pr {0} waited {1},noseeds marked", pr.pickOrderNo, dte.CompareTo(DateTime.Now))); } } @@ -978,13 +982,13 @@ namespace DeiNiu.wms.Logical } catch (Exception er) { - LogHelper.debug(typeof(lWmsOutPickRequest), er.Message); + loglw.Debug( er.Message); } - // LogHelper.debug(typeof(lWmsOutPickRequest), "---------- insert into detail temp data count " + count); + // loglw.Debug( "---------- insert into detail temp data count " + count); TimeSpan ts1 = DateTime.Now - d0; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + ":" + ts1.TotalMilliseconds, totoalTime)); + loglw.Debug( string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + ":" + ts1.TotalMilliseconds, totoalTime)); // insert tmp data for validation //outRequest.saveTempData4Validation(waveOrder); @@ -1003,7 +1007,7 @@ namespace DeiNiu.wms.Logical TimeSpan ts0 = DateTime.Now - d0; //System.Diagnostics.Debug.WriteLine(string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 全部处理完毕，耗时{1} ..", DateTime.Now, ts0.TotalSeconds + ":" + ts0.TotalMilliseconds)); + loglw.Debug( string.Format("{0} 全部处理完毕，耗时{1} ..", DateTime.Now, ts0.TotalSeconds + ":" + ts0.TotalMilliseconds)); // TaskCallBack(); try { @@ -1011,20 +1015,20 @@ namespace DeiNiu.wms.Logical } catch (Exception er) { - LogHelper.debug(typeof(lWmsOutPickRequest), er.StackTrace.ToString()); + loglw.Debug( er.StackTrace.ToString()); } - LogHelper.debug(typeof(lWmsOutPickRequest), "wave cnt is " + waveCnt); + loglw.Debug( "wave cnt is " + waveCnt); foreach(int key in comCnt.Keys) { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("com {0}, rec cnt {1} ", key, comCnt[key])); + loglw.Debug( String.Format("com {0}, rec cnt {1} ", key, comCnt[key])); } foreach (int key in labelCnt.Keys) { if(labelCnt[key]>2) - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("labelid {0}, rec cnt {1}" , key, labelCnt[key])); + loglw.Debug( String.Format("labelid {0}, rec cnt {1}" , key, labelCnt[key])); } @@ -1100,17 +1104,17 @@ namespace DeiNiu.wms.Logical //一个波次可以摘取订单数 = 空闲分播台数量*每个分播台可分播客户数， 分播台的订单用颜色区分 // - LogHelper.debug(typeof(lWmsOutPickRequest), "开始新波次。。。。。。。。。。。。。。。。。。"); + loglw.Debug( "开始新波次。。。。。。。。。。。。。。。。。。"); // System.Diagnostics.Debug.WriteLine("begin make new wave .....{0}" ,DateTime.Now); List requests = outRequest.getRequests4Wave(); //.getRequestObjects(enumOutOrderType.拣货单, enumOutStockRequestStatus.波次处理); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理订单数量：{0}", requests.Count)); + loglw.Debug( string.Format("待处理订单数量：{0}", requests.Count)); if (requests.Count == 0) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("无订单需要处理，波次结束")); + loglw.Debug( string.Format("无订单需要处理，波次结束")); checkRepAndNoStockOrders(); return; } @@ -1153,7 +1157,7 @@ namespace DeiNiu.wms.Logical List lstLabel; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("waveNo {0}", waveOrder)); + loglw.Debug( string.Format("waveNo {0}", waveOrder)); //播种常量，达不到最小订单摘取需求的合并成大订单先统一摘取再分播 bool isSeedsEnabled = WmsConstants.OUT_BULK_SEEDS_PICK_ON; @@ -1221,8 +1225,8 @@ namespace DeiNiu.wms.Logical - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo )); - LogHelper.debug(this.GetType(), string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); + // loglw.Debug( string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo )); + loglw.Debug( string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); DataTable dt = stkRecord.getPickStockRecods(request.pickOrderNo, true).Tables[0];//取出库明细 @@ -1261,7 +1265,7 @@ namespace DeiNiu.wms.Logical // TimeSpan tsss = DateTime.Now - d1; - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" {0} prepare bulklist count :{1}, cost {2}", request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); + // loglw.Debug( string.Format(" {0} prepare bulklist count :{1}, cost {2}", request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); // DateTime d2 = DateTime.Now; lstBulk = new List(); @@ -1309,7 +1313,7 @@ namespace DeiNiu.wms.Logical //tsss = DateTime.Now - d2; - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" {0} {1},prepare bulklist2 count :{2}, cost {3}", DateTime.Now, request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); + // loglw.Debug( string.Format(" {0} {1},prepare bulklist2 count :{2}, cost {3}", DateTime.Now, request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); /* @@ -1337,14 +1341,14 @@ namespace DeiNiu.wms.Logical ) //订单货品零货数量小 { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入播种拣选 seedsRequests.Count：{0} ,_seedsDesk.ID :{1}" + + loglw.Debug( string.Format("进入播种拣选 seedsRequests.Count：{0} ,_seedsDesk.ID :{1}" + ",seedsRequests contains {2}: {3}", seedsRequests.Count, _seedsDesk.ID, request.pickOrderNo, seedsRequests.Contains(request))); foreach (WmsOutPickRequest wor in seedsRequests) { if (wor.pickOrderNo == request.pickOrderNo) { - LogHelper.debug(typeof(lWmsOutPickRequest), "seedsRequests.Contains(request): " + seedsRequests.Contains(request)); - LogHelper.debug(typeof(lWmsOutPickRequest), "seedsRequests contains " + request.pickOrderNo); + loglw.Debug( "seedsRequests.Contains(request): " + seedsRequests.Contains(request)); + loglw.Debug( "seedsRequests contains " + request.pickOrderNo); continue; } } @@ -1402,13 +1406,13 @@ namespace DeiNiu.wms.Logical else //no free seeds desk { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("播种拣选,no free seeds desk")); + loglw.Debug( string.Format("播种拣选,no free seeds desk")); if (!isSeedPickInSameWave) //播、摘同波次 { break; } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); + loglw.Debug( string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); continue; } @@ -1430,21 +1434,21 @@ namespace DeiNiu.wms.Logical if (desk.color == 0) // no exist free desk, then process bulk { - // LogHelper.debug(typeof(lWmsOutPickRequest), "摘果式拣选，无可用复核台"); + // loglw.Debug( "摘果式拣选，无可用复核台"); if (isSeedsEnabled && _seedsDesk.ID > 0) // 启用播种后，由播种台是否空闲来判断是否结束循环 { - LogHelper.debug(typeof(lWmsOutPickRequest), " 播种台有空，继续处理剩余订单"); + loglw.Debug( " 播种台有空，继续处理剩余订单"); continue; } else { - LogHelper.debug(typeof(lWmsOutPickRequest), " 无可用复核台、播种台，波次生成结束"); + loglw.Debug( " 无可用复核台、播种台，波次生成结束"); break; } } else { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("pickorderno: {0},desk id :{1}", request.pickOrderNo, desk.ID)); + loglw.Debug( string.Format("pickorderno: {0},desk id :{1}", request.pickOrderNo, desk.ID)); } if (WmsConstants.OUT_LIGHT_ENABLE) @@ -1547,18 +1551,18 @@ namespace DeiNiu.wms.Logical if (isReachLimit) { isReachLimit = false; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("超过限制，继续下条数据.... ")); + loglw.Debug( string.Format("超过限制，继续下条数据.... ")); continue; } } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" + loglw.Debug( string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" , seedsRequests.Count, lstBulk.Count, sumBulkCnt)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入摘果式拣选")); + loglw.Debug( string.Format("进入摘果式拣选")); - LogHelper.debug(typeof(lWmsOutPickRequest), + loglw.Debug( string.Format("last address: {0},current address: {1}", lastAddress, request.customerName + request.custAddress)); @@ -1575,7 +1579,7 @@ namespace DeiNiu.wms.Logical } - LogHelper.debug(typeof(lWmsOutPickRequest), " 摘果式 保存整货和零货出库分拣数据"); + loglw.Debug( " 摘果式 保存整货和零货出库分拣数据"); WmsOutPickLable_tmp wpl; foreach (WmsStockRecord rec in lstBulk) @@ -1656,7 +1660,7 @@ namespace DeiNiu.wms.Logical request.Update(); bulkRequests.Add(request); int count= outRequest.saveTempData4Validation(waveOrder,request.pickOrderNo); - LogHelper.debug(typeof(lWmsOutPickRequest), "---------- insert into detail temp data count " + count); + loglw.Debug( "---------- insert into detail temp data count " + count); } //if (lstPort.Count > 0) // { @@ -1719,7 +1723,7 @@ namespace DeiNiu.wms.Logical { seedsWaiting.Remove(pr.pickOrderNo); noSeeds.Add(pr.pickOrderNo); - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("pr {0} waited {1},noseeds marked",pr.pickOrderNo,dte.CompareTo(DateTime.Now))); + loglw.Debug( String.Format("pr {0} waited {1},noseeds marked",pr.pickOrderNo,dte.CompareTo(DateTime.Now))); } } @@ -1738,13 +1742,13 @@ namespace DeiNiu.wms.Logical } catch (Exception er) { - LogHelper.debug(typeof(lWmsOutPickRequest), er.Message); + loglw.Debug( er.Message); } - // LogHelper.debug(typeof(lWmsOutPickRequest), "---------- insert into detail temp data count " + count); + // loglw.Debug( "---------- insert into detail temp data count " + count); TimeSpan ts1 = DateTime.Now - d0; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + ":" + ts1.TotalMilliseconds, totoalTime)); + loglw.Debug( string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + ":" + ts1.TotalMilliseconds, totoalTime)); // insert tmp data for validation //outRequest.saveTempData4Validation(waveOrder); @@ -1782,7 +1786,7 @@ namespace DeiNiu.wms.Logical // processAllBatchOrders(requests, waveOrder); TimeSpan ts0 = DateTime.Now - d0; //System.Diagnostics.Debug.WriteLine(string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 全部处理完毕，耗时{1} ..", DateTime.Now, ts0.TotalSeconds + ":" + ts0.TotalMilliseconds)); + loglw.Debug( string.Format("{0} 全部处理完毕，耗时{1} ..", DateTime.Now, ts0.TotalSeconds + ":" + ts0.TotalMilliseconds)); // TaskCallBack(); try { @@ -1790,7 +1794,7 @@ namespace DeiNiu.wms.Logical } catch (Exception er) { - LogHelper.debug(typeof(lWmsOutPickRequest),er.StackTrace.ToString()); + loglw.Debug(er.StackTrace.ToString()); } @@ -1879,7 +1883,7 @@ namespace DeiNiu.wms.Logical void createSeedsRequest(List seedsRequests, Dictionary seedsBulks,List lstBulk ) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("开始生成播种拣选单,seedsRequests.count :{0},seedsBulks.count:{1}", + loglw.Debug( string.Format("开始生成播种拣选单,seedsRequests.count :{0},seedsBulks.count:{1}", seedsRequests.Count, seedsBulks.Count)); List lstLabel = new List(); @@ -1893,7 +1897,7 @@ namespace DeiNiu.wms.Logical seedPickRequest.pickOrderNo = Util.getOrderNo(enumCreateOrderType.seedsPickOrder, seedPickRequest.getNextSeq(enumCreateOrderType.seedsPickOrder)); seedPickRequest.orderType = (int)enumOrderType.销售出库; seedPickRequest.outStoreType = (int)enumOutStoreType.播种拣货出库; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("播种拣选单 :{0} ", seedPickRequest.pickOrderNo)); + loglw.Debug( string.Format("播种拣选单 :{0} ", seedPickRequest.pickOrderNo)); WmsWave ww = new WmsWave(); ww.waveNo = waveOrder; @@ -1977,7 +1981,7 @@ namespace DeiNiu.wms.Logical int count = outRequest.saveTempData4Validation(waveOrder, request.pickOrderNo); request.updateBulkPickStatus(request.pickOrderNo, enumOutStockPickStatus.正在分拣,operId); - LogHelper.debug(typeof(lWmsOutPickRequest), "---------- insert into detail temp data count " + count); + loglw.Debug( "---------- insert into detail temp data count " + count); } @@ -2037,12 +2041,12 @@ namespace DeiNiu.wms.Logical public void checkRepAndNoStockOrders() { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format(" start check stock for ...... " + enumOutStockRequestStatus.等待补货)); + loglw.Debug( String.Format(" start check stock for ...... " + enumOutStockRequestStatus.等待补货)); bool isOk; List prs = outRequest.getRequestObjects( enumOutStockRequestStatus.等待补货); foreach (WmsOutPickRequest pr in prs) { - // LogHelper.debug(typeof(lWmsOutPickRequest), String.Format(" start check stock for pr {0} ...... ", pr.pickOrderNo)); + // loglw.Debug( String.Format(" start check stock for pr {0} ...... ", pr.pickOrderNo)); isOk = true; foreach (WmsOutPickDetail pd in pr.outDetails) { @@ -2060,7 +2064,7 @@ namespace DeiNiu.wms.Logical } if (isOk) { - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format( "pr {0} stock bulk available, start stock process... ",pr.pickOrderNo ) ); + loglw.Debug( String.Format( "pr {0} stock bulk available, start stock process... ",pr.pickOrderNo ) ); pr.state = (int)enumOutStockRequestStatus.待定位; // pr.operater = LoginInfo.UserId; @@ -2070,10 +2074,10 @@ namespace DeiNiu.wms.Logical new lWmsOutRequest(operId).requestOutStock(pr); //在库存扣除后，将分拣单状态置为等待波次 - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format("pr {0} stock process done...,new status {1} ", pr.pickOrderNo, pr.state)); + loglw.Debug( String.Format("pr {0} stock process done...,new status {1} ", pr.pickOrderNo, pr.state)); } } - LogHelper.debug(typeof(lWmsOutPickRequest), String.Format(" end check stock for ...... " + enumOutStockRequestStatus.等待补货)); + loglw.Debug( String.Format(" end check stock for ...... " + enumOutStockRequestStatus.等待补货)); } /* @@ -2082,7 +2086,7 @@ namespace DeiNiu.wms.Logical //开始处理整库出货部分 DateTime t0 = DateTime.Now; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" 整库部分出库 处理开始...................." ) ); + loglw.Debug( string.Format(" 整库部分出库 处理开始...................." ) ); List requests = (List)obs; @@ -2093,7 +2097,7 @@ namespace DeiNiu.wms.Logical processPickRequest(request); } TimeSpan ts = DateTime.Now - t0; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" 整库部分出库 处理完毕 cost {0}....................", ts.TotalSeconds + " : " + ts.TotalMilliseconds)); + loglw.Debug( string.Format(" 整库部分出库 处理完毕 cost {0}....................", ts.TotalSeconds + " : " + ts.TotalMilliseconds)); } @@ -2102,7 +2106,7 @@ namespace DeiNiu.wms.Logical { //开始处理全整库出货部分 DateTime t0 = DateTime.Now; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format (" 整库出库 处理开始...................." )); + loglw.Debug( string.Format (" 整库出库 处理开始...................." )); List requests = (List)obs; @@ -2119,7 +2123,7 @@ namespace DeiNiu.wms.Logical } TimeSpan ts = DateTime.Now - t0; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format (" 整库部分出库 处理完毕 cost {0}....................", ts.TotalSeconds + " : " + ts.TotalMilliseconds)); + loglw.Debug( string.Format (" 整库部分出库 处理完毕 cost {0}....................", ts.TotalSeconds + " : " + ts.TotalMilliseconds)); } */ @@ -4262,9 +4266,9 @@ namespace DeiNiu.wms.Logical public enumOutSeedsStatus updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2) { - LogHelper.debug(this.GetType(), "updateSeedingStatus... operId is " + operId); - LogHelper.debug(this.GetType(), "begin to update seeding pick.....>"); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("seedsPickNo:{0},goodsId:{1},batch:{2},labId:{3},address:{4},count:{5},checkBy2:{6}" + loglw.Debug( "updateSeedingStatus... operId is " + operId); + loglw.Debug( "begin to update seeding pick.....>"); + loglw.Debug( string.Format("seedsPickNo:{0},goodsId:{1},batch:{2},labId:{3},address:{4},count:{5},checkBy2:{6}" ,seedsPickNo, goodsId, batch, labId, address, count, checkedBy2)); enumOutSeedsStatus rt = enumOutSeedsStatus.状态更新成功; @@ -4272,7 +4276,7 @@ namespace DeiNiu.wms.Logical if (cnt == 0) { - LogHelper.debug(this.GetType(), " 更新失败，。。。。。。。return failure"); + loglw.Debug( " 更新失败，。。。。。。。return failure"); return enumOutSeedsStatus.处理失败; } @@ -4285,7 +4289,7 @@ namespace DeiNiu.wms.Logical outPickTmp.completeSeeding(seedsPickNo, goodsId, batch); rt = enumOutSeedsStatus.商品完成分播; } - LogHelper.debug(this.GetType(), " " + rt); + loglw.Debug( " " + rt); if (outRequest.getUnSeedsCnt(seedsPickNo, labId) == 0) // LabId对应的分拣单播种完毕 { @@ -4346,7 +4350,7 @@ namespace DeiNiu.wms.Logical color = pr.desk; } rt = enumOutSeedsStatus.分拣单完成分播; - LogHelper.debug(this.GetType(), " " + rt); + loglw.Debug( " " + rt); } catch (Exception e) { @@ -4370,13 +4374,13 @@ namespace DeiNiu.wms.Logical ww.Update(); rt = enumOutSeedsStatus.播种单完成分播; - LogHelper.debug(this.GetType(), " " + rt); - LogHelper.debug(typeof(lWmsOutPickRequest), " 测试日志输出"); + loglw.Debug( " " + rt); + loglw.Debug( " 测试日志输出"); } scope.Complete(); } - LogHelper.debug(typeof(lWmsOutPickRequest), " return value is " + rt.ToString()); - LogHelper.debug(typeof(lWmsOutPickRequest), "end update seeding pick.....>"); + loglw.Debug( " return value is " + rt.ToString()); + loglw.Debug( "end update seeding pick.....>"); return rt; //elabid pk order is not finished. } @@ -4558,7 +4562,7 @@ namespace DeiNiu.wms.Logical public List newPartPickWave() { - LogHelper.debug(typeof(lWmsOutPickRequest), "开始新波次。。。。。。。。。。。。。。。。。。"); + loglw.Debug( "开始新波次。。。。。。。。。。。。。。。。。。"); List lst = outRequest.getRecords4PartWave(enumOrderType.销售出库); //.getRequestObjects(enumOutOrderType.拣货单, enumOutStockRequestStatus.波次处理); @@ -4582,7 +4586,7 @@ namespace DeiNiu.wms.Logical List lstParts = new List(); - LogHelper.debug(typeof(lWmsOutPickRequest), "开始新波次。。。。。。。。。。。。。。。。。。"); + loglw.Debug( "开始新波次。。。。。。。。。。。。。。。。。。"); // List lst = outRequest.getRecords4PartWave(); //.getRequestObjects(enumOutOrderType.拣货单, enumOutStockRequestStatus.波次处理); List batchRequests = new List(); @@ -4596,7 +4600,7 @@ namespace DeiNiu.wms.Logical } if (recCnt == 0) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("无订单需要处理，波次结束")); + loglw.Debug( string.Format("无订单需要处理，波次结束")); checkRepAndNoStockOrders(); return lstParts; } @@ -4632,7 +4636,7 @@ namespace DeiNiu.wms.Logical List lstLabel = new List(); List lstBulk = new List(); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("waveNo {0}", waveOrder)); + loglw.Debug( string.Format("waveNo {0}", waveOrder)); //播种常量，达不到最小订单摘取需求的合并成大订单先统一摘取再分播 bool isSeedsEnabled = WmsConstants.OUT_BULK_SEEDS_PICK_ON; @@ -4682,7 +4686,7 @@ namespace DeiNiu.wms.Logical } } - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理拣货笔数：{0}", lstBulk.Count)); + loglw.Debug( string.Format("待处理拣货笔数：{0}", lstBulk.Count)); #region 建立零库电子拣选临时数据 int lastId = 0; WmsOutPickLable_tmp wpl; @@ -4740,11 +4744,11 @@ namespace DeiNiu.wms.Logical } #endregion - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" + loglw.Debug( string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" , seedsRequests.Count, lstBulk.Count, sumBulkCnt)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入摘果式拣选")); + loglw.Debug( string.Format("进入摘果式拣选")); #region 保存整货和零货出库分拣数据 @@ -4883,7 +4887,7 @@ namespace DeiNiu.wms.Logical // processAllBatchOrders(requests, waveOrder); TimeSpan ts0 = DateTime.Now - d0; //System.Diagnostics.Debug.WriteLine(string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); + loglw.Debug( string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); // TaskCallBack(); return lstParts; @@ -4939,17 +4943,17 @@ namespace DeiNiu.wms.Logical //一个波次可以摘取订单数 = 空闲分播台数量*每个分播台可分播客户数， 分播台的订单用颜色区分 // - LogHelper.debug(typeof(lWmsOutPickRequest), "开始新波次。。。。。。。。。。。。。。。。。。"); + loglw.Debug( "开始新波次。。。。。。。。。。。。。。。。。。"); // System.Diagnostics.Debug.WriteLine("begin make new wave .....{0}" ,DateTime.Now); List requests = outRequest.getRequests4Wave(); //.getRequestObjects(enumOutOrderType.拣货单, enumOutStockRequestStatus.波次处理); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("待处理订单数量：{0}", requests.Count)); + loglw.Debug( string.Format("待处理订单数量：{0}", requests.Count)); if (requests.Count == 0) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("无订单需要处理，波次结束")); + loglw.Debug( string.Format("无订单需要处理，波次结束")); checkRepAndNoStockOrders(); return; } @@ -4988,7 +4992,7 @@ namespace DeiNiu.wms.Logical List lstLabel; List lstBulk; - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("waveNo {0}", waveOrder)); + // loglw.Debug( string.Format("waveNo {0}", waveOrder)); //播种常量，达不到最小订单摘取需求的合并成大订单先统一摘取再分播 bool isSeedsEnabled = WmsConstants.OUT_BULK_SEEDS_PICK_ON; @@ -5043,8 +5047,8 @@ namespace DeiNiu.wms.Logical - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo )); - LogHelper.debug(this.GetType(), string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); + // loglw.Debug( string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo )); + loglw.Debug( string.Format("开始处理零库出库 {0} ------------", request.pickOrderNo)); DataTable dt = stkRecord.getPickStockRecods(request.pickOrderNo, true).Tables[0];//取出库明细 @@ -5070,7 +5074,7 @@ namespace DeiNiu.wms.Logical // TimeSpan tsss = DateTime.Now - d1; - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" {0} prepare bulklist count :{1}, cost {2}", request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); + // loglw.Debug( string.Format(" {0} prepare bulklist count :{1}, cost {2}", request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); // DateTime d2 = DateTime.Now; lstBulk = new List(); @@ -5099,7 +5103,7 @@ namespace DeiNiu.wms.Logical //tsss = DateTime.Now - d2; - // LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" {0} {1},prepare bulklist2 count :{2}, cost {3}", DateTime.Now, request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); + // loglw.Debug( string.Format(" {0} {1},prepare bulklist2 count :{2}, cost {3}", DateTime.Now, request.pickOrderNo, lstBulk.Count, tsss.TotalSeconds)); /* @@ -5220,7 +5224,7 @@ namespace DeiNiu.wms.Logical if (isReachLimit) { isReachLimit = false; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("超过限制，继续下条数据.... ")); + loglw.Debug( string.Format("超过限制，继续下条数据.... ")); continue; } @@ -5228,7 +5232,7 @@ namespace DeiNiu.wms.Logical * */ #endregion endcheck - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" + loglw.Debug( string.Format(" lstBulk.Count:{1},sumBulkCnt:{2}" , seedsRequests.Count, lstBulk.Count, sumBulkCnt)); if (isSeedsEnabled @@ -5238,7 +5242,7 @@ namespace DeiNiu.wms.Logical ) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("进入播种拣选 seedsRequests.Count：{0} ", seedsRequests.Count)); + loglw.Debug( string.Format("进入播种拣选 seedsRequests.Count：{0} ", seedsRequests.Count)); //播种筛选 if (_seedsDesk.ID > 0) //exist free seeds desk @@ -5288,9 +5292,9 @@ namespace DeiNiu.wms.Logical else //no free seeds desk { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("播种拣选,no free seeds desk")); + loglw.Debug( string.Format("播种拣选,no free seeds desk")); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); + loglw.Debug( string.Format("订单{0} 将进入下一播种波次，开始处理下个订单", request.pickOrderNo)); continue; } @@ -5350,7 +5354,7 @@ namespace DeiNiu.wms.Logical TimeSpan ts1 = DateTime.Now - d0; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + " : " + ts1.TotalMilliseconds, totoalTime)); + loglw.Debug( string.Format("{0} 零库处理完毕----- cost {1} .....{2}", DateTime.Now, ts1.TotalSeconds + " : " + ts1.TotalMilliseconds, totoalTime)); // insert tmp data for validation /// outRequest.saveTempData4Validation(waveOrder); @@ -5369,7 +5373,7 @@ namespace DeiNiu.wms.Logical TimeSpan ts0 = DateTime.Now - d0; //System.Diagnostics.Debug.WriteLine(string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); + loglw.Debug( string.Format("{0} 全部处理完毕{1} ..", DateTime.Now, ts0.TotalSeconds + " : " + ts0.TotalMilliseconds)); // TaskCallBack(); } @@ -5378,7 +5382,7 @@ namespace DeiNiu.wms.Logical private void createSeedsLabelDetail(List seedsRequests, Dictionary seedsBulks) { - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("开始生成播种拣选单,seedsRequests.count :{0},seedsBulks.count:{1}", + loglw.Debug( string.Format("开始生成播种拣选单,seedsRequests.count :{0},seedsBulks.count:{1}", seedsRequests.Count, seedsBulks.Count)); List lstLabel = new List(); @@ -5392,7 +5396,7 @@ namespace DeiNiu.wms.Logical seedPickRequest.pickOrderNo = Util.getOrderNo(enumCreateOrderType.seedsPickOrder, seedPickRequest.getNextSeq(enumCreateOrderType.seedsPickOrder)); seedPickRequest.orderType = (int)enumOrderType.销售出库; seedPickRequest.outStoreType = (int)enumOutStoreType.播种拣货出库; - LogHelper.debug(typeof(lWmsOutPickRequest), string.Format("播种拣选单 :{0} ", seedPickRequest.pickOrderNo)); + loglw.Debug( string.Format("播种拣选单 :{0} ", seedPickRequest.pickOrderNo)); WmsOutPickLable_tmp wpl; foreach (WmsStockRecord rec in seedsBulks.Values) { diff --git a/WcfService1/BLL/lWmsOutRequest.cs b/WcfService1/BLL/lWmsOutRequest.cs index dea4f1c..befaad5 100644 --- a/WcfService1/BLL/lWmsOutRequest.cs +++ b/WcfService1/BLL/lWmsOutRequest.cs @@ -196,7 +196,7 @@ namespace DeiNiu.wms.Logical // DataTable dt = outRequest.getNewOrders(); - // fixErpSaleDetailSkuId(); + fixErpSaleDetailSkuId(); outRequest.syncOutRequest(); @@ -266,7 +266,7 @@ namespace DeiNiu.wms.Logical { if (minute < WmsConstants.ERP_TRANS_DATA_SLEEP_MINUES+ offset) { - log.Debug(string.Format(" time for erp transfering.... no out process...当前 {0} 点 {1}分 ----持续 {2}分 ", + log.Debug(string.Format(" time for erp transfering.... no out process...当前 {0} 点 {1}分 ----持续到 {2}分 ", DateTime.Now.Hour, minute- offset, WmsConstants.ERP_TRANS_DATA_SLEEP_MINUES)); return true; } @@ -278,7 +278,7 @@ namespace DeiNiu.wms.Logical * erp 没有skuid的情况下，根据batch ,expired date,product data 取skuid * **/ - public void fixErpSaleDetailSkuId() + public void fixErpSaleDetailSkuId2() { lLot llot = new lLot(); DataTable dt = outRequest.getAvErpDetailNoSkuId(); @@ -313,6 +313,43 @@ namespace DeiNiu.wms.Logical } } + + public void fixErpSaleDetailSkuId() + { + lLot llot = new lLot(); + DataTable dt = outRequest.getAvErpDetailNoSkuId(); + Erp_sale_d esd; + + foreach (DataRow dr in dt.Rows) + { + esd = new Erp_sale_d(dr); + String prd = Util.getShortDateString(esd.product_date.Trim()); + String vld = Util.getShortDateString(esd.save_date.Trim()); + + Dictionary dicValue = new Dictionary(); + + dicValue.Add(WmsConstants.SKU_RESEVRED_PRDDATE_ATTNAME, prd); + dicValue.Add(WmsConstants.SKU_RESEVRED_EXPIREDATE_ATTNAME, vld); + dicValue.Add(WmsConstants.SKU_RESEVRED_BATCH_ATTNAME, esd.batch.Trim()); + dicValue.Add(WmsConstants.SKU_RESEVRED_ENTI_ATTNAME, esd.entid); + Dictionary skuValue = new Dictionary(); + skuValue = llot.getSKU(prd, esd.goods_id, esd.batch.Trim()); + foreach (int i in skuValue.Keys) + { + esd.skuId = i; + esd.skuCode = skuValue[i]; + break; + } + + if (esd.skuId > 0) + { + esd.Update(); + } + + } + } + + public delegate void UpdateUI(int step);//声明一个更新主线程的委托 public UpdateUI UpdateUIDelegate; @@ -532,7 +569,7 @@ namespace DeiNiu.wms.Logical if (dv.Count == 0 || !WmsConstants.OUT_STOCK_WHEN_NO_MORE_REQUEST)// || pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位).Count>WmsConstants.OUT_PROCESS_ORDERS_CNT) { - processOutStock(); + processOutStock(status); } @@ -553,13 +590,13 @@ namespace DeiNiu.wms.Logical } - public void processOutStock() + public void processOutStock(enumOutStockRequestStatus status) { - + status = status == enumOutStockRequestStatus.库存不足 ? status : enumOutStockRequestStatus.待定位; //取生成的所有拣货单，按pickgroup生成播种单，对摘果的零货生成补货单 - List all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位); + List all = pickRequestObj.getRequest4StockOut(status/*enumOutStockRequestStatus.待定位*/); bool isSeedsCreated = false; - logTest.Debug(" 取待定位的分拣单， 数量 " + all.Count); + logTest.Debug(string.Format(" 取 {0}状态的的分拣单， 数量 {1} " ,status, all.Count)); List seedsLst; Dictionary> dicGroup = new Dictionary>(); @@ -698,6 +735,7 @@ namespace DeiNiu.wms.Logical } requestOutStock(seedPickRequest); isSeedsCreated = true; + all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位); } } @@ -770,13 +808,7 @@ namespace DeiNiu.wms.Logical */ #endregion - - if (isSeedsCreated) - { - // logOut.Debug(" 从新取待定位的拣货单 -------------------------------------------------------------- "); - - all = pickRequestObj.getRequest4StockOut(enumOutStockRequestStatus.待定位); - } + // logOut.Debug(all.Count + " 个待定位的拣货单 ---------------------------------------------------------- "); @@ -1258,6 +1290,16 @@ namespace DeiNiu.wms.Logical outd.productDate = cachedObj.productDate; outd.validDate = cachedObj.validDate; decimal cnt = requestRep[key]; + goods.getStockInfo(goods.goodsId, Convert.ToInt32(skuId)); + + if(cnt >goods.stockBatchAvCount) + { + cnt = goods.stockBatchAvCount; + } + if (cnt <= 0) + { + continue; + } outd.count = cnt; //if (cachedObj.goods.bigCount != 0) if (goods.bigCount != 0) @@ -1327,7 +1369,7 @@ namespace DeiNiu.wms.Logical outd.operater = this.operId; outd.bulkPickState = (int)enumOutStockPickStatus.无需分拣; outd.Add(); - logSpec.Debug(string.Format("新增补货单{0}, detail id {1} ", repRequest.pickOrderNo, outd.ID)); + logSpec.Debug(string.Format("新增补货单{0}, detail id {1}, detail:{2} ", repRequest.pickOrderNo, outd.ID,outd)); } stkrep.repNews(); repRequest.Add(); @@ -1350,9 +1392,10 @@ namespace DeiNiu.wms.Logical WmsStockRep stkrep = new WmsStockRep(goods.goodsId, skuId); logSpec.Debug(string.Format("开始登记补货信息。。goodsId {0}, skuId:{1},skuCode:{2}, 补货数量 {3}", goods.goodsId, skuId, skuCode, count)); - logSpec.Debug(string.Format("1 商品补货情汇总--》 toRepCnt {0}, lacCount:{1} ", stkrep.toRepCnt, stkrep.lackCount)); + logSpec.Debug(string.Format("1 商品补货情汇总--》 toRepCnt {0}, lacCount:{1} ,checkonly {2} ", stkrep.toRepCnt, stkrep.lackCount,checkOnly)); if (!checkOnly) { + goods.getStockInfo(goods.goodsId,skuId); if (goods.stockBatch3Count + goods.stockBatch2Count + goods.stockBatch1Count < count) { logSpec.Debug(string.Format("整库库存不足，补货单生成失败")); @@ -1921,11 +1964,11 @@ namespace DeiNiu.wms.Logical if (WmsConstants.OUT_STOCK_LACK_HOLD_ORDER) { logSpec.Error("NO STOCK........整单出库定位回滚。。。。。。。。。。。。。。。。。。。。。。。"); - - //requestOrder.state = (int)enumOutStockRequestStatus.库存不足; - requestOrder.state = (int)enumOutStockRequestStatus.待定位; - requestOrder.Update(); scope.Dispose(); + requestOrder.state = (int)enumOutStockRequestStatus.库存不足; + // requestOrder.state = (int)enumOutStockRequestStatus.待定位; + requestOrder.Update(); + return false; } @@ -1994,7 +2037,8 @@ namespace DeiNiu.wms.Logical outRequest.updatePickState(requestOrder.pickOrderNo, enumOutStockRequestStatus.定位完成, enumOutStockRequestStatus.待定位); } - if (WmsConstants.OUT_BULK_SEEDS_PICK_ON && bulkTypeCnt < WmsConstants.OUT_MAX_SEEDS_GOODSTYPE_CNT && sumBulkCunt < WmsConstants.OUT_MAX_SEEDS_BULK_CNT_SUM) + if (WmsConstants.OUT_BULK_SEEDS_PICK_ON && bulkTypeCnt < WmsConstants.OUT_MAX_SEEDS_GOODSTYPE_CNT + && sumBulkCunt < WmsConstants.OUT_MAX_SEEDS_BULK_CNT_SUM) { requestOrder.seedsLabelId = WmsConstants.SEEDS_LABLEID_MARK_VALUE; //适合播种的标记 } @@ -2183,7 +2227,7 @@ namespace DeiNiu.wms.Logical throw new DeiNiuStockBulkCountException(); ; //等待下次重新定位 } else - if (bulkCnt > goods.stockBulkAvCount && 1==2) //零库不足，需要补零库; 整库零出的零不够需补货的情况应该不存在 + if (bulkCnt > goods.stockBulkAvCount && WmsConstants.OUT_BULK_REP_FROM_BATCH) //零库不足，需要补零库; 整库零出的零不够需补货的情况应该不存在 { // bulkCnt = Math.Ceiling(bulkCnt / goods.bigCount) * goods.bigCount; @@ -2208,7 +2252,7 @@ namespace DeiNiu.wms.Logical { decimal countOuting = WmsConstants.OUT_STOCK_DEDUCT ? goods.stockSumCountOuting : 0; - if (!isRep) + if (!isRep) //非补货单 { if (goods.bigCount == 1) @@ -2259,28 +2303,59 @@ namespace DeiNiu.wms.Logical } requestDetail.bulkCount = requestDetail.count - requestDetail.batch1Count - requestDetail.batch2Count; - } - // if (requestDetail.goods.stockBatchAvCount == 0) - if (requestDetail.goods.stockBatchAvCount <= 0) + + // if (requestDetail.goods.stockBatchAvCount == 0) + if (requestDetail.goods.stockBatchAvCount <= 0) { - requestDetail.bulkCount = requestDetail.count; - requestDetail.batch1Count = 0; - requestDetail.batch2Count = 0; + requestDetail.bulkCount = requestDetail.count; + requestDetail.batch1Count = 0; + requestDetail.batch2Count = 0; + } + else if (!WmsConstants.OUT_BULK_REP_FROM_BATCH) + { + + log.Error(" 有整库库存！！！！！！！！！！！！！？？？？？？？: " + requestDetail.goods); + + //没有整库 辣得叫 + requestDetail.bulkCount = requestDetail.count; + requestDetail.batch1Count = 0; + requestDetail.batch2Count = 0; + + } } - else + else //补货单 { - - log.Error(" 有整库库存！！！！！！！！！！！！！？？？？？？？: " + requestDetail.goods); - //没有整库 辣得叫 - requestDetail.bulkCount = requestDetail.count; - requestDetail.batch1Count = 0; - requestDetail.batch2Count = 0; + if (goods.stockBatchAvCount < requestDetail.count) + { + if (goods.stockBatchAvCount > 0) + { + decimal diff = requestDetail.count - goods.stockBatchAvCount; + + WmsStockRep stk = new WmsStockRep(requestDetail.goodsId, requestDetail.skuId); + if (stk.ID > 0) + { + stk.toRepCnt -= diff; + stk.Update(); + } + requestDetail.description = "应补" + requestDetail.count + ",实际补 " + (goods.stockBatchAvCount); + requestDetail.batch1Count =requestDetail.count = goods.stockBatchAvCount; + requestDetail.Update(); + } + else + { + requestDetail.state = (int)enumOutStockDetailStatus.库存不足; + throw new DeiNiuStockBulkCountException(); ; //等待下次重新定位 + } + + } + + requestDetail.batch1Count = requestDetail.count; + requestDetail.bulkCount= requestDetail.batch2Count = 0; } - bulkCnt = requestDetail.bulkCount; @@ -2289,7 +2364,8 @@ namespace DeiNiu.wms.Logical // decimal batch3Cnt = requestDetail.bat; - logSpec.Debug(string.Format("{3} 出库需求明细: bulkCnt：{0} , batch1Cnt：{1} , batch2Cnt：{2} ", bulkCnt, batch1Cnt, batch2Cnt, goods.goodsId)); + logSpec.Debug(string.Format("detail id {6},goodsid:{3},skuId:{4},skuCode:{5}, 出库需求明细: bulkCnt：{0} , batch1Cnt：{1} , batch2Cnt：{2} ", + bulkCnt, batch1Cnt, batch2Cnt, goods.goodsId, requestDetail.skuId,requestDetail.skuCode,requestDetail.ID)); @@ -2298,59 +2374,19 @@ namespace DeiNiu.wms.Logical ) { // 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.stockAvCount, requestDetail.count)); - + string msg = string.Format("库存不足: 可用总库存:{0}, 需求库存{1}", goods.stockAvCount, requestDetail.count); + logSpec.Debug(msg); + requestDetail.description= msg; + requestDetail.Update(); if (isRep) { - requestDetail.description = "应补" + requestDetail.count + ",实际补 " + (goods.stockSumCount - countOuting); - - /* - WmsStockRep wsr = new WmsStockRep(requestDetail.goodsId, requestDetail.skuId); - wsr.toRepCnt -= requestDetail.count -goods.stockAvCount; - wsr.Update(); - */ - if (goods.stockAvCount <= 0) - { - //requestDetail.Delete(); - requestDetail.state = (int)enumOutStockDetailStatus.完成分拣; - requestDetail.Update(); - return true; - } - decimal diff = requestDetail.count - goods.stockAvCount; - requestDetail.count = goods.stockAvCount; - /** - * - requestDetail.count = (goods.stockSumCount - countOuting) / goods.bigCount * goods.bigCount; - logSpec.Debug(string.Format("补货订单。。" + requestDetail.description)); - if (requestDetail.count < goods.bigCount) - { - logSpec.Debug(string.Format("无整库库存，删除补货明细。。。")); - //requestDetail.count = 0; - //requestDetail.Delete(); - // requestDetail.Update(); - requestDetail.count = goods.bigCount; - return true; - }*/ - WmsStockRep stk = new WmsStockRep(requestDetail.goodsId, requestDetail.skuId); - if (stk.ID > 0) - { - stk.toRepCnt -= diff; - stk.Update(); - } - - requestDetail.batch1Count = requestDetail.count; - requestDetail.batch2Count = 0; - requestDetail.Update(); - batch1Cnt = requestDetail.batch1Count; - batch2Cnt = 0; } else { goods = new WmsGoods(requestDetail.goodsId, requestDetail.skuId, requestDetail.batch); - // logSpec.Debug(string.Format("库存不足时，全订单暂停出库 ？{0}", WmsConstants.OUT_STOCK_LACK_HOLD_ORDER)); + logSpec.Debug(string.Format("库存不足时，全订单暂停出库 ？{0}", WmsConstants.OUT_STOCK_LACK_HOLD_ORDER)); if (!WmsConstants.OUT_STOCK_LACK_HOLD_ORDER) { @@ -2594,8 +2630,8 @@ namespace DeiNiu.wms.Logical } else { - string msg = string.Format("rquest {3}, goods:{4}, sku {0},required count {1},stock available cnt {2} ", requestDetail.skuId, - requestDetail.count, goods.stockSumCount - countOuting, requestDetail.pickOrderNo, goods.goodsId); + msg = string.Format("rquest {3}, goods:{4}, sku {0},required count {1},stock available cnt {2} ", requestDetail.skuId, + requestDetail.count, goods.stockSumCount - countOuting, requestDetail.pickOrderNo, goods.goodsName + goods.goodsId); logSpec.Error(msg); throw new DeiNiuNoStockException(msg); } @@ -2612,7 +2648,7 @@ namespace DeiNiu.wms.Logical // this.createGoodsRepOrder(goods, requestDetail.skuId, requestDetail.skuCode, bulkCnt); //TODO: check if the rep has been created for it. } - string msg = string.Format("goods ：{3}， sku {0},required bulkcount {1},stock bulk cnt： {2} ", requestDetail.skuId, bulkCnt, goods.stockBulkAvCount, goods.goodsName); + string msg = string.Format("goods ：{3} 需要补零， sku {0},required bulkcount {1},stock bulk cnt： {2} ", requestDetail.skuId, bulkCnt, goods.stockBulkAvCount, goods.goodsName); logSpec.Debug(msg); //throw new DeiNiuStockBulkCountException(msg); } @@ -2738,7 +2774,7 @@ namespace DeiNiu.wms.Logical logSpec.Debug("goods.stocks count : " + goods.stocks.Count); foreach (WmsStock st in goods.stocks) { - logSpec.Debug(string.Format("{0}, avcnt {1}, voltype {2} ", st.skuCode, st.getAvCount(), st.location.volType)); + logSpec.Debug(string.Format("locId {3}, sku {0}, avcnt {1}, voltype {2} ", st.skuCode, st.getAvCount(), st.location.volType,st.locationId)); if (st.location.volType < (int)enumWhLocVol.小整)//零库 { @@ -3025,7 +3061,7 @@ namespace DeiNiu.wms.Logical if (bulkCnt > 0) { - goods.getStockInfo(goods.goodsId); + goods.getStockInfo(goods.goodsId,requestDetail.skuId); logSpec.Debug(string.Format("开始处理 零库。。。。。bulkCnt :{0}, goods.stockBulkAvCount {1}, goods.tmpStocks count {2} ", bulkCnt, goods.stockBulkAvCount, goods.tmpStocks.Count)); /* @@ -3073,7 +3109,7 @@ namespace DeiNiu.wms.Logical } - if (bulkCnt > 0 &&1==2) + if (bulkCnt > 0 && WmsConstants.OUT_BULK_REP_FROM_BATCH) { string msg = string.Format("goods {3}, skuId {0},required bulkcount {1},stock bulk cnt {2} ", requestDetail.skuId, bulkCnt, goods.stockBulkAvCount, goods.goodsId); logSpec.Debug(msg); diff --git a/WcfService1/BLL/lWmsStock.cs b/WcfService1/BLL/lWmsStock.cs index 3e465fc..85cdbd0 100644 --- a/WcfService1/BLL/lWmsStock.cs +++ b/WcfService1/BLL/lWmsStock.cs @@ -1283,14 +1283,21 @@ namespace DeiNiu.wms.Logical skuValues.Add(WmsConstants.SKU_RESEVRED_EXPIREDATE_ATTNAME,Util.getShortDateString(getValidDate( s.validDate.Trim(),s.goodsId).ToShortDateString())); */ - skuValues.Add(WmsConstants.SKU_RESEVRED_BATCH_ATTNAME, s.batch.Trim()); - string prd = Util.getShortDateString(s.batch.Trim()); - string valid = Util.getShortDateString(getValidDate(prd, s.goodsId).ToShortDateString()); + skuValues.Add(WmsConstants.SKU_RESEVRED_BATCH_ATTNAME, s.batch.Trim()); + //skuValues.Add(WmsConstants.SKU_RESEVRED_PRDDATE_ATTNAME, s.productDate); + // skuValues.Add(WmsConstants.SKU_RESEVRED_EXPIREDATE_ATTNAME, s.validDate); + + string prd = Util.getShortDateString(s.productDate.Trim()); + string valid = string.IsNullOrEmpty( s.validDate) ? Util.getShortDateString(getValidDate(prd, s.goodsId).ToShortDateString()):s.validDate ; skuValues.Add(WmsConstants.SKU_RESEVRED_PRDDATE_ATTNAME, prd); skuValues.Add(WmsConstants.SKU_RESEVRED_EXPIREDATE_ATTNAME, valid); - s.productDate = prd; s.validDate = valid; + + + + + // skuValues.Add("批次属性测试1", "7333" ); @@ -1309,7 +1316,7 @@ namespace DeiNiu.wms.Logical - Dictionary dic = lot.getSKU(prd, s.goodsId, s.batch.Trim()); + Dictionary dic = lot.getSKU(s.productDate, s.goodsId, s.batch.Trim()); foreach (int i in dic.Keys) diff --git a/WcfService1/BLL/lbase.cs b/WcfService1/BLL/lbase.cs index 600bc63..b874bc2 100644 --- a/WcfService1/BLL/lbase.cs +++ b/WcfService1/BLL/lbase.cs @@ -187,7 +187,9 @@ namespace DeiNiu.wms.Logical case 4: WmsConstants.JOB_NOTICE_ERP = v; break; - + case 5: + WmsConstants.JOB_OUT_REQUEST_NO_STOCK_CHECK_INTERVAL = v; + break; default: break; } @@ -410,6 +412,10 @@ namespace DeiNiu.wms.Logical WmsConstants.OUT_SEEDS_PICK_TASK_AUTO_ASSIGN = n.isOn; break; + case 41: + WmsConstants.OUT_BULK_REP_FROM_BATCH = n.isOn; + break; + default: break; } @@ -596,7 +602,7 @@ namespace DeiNiu.wms.Logical } } - // dtSetup = new Node().QueryByFlag(6003); //数据参数 + // dtSetup = new Node().QueryByFlag(6006); //数据参数 dv.RowFilter = "parentId=" + 16676; foreach (DataRowView dr in dv) diff --git a/WcfService1/Log4Net.config b/WcfService1/Log4Net.config index be786df..6e8c2de 100644 --- a/WcfService1/Log4Net.config +++ b/WcfService1/Log4Net.config @@ -34,6 +34,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user index eccffb8..cedd0c1 100644 --- a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user +++ b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user @@ -7,7 +7,7 @@ - True|2024-10-10T03:24:12.7545755Z||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;True|2024-03-25T12:01:37.4878288+08:00||;True|2024-03-25T10:10:10.4413746+08:00||;True|2024-03-24T23:57:03.5029554+08:00||;False|2024-03-24T23:56:43.7721505+08:00||;True|2024-03-24T18:10:49.6225565+08:00||;True|2024-03-24T15:29:14.9321731+08:00||;True|2024-03-24T14:49:41.1781462+08:00||;True|2024-03-24T14:49:04.1910017+08:00||;True|2024-03-24T11:22:38.8056231+08:00||;True|2024-03-24T11:22:01.3920738+08:00||;True|2024-03-24T09:46:25.4088667+08:00||;True|2024-03-23T19:05:28.3426176+08:00||;True|2024-03-23T16:34:07.5416741+08:00||;True|2024-03-23T16:25:46.1339413+08:00||;True|2024-03-23T12:03:12.5530217+08:00||;True|2024-03-23T11:07:03.4640232+08:00||;True|2024-03-23T10:00:21.5512517+08:00||;True|2024-03-22T20:10:41.7352909+08:00||;True|2024-03-22T11:27:32.0715888+08:00||;True|2024-03-22T10:46:35.3826831+08:00||;True|2024-03-22T10:42:03.6158979+08:00||;True|2024-03-22T10:33:50.2153330+08:00||;True|2024-03-22T09:31:42.8760994+08:00||;True|2024-03-22T09:31:10.8088318+08:00||;True|2024-03-22T09:30:08.1914035+08:00||;True|2024-03-22T09:25:02.5305528+08:00||;True|2024-03-20T22:55:40.0397610+08:00||;True|2024-03-20T22:42:21.0790187+08:00||;True|2024-03-20T22:36:09.2791989+08:00||;True|2024-03-20T22:22:12.9730279+08:00||;True|2024-03-20T19:54:32.1698921+08:00||;True|2024-03-20T19:54:09.8789983+08:00||;True|2024-03-20T19:21:19.0080195+08:00||;True|2024-03-20T15:40:39.8706246+08:00||;True|2024-03-20T08:55:54.5146171+08:00||; + True|2024-11-01T14:49:02.9367010Z||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;True|2024-03-25T12:01:37.4878288+08:00||;True|2024-03-25T10:10:10.4413746+08:00||;True|2024-03-24T23:57:03.5029554+08:00||;False|2024-03-24T23:56:43.7721505+08:00||;True|2024-03-24T18:10:49.6225565+08:00||;True|2024-03-24T15:29:14.9321731+08:00||;True|2024-03-24T14:49:41.1781462+08:00||;True|2024-03-24T14:49:04.1910017+08:00||;True|2024-03-24T11:22:38.8056231+08:00||;True|2024-03-24T11:22:01.3920738+08:00||;True|2024-03-24T09:46:25.4088667+08:00||;True|2024-03-23T19:05:28.3426176+08:00||;True|2024-03-23T16:34:07.5416741+08:00||; \ No newline at end of file diff --git a/WcfService1/WmsOutRequestService.svc.cs b/WcfService1/WmsOutRequestService.svc.cs index 9eafc85..ff51cb1 100644 --- a/WcfService1/WmsOutRequestService.svc.cs +++ b/WcfService1/WmsOutRequestService.svc.cs @@ -12,7 +12,7 @@ using DeiNiu.Utils; namespace DeiNiu.Wcf { // 注意: 使用“重构”菜单上的“重命名”命令，可以同时更改代码、svc 和配置文件中的类名“WmsOutRequest”。 - public class WmsOutRequestService : basicService, IWmsOutRequest + public class WmsOutRequestService : basicService, IWmsOutRequest { private static lWmsOutRequest _lor; @@ -20,24 +20,24 @@ namespace DeiNiu.Wcf { get { - if (_lor == null|| _lor.operId != getOperId()) + if (_lor == null || _lor.operId != getOperId()) { _lor = new lWmsOutRequest(getOperId()); } return _lor; } } - /* public void preProcessOutOrders(enumOutStockRequestStatus status) - { - lor.preProcessOutOrders(status); - } - */ + /* public void preProcessOutOrders(enumOutStockRequestStatus status) + { + lor.preProcessOutOrders(status); + } + */ public void syncOrders() { //lor.preProcessOutOrdersImp(enumOutStockRequestStatus.准备分拣); - lor.syncOrders(); + lor.syncOrders(); } - + public DataSet getNewRequests() { return lor.outRequest.getNewRequests(); @@ -54,7 +54,7 @@ namespace DeiNiu.Wcf public int approveOrder(string orderNo, int status, int priority, bool canMerge) { - return lor.approveOrder(orderNo,status,priority,canMerge); + return lor.approveOrder(orderNo, status, priority, canMerge); } public string genPickOrder(string orderNo) { @@ -74,14 +74,14 @@ namespace DeiNiu.Wcf return lor.createSeedsOrder(pickGroup, pickStartOn, dueDate); } - public DataTable getSeedsSumDetail_tmp(int pickGroup, int pickStartOn, string dueDate, int enOrderState, int enDetailState) + public DataTable getSeedsSumDetail_tmp(int pickGroup, int pickStartOn, string dueDate, int enOrderState, int enDetailState) { - return lor.getSeedsSumDetail(pickGroup, pickStartOn, dueDate, enOrderState, enDetailState); + return lor.getSeedsSumDetail(pickGroup, pickStartOn, dueDate, enOrderState, enDetailState); } - public DataSet getSeedsSumDetail(string queryStr,int rowStart,int rowEnd) + public DataSet getSeedsSumDetail(string queryStr, int rowStart, int rowEnd) { - return lor.getSeedsSumDetail(queryStr, rowStart, rowEnd); + return lor.getSeedsSumDetail(queryStr, rowStart, rowEnd); } @@ -91,25 +91,26 @@ namespace DeiNiu.Wcf } - public DataTable getSeedsDetailBySku(int skuId) + public DataTable getSeedsDetailBySku(int skuId) { return lor.getSeedsDetailBySku(skuId); } - public void updateTestData() - { - lor.updateTestData(); - } - - public bool testCreateSalesOut(string custId) + public void updateTestData() { - try { lor.testCreateSales(custId); }catch(Exception er) + lor.updateTestData(); + } + + public bool testCreateSalesOut(string custId) + { + try { lor.testCreateSales(custId); } + catch (Exception er) { log.Error(er); return false; } - + return true; } diff --git a/WcfService1/WmsWcfService.csproj.user b/WcfService1/WmsWcfService.csproj.user index 1238626..5e44a85 100644 --- a/WcfService1/WmsWcfService.csproj.user +++ b/WcfService1/WmsWcfService.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true @@ -9,7 +9,7 @@ - D:\vssrc\vssrc\WcfService1\Properties\PublishProfiles\IISProfile.pubxml + D:\vsmedicine\WcfService1\Properties\PublishProfiles\IISProfile1.pubxml ShowAllFiles diff --git a/WcfServiceErp/WcfServiceErp.csproj.user b/WcfServiceErp/WcfServiceErp.csproj.user index e91f2bc..1914c59 100644 --- a/WcfServiceErp/WcfServiceErp.csproj.user +++ b/WcfServiceErp/WcfServiceErp.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU IISProfile diff --git a/WcfServicePortal/WcfServicePortal.csproj.user b/WcfServicePortal/WcfServicePortal.csproj.user index 5d1220f..ab6aaed 100644 --- a/WcfServicePortal/WcfServicePortal.csproj.user +++ b/WcfServicePortal/WcfServicePortal.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true diff --git a/WindowsServiceOut/Service1.cs b/WindowsServiceOut/Service1.cs index 2d48178..67a1be4 100644 --- a/WindowsServiceOut/Service1.cs +++ b/WindowsServiceOut/Service1.cs @@ -184,7 +184,7 @@ namespace WindowsServiceOut bool isCanStart = true; int time1Cnt = 0; DateTime lastOut = DateTime.Now; - // int normalPrcocessCnt = 0; + int normalPrcocessCnt = 0; /// /// 出库相关任务处理 /// @@ -203,7 +203,7 @@ namespace WindowsServiceOut timer1.Stop(); - /* + if (normalPrcocessCnt > intervalStockLack/intervalOut) { outStatus = WindowsServiceOut.ServiceReferenceScheduledService.enumOutStockRequestStatus.库存不足; @@ -212,7 +212,7 @@ namespace WindowsServiceOut } debugLog("outStatus: "+ outStatus); normalPrcocessCnt++; - */ + debugLog("OnTimer_1 start process out ,,,\n,,,,,,,,,,,,,,,,,,,,,,,,/n,,,,,,,,,,,,,,,,,,,,>>> " + time1Cnt); log.Debug(""); try { diff --git a/WindowsServiceOut/WindowsServiceOut.csproj b/WindowsServiceOut/WindowsServiceOut.csproj index 02e9a9c..002e74c 100644 --- a/WindowsServiceOut/WindowsServiceOut.csproj +++ b/WindowsServiceOut/WindowsServiceOut.csproj @@ -26,7 +26,7 @@ false true true - 10 + 11 1.0.0.%2a false true diff --git a/epickService/epickService.csproj.user b/epickService/epickService.csproj.user index c41d0f2..7199c13 100644 --- a/epickService/epickService.csproj.user +++ b/epickService/epickService.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU false diff --git a/winform/service/GoodsOutPickOrderPrint.Designer.cs b/winform/service/GoodsOutPickOrderPrint.Designer.cs index 8b57118..aafb254 100644 --- a/winform/service/GoodsOutPickOrderPrint.Designer.cs +++ b/winform/service/GoodsOutPickOrderPrint.Designer.cs @@ -56,19 +56,21 @@ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup(); this.simpleSeparator1 = new DevExpress.XtraLayout.SimpleSeparator(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem6 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.chkRep = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); @@ -92,16 +94,18 @@ ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); this.SuspendLayout(); // // ribbon @@ -141,6 +145,7 @@ // // layoutControl1 // + this.layoutControl1.Controls.Add(this.chkRep); this.layoutControl1.Controls.Add(this.comWarehouseQuery); this.layoutControl1.Controls.Add(this.gridControl2); this.layoutControl1.Controls.Add(this.dateEditFrom); @@ -241,7 +246,7 @@ this.simpleButton1.Appearance.Font = new System.Drawing.Font("Tahoma", 16F); this.simpleButton1.Appearance.Options.UseFont = true; this.simpleButton1.ImageUri.Uri = "Zoom"; - this.simpleButton1.Location = new System.Drawing.Point(694, 52); + this.simpleButton1.Location = new System.Drawing.Point(900, 52); this.simpleButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.simpleButton1.Name = "simpleButton1"; this.simpleButton1.Size = new System.Drawing.Size(160, 50); @@ -255,7 +260,7 @@ this.btnPrintCode.Appearance.Font = new System.Drawing.Font("Tahoma", 16F); this.btnPrintCode.Appearance.Options.UseFont = true; this.btnPrintCode.Image = ((System.Drawing.Image)(resources.GetObject("btnPrintCode.Image"))); - this.btnPrintCode.Location = new System.Drawing.Point(694, 108); + this.btnPrintCode.Location = new System.Drawing.Point(900, 108); this.btnPrintCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnPrintCode.Name = "btnPrintCode"; this.btnPrintCode.Size = new System.Drawing.Size(160, 50); @@ -266,7 +271,7 @@ // // comPartQuery // - this.comPartQuery.Location = new System.Drawing.Point(935, 52); + this.comPartQuery.Location = new System.Drawing.Point(1141, 52); this.comPartQuery.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comPartQuery.Name = "comPartQuery"; this.comPartQuery.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 18F); @@ -289,6 +294,7 @@ this.gridControl1.TabIndex = 104; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); + this.gridControl1.Click += new System.EventHandler(this.gridControl1_Click); // // gridView1 // @@ -331,14 +337,13 @@ // // chkLight // - this.chkLight.EditValue = true; - this.chkLight.Location = new System.Drawing.Point(554, 108); + this.chkLight.Location = new System.Drawing.Point(720, 108); this.chkLight.MenuManager = this.ribbon; this.chkLight.Name = "chkLight"; this.chkLight.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F); this.chkLight.Properties.Appearance.Options.UseFont = true; this.chkLight.Properties.Caption = "亮灯分拣"; - this.chkLight.Size = new System.Drawing.Size(134, 38); + this.chkLight.Size = new System.Drawing.Size(174, 38); this.chkLight.StyleController = this.layoutControl1; this.chkLight.TabIndex = 111; // @@ -349,7 +354,7 @@ this.txtCutName.Name = "txtCutName"; this.txtCutName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 16F); this.txtCutName.Properties.Appearance.Options.UseFont = true; - this.txtCutName.Size = new System.Drawing.Size(271, 46); + this.txtCutName.Size = new System.Drawing.Size(477, 46); this.txtCutName.StyleController = this.layoutControl1; this.txtCutName.TabIndex = 112; // @@ -407,13 +412,6 @@ this.simpleSeparator1.Name = "simpleSeparator1"; this.simpleSeparator1.Size = new System.Drawing.Size(1976, 3); // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "correct.jpg"); - this.imageList1.Images.SetKeyName(1, "wrong.png"); - // // layoutControlGroup4 // this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { @@ -427,7 +425,8 @@ this.layoutControlItem20, this.layoutControlItem14, this.layoutControlItem16, - this.layoutControlItem17}); + this.layoutControlItem17, + this.layoutControlItem1}); this.layoutControlGroup4.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup4.Name = "layoutControlGroup4"; this.layoutControlGroup4.OptionsItemText.TextToControlDistance = 5; @@ -443,10 +442,89 @@ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // + // emptySpaceItem6 + // + this.emptySpaceItem6.AllowHotTrack = false; + this.emptySpaceItem6.Location = new System.Drawing.Point(1343, 0); + this.emptySpaceItem6.Name = "emptySpaceItem6"; + this.emptySpaceItem6.Size = new System.Drawing.Size(595, 122); + this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.comPartQuery; + this.layoutControlItem13.Location = new System.Drawing.Point(1044, 0); + this.layoutControlItem13.MaxSize = new System.Drawing.Size(299, 56); + this.layoutControlItem13.MinSize = new System.Drawing.Size(299, 56); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.Size = new System.Drawing.Size(299, 122); + this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem13.Text = "选择分区"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22); + this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.comWarehouseQuery; + this.layoutControlItem19.Location = new System.Drawing.Point(310, 56); + this.layoutControlItem19.MaxSize = new System.Drawing.Size(222, 56); + this.layoutControlItem19.MinSize = new System.Drawing.Size(222, 56); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.Size = new System.Drawing.Size(222, 56); + this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem19.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0); + this.layoutControlItem19.Text = "库房分区"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 22); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.simpleButton1; + this.layoutControlItem15.Location = new System.Drawing.Point(878, 0); + this.layoutControlItem15.MaxSize = new System.Drawing.Size(166, 56); + this.layoutControlItem15.MinSize = new System.Drawing.Size(166, 56); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.Size = new System.Drawing.Size(166, 56); + this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem15.TextVisible = false; + // + // emptySpaceItem8 + // + this.emptySpaceItem8.AllowHotTrack = false; + this.emptySpaceItem8.Location = new System.Drawing.Point(0, 112); + this.emptySpaceItem8.Name = "emptySpaceItem8"; + this.emptySpaceItem8.Size = new System.Drawing.Size(1044, 10); + this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txtCutName; + this.layoutControlItem21.Location = new System.Drawing.Point(310, 0); + this.layoutControlItem21.MaxSize = new System.Drawing.Size(568, 56); + this.layoutControlItem21.MinSize = new System.Drawing.Size(568, 56); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.Size = new System.Drawing.Size(568, 56); + 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); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.chkLight; + this.layoutControlItem20.Location = new System.Drawing.Point(698, 56); + this.layoutControlItem20.MaxSize = new System.Drawing.Size(180, 56); + this.layoutControlItem20.MinSize = new System.Drawing.Size(180, 56); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.Size = new System.Drawing.Size(180, 56); + this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem20.TextVisible = false; + // // layoutControlItem14 // this.layoutControlItem14.Control = this.btnPrintCode; - this.layoutControlItem14.Location = new System.Drawing.Point(672, 56); + this.layoutControlItem14.Location = new System.Drawing.Point(878, 56); this.layoutControlItem14.MinSize = new System.Drawing.Size(116, 54); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.Size = new System.Drawing.Size(166, 56); @@ -454,6 +532,18 @@ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.comLine; + this.layoutControlItem16.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem16.MaxSize = new System.Drawing.Size(299, 56); + this.layoutControlItem16.MinSize = new System.Drawing.Size(299, 56); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.Size = new System.Drawing.Size(310, 56); + this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem16.Text = "选择线路"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22); + // // layoutControlItem17 // this.layoutControlItem17.Control = this.dateEditFrom; @@ -467,93 +557,36 @@ this.layoutControlItem17.Text = "选择日期"; this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22); // - // emptySpaceItem6 + // imageList1 // - this.emptySpaceItem6.AllowHotTrack = false; - this.emptySpaceItem6.Location = new System.Drawing.Point(1137, 0); - this.emptySpaceItem6.Name = "emptySpaceItem6"; - this.emptySpaceItem6.Size = new System.Drawing.Size(801, 122); - this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0); + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "correct.jpg"); + this.imageList1.Images.SetKeyName(1, "wrong.png"); // - // layoutControlItem13 + // chkRep // - this.layoutControlItem13.Control = this.comPartQuery; - this.layoutControlItem13.Location = new System.Drawing.Point(838, 0); - this.layoutControlItem13.MaxSize = new System.Drawing.Size(299, 56); - this.layoutControlItem13.MinSize = new System.Drawing.Size(299, 56); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(299, 122); - this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem13.Text = "选择分区"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22); - this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; + this.chkRep.Location = new System.Drawing.Point(554, 108); + this.chkRep.MenuManager = this.ribbon; + this.chkRep.Name = "chkRep"; + this.chkRep.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F); + this.chkRep.Properties.Appearance.Options.UseFont = true; + this.chkRep.Properties.Caption = "补货调拨"; + this.chkRep.Size = new System.Drawing.Size(160, 38); + this.chkRep.StyleController = this.layoutControl1; + this.chkRep.TabIndex = 113; // - // layoutControlItem20 + // layoutControlItem1 // - this.layoutControlItem20.Control = this.chkLight; - this.layoutControlItem20.Location = new System.Drawing.Point(532, 56); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.Size = new System.Drawing.Size(140, 56); - this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem20.TextVisible = false; - // - // layoutControlItem19 - // - this.layoutControlItem19.Control = this.comWarehouseQuery; - this.layoutControlItem19.Location = new System.Drawing.Point(310, 56); - this.layoutControlItem19.MaxSize = new System.Drawing.Size(222, 56); - this.layoutControlItem19.MinSize = new System.Drawing.Size(222, 56); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(222, 56); - this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem19.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 10, 0, 0); - this.layoutControlItem19.Text = "选择库房"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 22); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.comLine; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 56); - this.layoutControlItem16.MaxSize = new System.Drawing.Size(299, 56); - this.layoutControlItem16.MinSize = new System.Drawing.Size(299, 56); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(310, 56); - this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem16.Text = "选择线路"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.simpleButton1; - this.layoutControlItem15.Location = new System.Drawing.Point(672, 0); - this.layoutControlItem15.MaxSize = new System.Drawing.Size(166, 56); - this.layoutControlItem15.MinSize = new System.Drawing.Size(166, 56); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(166, 56); - this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem15.TextVisible = false; - // - // layoutControlItem21 - // - this.layoutControlItem21.Control = this.txtCutName; - this.layoutControlItem21.Location = new System.Drawing.Point(310, 0); - this.layoutControlItem21.MaxSize = new System.Drawing.Size(362, 56); - this.layoutControlItem21.MinSize = new System.Drawing.Size(362, 56); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.Size = new System.Drawing.Size(362, 56); - 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); - // - // emptySpaceItem8 - // - this.emptySpaceItem8.AllowHotTrack = false; - this.emptySpaceItem8.Location = new System.Drawing.Point(0, 112); - this.emptySpaceItem8.Name = "emptySpaceItem8"; - this.emptySpaceItem8.Size = new System.Drawing.Size(838, 10); - this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem1.Control = this.chkRep; + this.layoutControlItem1.Location = new System.Drawing.Point(532, 56); + this.layoutControlItem1.MaxSize = new System.Drawing.Size(166, 56); + this.layoutControlItem1.MinSize = new System.Drawing.Size(166, 56); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(166, 56); + this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem1.TextVisible = false; // // GoodsOutPickOrderPrint // @@ -566,7 +599,6 @@ this.Name = "GoodsOutPickOrderPrint"; this.Ribbon = this.ribbon; this.Text = "GoodsOutPickForm"; - ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); @@ -590,16 +622,18 @@ ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.chkRep.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -646,5 +680,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraEditors.CheckEdit chkRep; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; } } \ No newline at end of file diff --git a/winform/service/GoodsOutPickOrderPrint.cs b/winform/service/GoodsOutPickOrderPrint.cs index 2bd86e3..0cc39ca 100644 --- a/winform/service/GoodsOutPickOrderPrint.cs +++ b/winform/service/GoodsOutPickOrderPrint.cs @@ -629,7 +629,8 @@ namespace DeiNiu.wms.win string custName = filtRiskChar( txtCutName.Text); string date = string.Format("{0}-{1:D2}-{2:D}", dateEditFrom.DateTime.Year, dateEditFrom.DateTime.Month, dateEditFrom.DateTime.Day); string query = this.txtCutName.Text.Trim().Length == 0 ? "" : string.Format("{0} like # '%{1}%';", "customerName", filtRiskChar(txtCutName.Text.Trim())); - + query += chkRep.Checked ? string.Format("{0} = # '{1}';", "recType", (int) enumStockRecordType.补零出库 ):""; + // query += string.Format("{0} = # '{1}';", "recType", (int)(chkRep.Checked ? enumStockRecordType.补零出库 : enumStockRecordType.销售出库)) ; return pickClient.getLightTasks(query,wareHouse,partion, lineId, 0, date,chkLight.Checked); } @@ -638,8 +639,9 @@ namespace DeiNiu.wms.win } - - + private void gridControl1_Click(object sender, EventArgs e) + { + } } } \ No newline at end of file diff --git a/winform/service/GoodsOutPickOrderPrint.resx b/winform/service/GoodsOutPickOrderPrint.resx index ae5144f..503072d 100644 --- a/winform/service/GoodsOutPickOrderPrint.resx +++ b/winform/service/GoodsOutPickOrderPrint.resx @@ -121,7 +121,7 @@ 17, 17 - 275, 17 + 274, 17 @@ -301,14 +301,14 @@ - 542, 17 + 539, 17 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - CQAAAk1TRnQBSQFMAgEBAgEAAQgBCQEIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAARgBCQEYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/winform/service/GoodsOutServiceForm.Designer.cs b/winform/service/GoodsOutServiceForm.Designer.cs index af106ef..4ce836c 100644 --- a/winform/service/GoodsOutServiceForm.Designer.cs +++ b/winform/service/GoodsOutServiceForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GoodsOutServiceForm)); this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl(); this.bbQuery = new DevExpress.XtraBars.BarButtonItem(); @@ -82,12 +83,6 @@ this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup(); this.simpleSeparator1 = new DevExpress.XtraLayout.SimpleSeparator(); this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup(); - this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -96,13 +91,19 @@ this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup(); this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); - this.imageList1 = new System.Windows.Forms.ImageList(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); @@ -142,12 +143,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); @@ -156,6 +151,12 @@ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); @@ -771,77 +772,13 @@ // this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0); this.tabbedControlGroup1.Name = "tabbedControlGroup1"; - this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup2; - this.tabbedControlGroup1.SelectedTabPageIndex = 1; + this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup3; + this.tabbedControlGroup1.SelectedTabPageIndex = 0; this.tabbedControlGroup1.Size = new System.Drawing.Size(264, 807); this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup3, this.layoutControlGroup2}); // - // layoutControlGroup3 - // - this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.layoutControlItem4, - this.layoutControlItem12, - this.emptySpaceItem4, - this.layoutControlItem2}); - this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup3.Name = "layoutControlGroup3"; - this.layoutControlGroup3.Size = new System.Drawing.Size(225, 733); - this.layoutControlGroup3.Text = "服务状态"; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.lbUrl; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 185); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(225, 40); - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextVisible = false; - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.lbStatus; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 225); - this.layoutControlItem4.MaxSize = new System.Drawing.Size(225, 39); - this.layoutControlItem4.MinSize = new System.Drawing.Size(225, 39); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(225, 39); - this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem4.TextVisible = false; - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.picBarcode; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem12.MinSize = new System.Drawing.Size(106, 26); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(225, 185); - this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem12.TextVisible = false; - // - // emptySpaceItem4 - // - this.emptySpaceItem4.AllowHotTrack = false; - this.emptySpaceItem4.Location = new System.Drawing.Point(0, 300); - this.emptySpaceItem4.Name = "emptySpaceItem4"; - this.emptySpaceItem4.Size = new System.Drawing.Size(225, 433); - this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.lbLightsInfo; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 264); - this.layoutControlItem2.MinSize = new System.Drawing.Size(36, 36); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(225, 36); - this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem2.TextVisible = false; - // // layoutControlGroup2 // this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { @@ -932,6 +869,70 @@ this.layoutControlItem18.TextVisible = false; this.layoutControlItem18.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; // + // layoutControlGroup3 + // + this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem4, + this.layoutControlItem12, + this.emptySpaceItem4, + this.layoutControlItem2}); + this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0); + this.layoutControlGroup3.Name = "layoutControlGroup3"; + this.layoutControlGroup3.Size = new System.Drawing.Size(225, 733); + this.layoutControlGroup3.Text = "服务状态"; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.lbUrl; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 185); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(225, 40); + this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem1.TextVisible = false; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.lbStatus; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 225); + this.layoutControlItem4.MaxSize = new System.Drawing.Size(225, 39); + this.layoutControlItem4.MinSize = new System.Drawing.Size(225, 39); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(225, 39); + this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem4.TextVisible = false; + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.picBarcode; + this.layoutControlItem12.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem12.MinSize = new System.Drawing.Size(106, 26); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.Size = new System.Drawing.Size(225, 185); + this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem12.TextVisible = false; + // + // emptySpaceItem4 + // + this.emptySpaceItem4.AllowHotTrack = false; + this.emptySpaceItem4.Location = new System.Drawing.Point(0, 300); + this.emptySpaceItem4.Name = "emptySpaceItem4"; + this.emptySpaceItem4.Size = new System.Drawing.Size(225, 433); + this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.lbLightsInfo; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 264); + this.layoutControlItem2.MinSize = new System.Drawing.Size(36, 36); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(225, 36); + this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem2.TextVisible = false; + // // tabbedControlGroup2 // this.tabbedControlGroup2.Location = new System.Drawing.Point(264, 0); @@ -1057,12 +1058,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); @@ -1071,6 +1066,12 @@ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); diff --git a/winform/service/GoodsOutServiceForm.resx b/winform/service/GoodsOutServiceForm.resx index 4af28e1..c9db211 100644 --- a/winform/service/GoodsOutServiceForm.resx +++ b/winform/service/GoodsOutServiceForm.resx @@ -308,7 +308,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - CQAAAk1TRnQBSQFMAgEBAgEAAVgBCQFYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAWABCQFgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/winform/utils/reports/pickOutSeedsJob5.5.rdlc b/winform/utils/reports/pickOutSeedsJob5.5.rdlc index 76fc5ce..58c2321 100644 --- a/winform/utils/reports/pickOutSeedsJob5.5.rdlc +++ b/winform/utils/reports/pickOutSeedsJob5.5.rdlc @@ -6,7 +6,7 @@ - 4.89179cm + 4.91952cm @@ -235,7 +235,7 @@ Textbox3 0.15779cm 1.97175cm - 1.72944cm + 1.14736cm 2.84195cm 6 + + true + true + + + + + =Fields!tranAreaName.Value + + + + + + + pickOrderNo + 1.48154cm + 1.97175cm + 0.34cm + 2.9125cm + 10 + + + + true @@ -371,7 +401,7 @@ 1.50749in