新增明细 加判断条件
计数页面修改 散料入新增条件 出库单据接口 修改判断条件
This commit is contained in:
1 parent
4334683c6f
commit
1365920fee
15 files changed
+66
-32
No files matched your search
@@ -46,8 +46,10 @@ public class ReceiptSLInController : BaseController
|
||||
&& x.Status != LocationStatus.任务锁
|
||||
&& x.Status != LocationStatus.满货
|
||||
&& x.Status != LocationStatus.空仓位
|
||||
&& x.IsStop == false
|
||||
&& x.Row == stations.First().Row)
|
||||
.OrderBy(x => x.Layer)
|
||||
.OrderBy(x => x.Status)
|
||||
.ThenBy(x => x.Layer)
|
||||
.ThenByDescending(x => x.Line)
|
||||
.FirstOrDefault();
|
||||
if (box == null && stations.Count == 2)
|
||||
@@ -55,8 +57,10 @@ public class ReceiptSLInController : BaseController
|
||||
&& x.Status != LocationStatus.任务锁
|
||||
&& x.Status != LocationStatus.满货
|
||||
&& x.Status != LocationStatus.空仓位
|
||||
&& x.IsStop == false
|
||||
&& x.Row == stations.Last().Row)
|
||||
.OrderBy(x => x.Layer)
|
||||
.OrderBy(x => x.Status)
|
||||
.ThenBy(x => x.Layer)
|
||||
.ThenByDescending(x => x.Line)
|
||||
.FirstOrDefault();
|
||||
|
||||
@@ -104,9 +108,9 @@ public class ReceiptSLInController : BaseController
|
||||
|
||||
if (box != null)
|
||||
{
|
||||
if (box.Type != LocationTypeEnum.散料库站台)
|
||||
if (string.IsNullOrEmpty(box.ContainerCode))
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
|
||||
return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!");
|
||||
}
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user