diff --git a/Model/wms/data/WmsOutPickPort_Imp.cs b/Model/wms/data/WmsOutPickPort_Imp.cs index ea917a5..1bf4e17 100644 --- a/Model/wms/data/WmsOutPickPort_Imp.cs +++ b/Model/wms/data/WmsOutPickPort_Imp.cs @@ -814,7 +814,21 @@ namespace DeiNiu.wms.Data.Model break; + + case 2500:// + _strSql = " select * from [v_stockSeedsDeskLight] where 1=1 " + + " and flowno =@flowno" + + " and deskId= @deskId" + + " and (barcode=@barcode /* or goodsId=@barcode */) "; + + sqlCmd.Parameters.AddWithValue("@deskId", mObj.CmdParameters[0]); + sqlCmd.Parameters.AddWithValue("@flowno", mObj.CmdParameters[1]); + sqlCmd.Parameters.AddWithValue("@barcode", mObj.CmdParameters[2]); + + sqlCmd.CommandText = _strSql; + break; + } sqlCmd.CommandText = _strSql; diff --git a/Model/wms/tables/WmsOutPickPort.cs b/Model/wms/tables/WmsOutPickPort.cs index f666b2e..d7f98a5 100644 --- a/Model/wms/tables/WmsOutPickPort.cs +++ b/Model/wms/tables/WmsOutPickPort.cs @@ -368,6 +368,8 @@ namespace DeiNiu.wms.Data.Model return CustQuery(1801).Tables[0]; } + + public DataTable getFlows4SeedsOut() { return CustQuery(1900).Tables[0]; @@ -434,6 +436,14 @@ namespace DeiNiu.wms.Data.Model return CustQuery(2220).Tables[0]; } + + public DataTable getLightSeeds(int deskId, string flowno, string barcode) + { + cmdParameters[0] = deskId; + cmdParameters[1] = flowno; + cmdParameters[2] = barcode; + return CustQuery(2500).Tables[0]; + } } } \ No newline at end of file diff --git a/WcfService1/Android.svc.cs b/WcfService1/Android.svc.cs index 845c6f4..0dbce90 100644 --- a/WcfService1/Android.svc.cs +++ b/WcfService1/Android.svc.cs @@ -312,7 +312,7 @@ namespace DeiNiu.Wcf { log.Debug(string.Format("Warrning is expiring... IS_ONLINE_RESTRICT: {0}, SYSTEM_VALID_LEFT_DAYS: {1}, SYSTEM_VALID_DATE {2} ", WmsConstants.IS_ONLINE_RESTRICT, WmsConstants.SYSTEM_VALID_LEFT_DAYS, WmsConstants.SYSTEM_VALID_DATE)); - em.extrMsg = String.Format("警告:系统将在{0}天后到期停用, 请及时缴费", WmsConstants.SYSTEM_VALID_LEFT_DAYS); + em.extrMsg = String.Format("警告:系统将在{0}天后到期停用", WmsConstants.SYSTEM_VALID_LEFT_DAYS); } // log.Debug("login user " + em.ToString()); diff --git a/WcfService1/BLL/lWmsOutPickPort.cs b/WcfService1/BLL/lWmsOutPickPort.cs index eaeaf39..55c7ed3 100644 --- a/WcfService1/BLL/lWmsOutPickPort.cs +++ b/WcfService1/BLL/lWmsOutPickPort.cs @@ -757,6 +757,20 @@ namespace DeiNiu.wms.Logical } + /// + /// 返回亮灯数据 + /// + /// + /// + /// + /// + /// + /// + internal DataTable prePareLightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid) + { + return getWmsOutPickPort.getLightSeeds(deskId, flowno, barcode); + } + internal DataTable getLightTasks(string query, int wareHouse, int partion, int lineId, int state,string date, bool isLight) { return getWmsOutPickPort.getLightTasks( pareseCondition(query), wareHouse, partion, lineId, state,date, isLight); diff --git a/WcfService1/IWmsOutPickRequest.cs b/WcfService1/IWmsOutPickRequest.cs index 0136e17..86d6d67 100644 --- a/WcfService1/IWmsOutPickRequest.cs +++ b/WcfService1/IWmsOutPickRequest.cs @@ -200,6 +200,10 @@ namespace DeiNiu.Wcf [OperationContract] DataTable lightByJob(int userId,string jobNo,bool isValid); + [OperationContract] + DataTable lightSeeds(int deskId ,string flowno, string barcode, int userId, bool isValid); + + [OperationContract] bool updatePortPickingStatus(int userId,int color, int labId, int address, decimal count); [OperationContract] int clearJobLightTask(string jobNo); @@ -213,6 +217,8 @@ namespace DeiNiu.Wcf [OperationContract] DataTable getLightTasks(string query,int wareHouse, int partion, int lineId, int state, string date, bool isLight); + + } diff --git a/WcfService1/Web.config b/WcfService1/Web.config index bae7e16..4b42ec2 100644 --- a/WcfService1/Web.config +++ b/WcfService1/Web.config @@ -46,7 +46,7 @@ + --> diff --git a/WcfService1/WmsOutPickRequestService.svc.cs b/WcfService1/WmsOutPickRequestService.svc.cs index 657cb91..d18d3df 100644 --- a/WcfService1/WmsOutPickRequestService.svc.cs +++ b/WcfService1/WmsOutPickRequestService.svc.cs @@ -621,5 +621,10 @@ namespace DeiNiu.Wcf { return lopp.getLightTasks(query,wareHouse, partion, lineId, state,date,isLight); } + + public DataTable lightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid) + { + return lopp.prePareLightSeeds(deskId, flowno, barcode, userId, isValid); + } } } diff --git a/WcfServiceAuthentication/AuthenticationInspector.cs b/WcfServiceAuthentication/AuthenticationInspector.cs index c927b27..7648724 100644 --- a/WcfServiceAuthentication/AuthenticationInspector.cs +++ b/WcfServiceAuthentication/AuthenticationInspector.cs @@ -159,15 +159,18 @@ namespace WcfServiceAuthentication { return; } - // LogHelper.debug("1 checkRestrictUsers", string.Format(" checking ..userId {0} , current list size {1}, maxSize {2} ", userId, restrictUsers.Count, WmsConstants.MAX_ONLINE_USERS)); + // if (!AuthenticationInspector.restrictUsers.Contains(userId)) { if (AuthenticationInspector.restrictUsers.Count >= WmsConstants.MAX_ONLINE_USERS) { + LogHelper.debug("1 checkRestrictUsers", string.Format(" checking ..userId {0} , current list size {1}, maxSize {2} ", userId, restrictUsers.Count, WmsConstants.MAX_ONLINE_USERS)); + LogHelper.debug("checkRestrictUsers", string.Format(" to remove ..userId {0} ", AuthenticationInspector.restrictUsers[0])); AuthenticationInspector.restrictUsers.RemoveAt(0); } + AuthenticationInspector.restrictUsers.Add(userId); foreach (int i in AuthenticationInspector.restrictUsers) diff --git a/epick/SeedsOutService.designer.cs b/epick/SeedsOutService.designer.cs index 1a7ac34..9611d4c 100644 --- a/epick/SeedsOutService.designer.cs +++ b/epick/SeedsOutService.designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SeedsOutService)); this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl(); this.barButtonGroup1 = new DevExpress.XtraBars.BarButtonGroup(); @@ -107,7 +108,7 @@ this.txtLocation = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup15 = new DevExpress.XtraLayout.LayoutControlGroup(); this.textEdit2 = new DevExpress.XtraEditors.TextEdit(); - 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(); @@ -709,8 +710,8 @@ // this.tabbedControlGroup2.Location = new System.Drawing.Point(0, 0); this.tabbedControlGroup2.Name = "tabbedControlGroup2"; - this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup10; - this.tabbedControlGroup2.SelectedTabPageIndex = 2; + this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup3; + this.tabbedControlGroup2.SelectedTabPageIndex = 0; this.tabbedControlGroup2.Size = new System.Drawing.Size(2090, 188); this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup3, diff --git a/epick/SeedsOutService.resx b/epick/SeedsOutService.resx index d93e06a..f963065 100644 --- a/epick/SeedsOutService.resx +++ b/epick/SeedsOutService.resx @@ -303,7 +303,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - CQAAAk1TRnQBSQFMAgEBAgEAAbABBwGwAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAbgBBwG4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs b/winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs index 7950288..f759451 100644 --- a/winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs +++ b/winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs @@ -247,6 +247,9 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsOutPickRequest/lightByJob", ReplyAction="http://tempuri.org/IWmsOutPickRequest/lightByJobResponse")] System.Data.DataTable lightByJob(int userId, string jobNo, bool isValid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsOutPickRequest/lightSeeds", ReplyAction="http://tempuri.org/IWmsOutPickRequest/lightSeedsResponse")] + System.Data.DataTable lightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsOutPickRequest/updatePortPickingStatus", ReplyAction="http://tempuri.org/IWmsOutPickRequest/updatePortPickingStatusResponse")] bool updatePortPickingStatus(int userId, int color, int labId, int address, decimal count); @@ -598,6 +601,10 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest { return base.Channel.lightByJob(userId, jobNo, isValid); } + public System.Data.DataTable lightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid) { + return base.Channel.lightSeeds(deskId, flowno, barcode, userId, isValid); + } + public bool updatePortPickingStatus(int userId, int color, int labId, int address, decimal count) { return base.Channel.updatePortPickingStatus(userId, color, labId, address, count); } diff --git a/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService1.wsdl b/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService1.wsdl index c328a14..70d54c7 100644 --- a/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService1.wsdl +++ b/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService1.wsdl @@ -472,6 +472,12 @@ + + + + + + @@ -811,6 +817,10 @@ + + + + @@ -1527,6 +1537,15 @@ + + + + + + + + + diff --git a/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd b/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd index 86034ea..1ece740 100644 --- a/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd +++ b/winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd @@ -1698,6 +1698,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +