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

合并

This commit is contained in:
bobwang 2024-03-21 13:00:07 +08:00
parent 27b864ee77 a388f80e7c
commit db2e131db6
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
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("1 plate {0} start new trans {1}", toPlate, toP.transNo)); logPlate.Debug(string.Format("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("2 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo,toP.ID)); logPlate.Debug(string.Format("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;
// return enumRegPlateResult.完成装车集货后才能装车; // return enumRegPlateResult.完成装车集货后才能装车;
@ -889,7 +889,6 @@ 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)
{ {
@ -900,21 +899,20 @@ namespace DeiNiu.wms.Logical
} }
} }
if (WmsConstants.IS_PLATE_IN_LINE && !WmsConstants.AUTO_LOAD_TRUCK )
{
if (fromP.ID > 0)
{
//to release plates of customer type
List<WmsPlate> lst = getWmsPlate.getSubPlates(fromPlate);
foreach (WmsPlate s in lst) if (fromP.ID > 0)
{ {
s.releaseSubPlate(s.plateId); //to release customer and its subs //to release plates of customer type
// log.Debug(string.Format("on truck load, released plate {0}, type{1}", s.plateId, (enumPlateLevel)s.type)); List<WmsPlate> lst = getWmsPlate.getSubPlates(fromPlate);
}
getWmsPlate.releaseSubPlate(fromPlate); //to release custType type and its subs foreach (WmsPlate s in lst)
log.Debug(string.Format("on truck load, released plate {0} ", fromPlate)); {
s.releaseSubPlate(s.plateId); //to release customer and its subs
// log.Debug(string.Format("on truck load, released plate {0}, type{1}", s.plateId, (enumPlateLevel)s.type));
} }
getWmsPlate.releaseSubPlate(fromPlate); //to release custType type and its subs
log.Debug(string.Format("on truck load, released plate {0} ", fromPlate));
}
@ -934,12 +932,9 @@ namespace DeiNiu.wms.Logical
} }
} }
}
} }
string ldTask = fromP.jobNo; string ldTask = fromP.jobNo;
// if (string.IsNullOrEmpty(ldTask)) // 非固定容器、非客户集货类型的容器，容器没有装车任务信息 // if (string.IsNullOrEmpty(ldTask)) // 非固定容器、非客户集货类型的容器，容器没有装车任务信息
{ {
@ -1088,7 +1083,7 @@ namespace DeiNiu.wms.Logical
if (tranP.plateLevel == (int)enumPlateLevel.临时容器) if (tranP.plateLevel == (int)enumPlateLevel.临时容器)
{ {
tranP.Delete(); // tranP.Delete();
} }
scope.Complete(); scope.Complete();
@ -1353,9 +1348,7 @@ namespace DeiNiu.wms.Logical
public DataTable getUnLoadTruckStks(string toPlate, int cnt) public DataTable getUnLoadTruckStks(string toPlate, int cnt)
{ {
log.Debug(string.Format("...... to getUnLoadTruckStks plateId {0}",toPlate)); return plateStk.getUnLoadTruckStks(toPlate,cnt);
WmsPlate toP = new WmsPlate(toPlate);
return plateStk.getUnLoadTruckStks(toP.transNo,cnt);
} }
public DataTable getLoadContent(string toPlate) public DataTable getLoadContent(string toPlate)