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

Merge branch 'master' of http://ldj:3000/root/ldj

This commit is contained in:
bobwang 2024-05-24 19:15:23 +08:00
parent 05795ba223 2c4f788bba
commit 6e46a90e1a
11 changed files with 111 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -815,6 +815,20 @@ namespace DeiNiu.wms.Data.Model
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;

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

@ -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];
}
}
}

2
WcfService1/Android.svc.cs
View File

@ -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());

14
WcfService1/BLL/lWmsOutPickPort.cs
View File

@ -757,6 +757,20 @@ namespace DeiNiu.wms.Logical
}
/// <summary>
/// 返回亮灯数据
/// </summary>
/// <param name="deskId"></param>
/// <param name="flowno"></param>
/// <param name="barcode"></param>
/// <param name="userId"></param>
/// <param name="isValid"></param>
/// <returns></returns>
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);

6
WcfService1/IWmsOutPickRequest.cs
View File

@ -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);
}

2
WcfService1/Web.config
View File

@ -46,7 +46,7 @@
<!-- 要接收故障异常详细信息以进行调试，请将以下值设置为 true。在部署前设置为 false 以避免泄漏异常信息 -->
<serviceDebug includeExceptionDetailInFaults="false"/>
<!-- 开发调试引用服务时不需要权限拦截
--><AuthenticationBehavior/>
<AuthenticationBehavior/>-->
</behavior>
<behavior name="serviceBehaviorNoAuthor">
<!-- 为避免泄漏元数据信息，请在部署前将以下值设置为 false 并删除上面的元数据终结点 -->

5
WcfService1/WmsOutPickRequestService.svc.cs
View File

@ -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);
}
}
}

5
WcfServiceAuthentication/AuthenticationInspector.cs
View File

@ -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)

7
winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs
View File

@ -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);
}

19
winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService1.wsdl
View File

@ -472,6 +472,12 @@
<wsdl:message name="IWmsOutPickRequest_lightByJob_OutputMessage">
<wsdl:part name="parameters" element="tns:lightByJobResponse" />
</wsdl:message>
<wsdl:message name="IWmsOutPickRequest_lightSeeds_InputMessage">
<wsdl:part name="parameters" element="tns:lightSeeds" />
</wsdl:message>
<wsdl:message name="IWmsOutPickRequest_lightSeeds_OutputMessage">
<wsdl:part name="parameters" element="tns:lightSeedsResponse" />
</wsdl:message>
<wsdl:message name="IWmsOutPickRequest_updatePortPickingStatus_InputMessage">
<wsdl:part name="parameters" element="tns:updatePortPickingStatus" />
</wsdl:message>
@ -811,6 +817,10 @@
<wsdl:input wsaw:Action="http://tempuri.org/IWmsOutPickRequest/lightByJob" message="tns:IWmsOutPickRequest_lightByJob_InputMessage" />
<wsdl:output wsaw:Action="http://tempuri.org/IWmsOutPickRequest/lightByJobResponse" message="tns:IWmsOutPickRequest_lightByJob_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="lightSeeds">
<wsdl:input wsaw:Action="http://tempuri.org/IWmsOutPickRequest/lightSeeds" message="tns:IWmsOutPickRequest_lightSeeds_InputMessage" />
<wsdl:output wsaw:Action="http://tempuri.org/IWmsOutPickRequest/lightSeedsResponse" message="tns:IWmsOutPickRequest_lightSeeds_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="updatePortPickingStatus">
<wsdl:input wsaw:Action="http://tempuri.org/IWmsOutPickRequest/updatePortPickingStatus" message="tns:IWmsOutPickRequest_updatePortPickingStatus_InputMessage" />
<wsdl:output wsaw:Action="http://tempuri.org/IWmsOutPickRequest/updatePortPickingStatusResponse" message="tns:IWmsOutPickRequest_updatePortPickingStatus_OutputMessage" />
@ -1527,6 +1537,15 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="lightSeeds">
<soap:operation soapAction="http://tempuri.org/IWmsOutPickRequest/lightSeeds" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="updatePortPickingStatus">
<soap:operation soapAction="http://tempuri.org/IWmsOutPickRequest/updatePortPickingStatus" style="document" />
<wsdl:input>

30
winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd
View File

@ -1698,6 +1698,36 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="lightSeeds">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="deskId" type="xs:int" />
<xs:element minOccurs="0" name="flowno" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="barcode" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="userId" type="xs:int" />
<xs:element minOccurs="0" name="isValid" type="xs:boolean" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="lightSeedsResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="lightSeedsResult" nillable="true">
<xs:complexType>
<xs:annotation>
<xs:appinfo>
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/" />
</xs:appinfo>
</xs:annotation>
<xs:sequence>
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updatePortPickingStatus">
<xs:complexType>
<xs:sequence>