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

Compare commits

base: root:db2e131db6507b0dcbd6ebebd47fba5a9ac93a44
Branches Tags
root:main
root:ldjadv
root:ldjO
root:medicine
root:ldj
...
compare: root:15760b79b3c2e3d128b6ab6dfd6a4db2feaca989
Branches Tags
root:ldjadv
root:ldjO
root:medicine
root:ldj
root:main

3 Commits
db2e131db6 ... 15760b79b3

Author SHA1 Message Date
bobwang 15760b79b3 //非自动装车时，释放已装车容器，自动装车时不能释放，会导致客户集货位释放从而失去客户和容器的对应关系限制 2024-03-21 13:34:31 +08:00
bobwang 282b0ae460 提交修改 2024-03-21 13:29:31 +08:00
bobwang 6ddd51ad0b 修正代码合并的问题 2024-03-21 13:24:55 +08:00
1 changed files with 171 additions and 162 deletions
Show Stats Expand all files Collapse all files

25
WcfService1/BLL/lWmsPlate.cs
View File

@ -628,7 +628,7 @@ namespace DeiNiu.wms.Logical
{ {
toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder)); toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder));
toP.Update(); toP.Update();
logPlate.Debug(string.Format("plate {0} start new trans {1}", toPlate, toP.transNo)); logPlate.Debug(string.Format("1 plate {0} start new trans {1}", toPlate, toP.transNo));
new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo; new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo;
} }
@ -840,7 +840,7 @@ namespace DeiNiu.wms.Logical
{ {
toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder)); toP.transNo = Util.getOrderNo(enumCreateOrderType.transOrder, _obj.getNextSeq(enumCreateOrderType.transOrder));
logPlate.Debug(string.Format("plate {0} start new trans {1}", toPlate, toP.transNo)); logPlate.Debug(string.Format("2 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo, toP.ID));
new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo; new lTmsTranRequest(operId).createSimpleTran(requests, toP);// req.transNo = toP.transNo;
// return enumRegPlateResult.完成装车集货后才能装车; // return enumRegPlateResult.完成装车集货后才能装车;
@ -889,6 +889,7 @@ namespace DeiNiu.wms.Logical
{ {
toP.Update(); toP.Update();
} }
logPlate.Debug(string.Format("3 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo, toP.ID));
foreach (WmsOutPickRequest req in requests) foreach (WmsOutPickRequest req in requests)
{ {
@ -898,8 +899,9 @@ namespace DeiNiu.wms.Logical
req.Update(); req.Update();
} }
} }
//非自动装车时，释放已装车容器，自动装车时不能释放，会导致客户集货位释放从而失去客户和容器的对应关系限制
if (WmsConstants.IS_PLATE_IN_LINE && !WmsConstants.AUTO_LOAD_TRUCK)
{
if (fromP.ID > 0) if (fromP.ID > 0)
{ {
//to release plates of customer type //to release plates of customer type
@ -919,6 +921,8 @@ namespace DeiNiu.wms.Logical
//to release plate of Line //to release plate of Line
// 线路码头容器里面的客户容器是否已经全部装车了，如果都已装车(释放)，则释放线路容器 // 线路码头容器里面的客户容器是否已经全部装车了，如果都已装车(释放)，则释放线路容器
if (fromP.plateLevel == (int)enumPlateLevel.客户集货) if (fromP.plateLevel == (int)enumPlateLevel.客户集货)
{ {
WmsPlate linePlate = new WmsPlate(fromP.inPlate); WmsPlate linePlate = new WmsPlate(fromP.inPlate);
@ -933,6 +937,9 @@ namespace DeiNiu.wms.Logical
} }
} }
}
string ldTask = fromP.jobNo; string ldTask = fromP.jobNo;
@ -1083,7 +1090,7 @@ namespace DeiNiu.wms.Logical
if (tranP.plateLevel == (int)enumPlateLevel.临时容器) if (tranP.plateLevel == (int)enumPlateLevel.临时容器)
{ {
// tranP.Delete(); tranP.Delete();
} }
scope.Complete(); scope.Complete();
@ -1154,7 +1161,8 @@ namespace DeiNiu.wms.Logical
} }
DataTable dt; DataTable dt;
if (inPortId > 0) { if (inPortId > 0)
{
dt = plateStock.getPlateIn(plateId, inPortId); dt = plateStock.getPlateIn(plateId, inPortId);
} }
else else
@ -1348,7 +1356,9 @@ namespace DeiNiu.wms.Logical
public DataTable getUnLoadTruckStks(string toPlate, int cnt) public DataTable getUnLoadTruckStks(string toPlate, int cnt)
{ {
return plateStk.getUnLoadTruckStks(toPlate,cnt); log.Debug(string.Format("...... to getUnLoadTruckStks plateId {0}",toPlate));
WmsPlate toP = new WmsPlate(toPlate);
return plateStk.getUnLoadTruckStks(toP.transNo,cnt);
} }
public DataTable getLoadContent(string toPlate) public DataTable getLoadContent(string toPlate)
@ -1366,4 +1376,3 @@ namespace DeiNiu.wms.Logical
} }