点数查询新建状态

散料,盘料取消统一状态检查
货架入,bindingdata 新增id,后台根据id判断单据明细状态
This commit is contained in:
zhougf committed 2024-06-02 01:01:03 +08:00
1 parent 0d346bd155
commit ec33bdf946
7 files changed
+20 -9

No files matched your search

@@ -267,7 +267,8 @@ namespace HHWMS.Web.Controllers
{
return JsonMore(null, 500, $"数量必须大于0!");
}
var receiptDetail = _unitwork.FindSingle<ReceiptDetail>(x => x.UniqueCode.Equals(uniqueCode));
var receiptDetail = _unitwork.FindSingle<ReceiptDetail>(x => x.UniqueCode.Equals(uniqueCode)
&& x.ReceiptHeaderId.ToString() == code);
if (receiptDetail != null)
{
receiptDetail.Qty = qty;
@@ -148,7 +148,8 @@ namespace HHWMS.Web.Controllers
{
return JsonMore(null, 500, "周转箱存在未捡货任务,请捡货完成后再执行入库操作!");
}
//单据明细验证
/*
//单据明细验证
var errDetails = _unitWork.Find<ReceiptDetail>(x => data.Select(x => x.UniqueCode).ToList()
.Contains(x.UniqueCode)
&& x.Status != ReceiptStatusEnum.新建).ToList();
@@ -160,7 +161,7 @@ namespace HHWMS.Web.Controllers
msg += $"{errDetail.UniqueCode}\n";
}
return JsonMore(null, 500, msg);
}
}*/
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
data.Select(x => x.ReceiptCode).ToList().Contains(x.Code))
@@ -159,7 +159,8 @@ public class ReceiptSLInController : BaseController
{
try
{
var errDetails = _unitWork.Find<ReceiptDetail>(x => data.Select(x => x.UniqueCode).ToList()
/*
var errDetails = _unitWork.Find<ReceiptDetail>(x => data.Select(x => x.UniqueCode).ToList()
.Contains(x.UniqueCode)
&& x.Status != ReceiptStatusEnum.新建).ToList();
if (errDetails.Any())
@@ -171,6 +172,7 @@ public class ReceiptSLInController : BaseController
}
return JsonMore(null, 500, msg);
}
*/
// 查找明细,修改对应状态,并且 绑定物料周转箱
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
@@ -73,9 +73,9 @@ public class ReceiptShelfInController : BaseController
{
try
{
var errDetails = _unitWork.Find<ReceiptDetail>(x => data.Select(x => x.UniqueCode).ToList()
.Contains(x.UniqueCode)
&& x.Status != ReceiptStatusEnum.新建).ToList();
var errDetails = _unitWork.Find<ReceiptDetail>(x =>
data.Select(y => y.ID).ToList().Contains(x.ID)
&& x.Status != ReceiptStatusEnum.新建).ToList();
if (errDetails.Any())
{
var msg = "以下明细不是新建状态:\n";