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

Compare commits

base: root:ebc38709b157125954f7fed71230b4d9f8c44c7c
Branches Tags
root:main
root:ldjadv
root:ldjO
root:medicine
root:ldj
..
compare: root:68774ba57aedc55e8937bcb23b0952de34f2f646
Branches Tags
root:ldjadv
root:ldjO
root:medicine
root:ldj
root:main

No commits in common. "ebc38709b157125954f7fed71230b4d9f8c44c7c" and "68774ba57aedc55e8937bcb23b0952de34f2f646" have entirely different histories.
ebc38709b1 ... 68774ba57a

12 changed files with 19 additions and 28 deletions
Show Stats Expand all files Collapse all files

6
WcfService1/BLL/lWmsOutPickPort.cs
View File

@ -1463,12 +1463,12 @@ namespace DeiNiu.wms.Logical
/// <param name="toFlowNo">周转箱号</param>
/// <returns></returns>
internal enumRepResult seedsPickOut(string flowNo,int skuId,string productDate, string batch, int outDetailId,
decimal seedCnt, string toFlowNo,int inDetailId, bool isForceClose, int lightOperid=0)
decimal seedCnt, string toFlowNo,int inDetailId, bool isForceClose)
{
logTest.Debug(string.Format(" flowNo:{0} ，batch :{1} , outDetailId:{2} , seedsCnt:{3}, toFlowNo {4} , lightOperid {5}", flowNo, batch ,outDetailId, seedCnt,toFlowNo, lightOperid));
logTest.Debug(string.Format(" flowNo:{0} ，batch :{1} , outDetailId:{2} , seedsCnt:{3}, toFlowNo {4} ", flowNo, batch ,outDetailId, seedCnt,toFlowNo));
// WmsOutDetail wod = new WmsOutDetail(outDetailId);
// WmsOutRequest wor = new WmsOutRequest(wod.orderNo);
this.operId = lightOperid;
bool isZhitongSeed = inDetailId > 0;

2
WcfService1/IWmsOutPickRequest.cs
View File

@ -220,7 +220,7 @@ namespace DeiNiu.Wcf
[OperationContract]
enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId);
enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);

6
WcfService1/WmsOutPickRequestService.svc.cs
View File

@ -627,11 +627,9 @@ namespace DeiNiu.Wcf
return lopp.prePareLightSeeds(deskId, flowno, barcode, userId, isValid);
}
public enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose,int userId)
public enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose)
{
if(userId>0) lopp.operId = userId;
return lopp.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose,userId);
return lopp.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
}
}
}

7
deiniuWMS.sln
View File

@ -110,11 +110,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "view", "view\", "{8288A0EA-
SlnRelativePath = "view\"
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{0733D196-F4F2-4152-ADFA-3903E897C0C6}"
ProjectSection(SolutionItems) = preProject
得牛WMS.pptx = 得牛WMS.pptx
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@ -480,7 +475,7 @@ Global
{8288A0EA-E086-4EB8-AD75-D4038F5E5243} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
VisualSVNWorkingCopyRoot = .
SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
EndGlobalSection
EndGlobal

2
winform/.vs/wms.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

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

@ -266,7 +266,7 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest {
System.Data.DataTable getLightTasks(string query, int wareHouse, int partion, int lineId, int state, string date, bool isLight);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsOutPickRequest/seedsPickOut2", ReplyAction="http://tempuri.org/IWmsOutPickRequest/seedsPickOut2Response")]
DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId);
DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@ -628,8 +628,8 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest {
return base.Channel.getLightTasks(query, wareHouse, partion, lineId, state, date, isLight);
}
public DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId) {
return base.Channel.seedsPickOut2(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose, userId);
public DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose) {
return base.Channel.seedsPickOut2(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
}
}
}

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

@ -1845,7 +1845,6 @@
<xs:element minOccurs="0" name="toFlowNo" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="inDetailId" type="xs:int" />
<xs:element minOccurs="0" name="isForceClose" type="xs:boolean" />
<xs:element minOccurs="0" name="userId" type="xs:int" />
</xs:sequence>
</xs:complexType>
</xs:element>

8
winform/epick/SeedsOutService.cs
View File

@ -834,7 +834,7 @@ namespace DeiNiu.wms.win
}
int order = port;
enumLabelPickType pickType = enumLabelPickType.seedsDesk;
enumLabelPickType pickType = enumLabelPickType.seed;
if (port == 0)//一次分播
@ -849,7 +849,7 @@ namespace DeiNiu.wms.win
#if DEBUG
// port = 17;
#endif
// order =getOrder(port);
// int order =getOrder(port);
elelab.pick.init_port(pickType);
@ -860,14 +860,14 @@ namespace DeiNiu.wms.win
{
this.Invoke(new showStatus(delegate ()
{
//startQuery();
startQuery();
}));
}
else
{
//startQuery();
startQuery();
}
/*
if (elelab.pick.activeComports.Count == 0)

6
winform/epick/elelable/pick.cs
View File

@ -623,9 +623,9 @@ namespace elelab
SeedsLabel lb = currentElables[orderId][lableId];
LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1} , trying to update db, userId is {2} ", lb.deskId,lableId, lb.userId));
LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1} , trying to update db, userId is ", lb.deskId,lableId, userId));
enumRepResult rs = client.seedsPickOut2(lb.flowNo,lb.skuId,lb.productDate,lb.batch,lb.outDetailId,lb.count,lb.toFlowNo,lb.inDetailId,false, lb.userId);//本次拣选完毕
enumRepResult rs = client.seedsPickOut2(lb.flowNo,lb.skuId,lb.productDate,lb.batch,lb.outDetailId,lb.count,lb.toFlowNo,lb.inDetailId,false);//本次拣选完毕
LogHelper.debug(typeof(pick), string.Format(" ......... update result {0}", rs ));
isOkay = rs == enumRepResult.成功;
@ -904,7 +904,7 @@ namespace elelab
if (!clearOrder(orderPort, orderId))
{
// return false;
return false;
}
unart_manage.com_manage[orderPort].write_data(ele_data_comment);

1
winform/epick/wcf/ServiceLight.cs
View File

@ -202,7 +202,6 @@ namespace DeiNiu.wms.win.epick
el.inDetailId = Convert.ToInt32(dr["inDetailId"].ToString());
el.userId = userId;
el.isValid = isValid;
el.name = dr["goodsName"].ToString();
els.Add(el);
}

2
winform/wms.csproj
View File

@ -29,7 +29,7 @@
<PublisherName>得牛软件</PublisherName>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>340</ApplicationRevision>
<ApplicationRevision>336</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

BIN
得牛WMS.pptx
View File

Binary file not shown.