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 6ddd51ad0b
1 changed files with 153 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WcfService1/BLL/lWmsPlate.cs
View File

@ -921,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);
@ -1159,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
@ -1373,4 +1376,3 @@ namespace DeiNiu.wms.Logical
} }