添加打印模板配置
This commit is contained in:
1 parent
b627851ab5
commit
ebdd40c518
22 files changed
+585
-191
No files matched your search
@@ -118,114 +118,6 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
[ActionDescription("Sys.Create")]
|
||||
public ActionResult CreateDetails(int id)
|
||||
{
|
||||
var vm = Wtm.CreateVM<ReceiptDetailVM>(passInit: true);
|
||||
vm.Entity.ReceiptHeaderId = id;
|
||||
vm.Entity.ReceiptHeader = new ReceiptHeader();
|
||||
//vm.Entity.ReceiptHeader.Code = vm.DC.Set<ReceiptHeader>().Find(id).Code;
|
||||
return PartialView(vm);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[ActionDescription("Sys.Create")]
|
||||
public ActionResult CreateDetails(ReceiptDetailVM vm)
|
||||
{
|
||||
var header = _unitwork.FindSingle<ReceiptHeader>(x => x.ID == vm.Entity.ReceiptHeaderId);
|
||||
if(header.FirstStatus != ReceiptStatusEnum.新建)
|
||||
{
|
||||
return FFResult().Alert("主单据不是新建状态,不能新建明细!");
|
||||
}
|
||||
var plList = vm.Entity.MaterialCode.Split("\n");
|
||||
var slList = vm.Entity.Lot.Split("\n");
|
||||
var detailList = new List<ReceiptDetail>();
|
||||
foreach(var item in plList)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item))
|
||||
{
|
||||
detailList.Add(new ReceiptDetail
|
||||
{
|
||||
UniqueCode = item,
|
||||
Status = 0,
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
ReceiptHeaderId = vm.Entity.ReceiptHeaderId
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var item in slList)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item))
|
||||
{
|
||||
detailList.Add(new ReceiptDetail
|
||||
{
|
||||
UniqueCode = item,
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
Status = 0,
|
||||
ReceiptHeaderId = vm.Entity.ReceiptHeaderId
|
||||
});
|
||||
}
|
||||
}
|
||||
var uniqueGroup = detailList.GroupBy(x => x.UniqueCode);
|
||||
|
||||
if (uniqueGroup.Any(x => x.Count() > 1))
|
||||
{
|
||||
var codeList = uniqueGroup.Where(x => x.Count() > 1)
|
||||
.Select(x => x.Key)
|
||||
.ToList();
|
||||
return FFResult().Alert($"新增明细中,存在重复的唯一码!{String.Join(", ", codeList.ToArray())}");
|
||||
}
|
||||
|
||||
// 判断唯一码是否已在库内
|
||||
var reDetailList = _unitwork.Find<ReceiptDetail>(x => x.Status == ReceiptStatusEnum.新建)
|
||||
.Select(x => new { x.UniqueCode, x.ReceiptHeader.Code })
|
||||
.ToList();
|
||||
var reDel = reDetailList.Select(x => x.UniqueCode)
|
||||
.Intersect(detailList.Select(x => x.UniqueCode));
|
||||
if (reDel.Count() > 0)
|
||||
{
|
||||
var tt= reDetailList.Where(x => reDel.Contains(x.UniqueCode))
|
||||
.ToList();
|
||||
var returnStr = "";
|
||||
foreach (var item in tt)
|
||||
{
|
||||
returnStr += $"单号:{item.Code};唯一码:{item.UniqueCode};";
|
||||
}
|
||||
return FFResult().Alert($"新增明细中,存在已添加的唯一码!{returnStr}");
|
||||
}
|
||||
|
||||
// 判断唯一码是否已在库内
|
||||
var invList = _unitwork.Find<Inventory>(x => 1 == 1)
|
||||
.Select(x => x.UniqueCode)
|
||||
.ToList();
|
||||
if(invList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0)
|
||||
{
|
||||
return FFResult().Alert("新增明细中,存在已在库内的唯一码!");
|
||||
}
|
||||
// 补充物料明细
|
||||
foreach (var item in detailList)
|
||||
{
|
||||
var materialqr = _unitwork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(item.UniqueCode));
|
||||
if(materialqr == null)
|
||||
{
|
||||
return FFResult().Alert("新增明细中,存在不是WMS生成的唯一码!");
|
||||
}
|
||||
var material = _unitwork.FindSingle<Material>(x => x.QRCode.Equals(materialqr.QRCode));
|
||||
item.MaterialCode = material.MaterialCode;
|
||||
item.MaterialName = material.MaterialName;
|
||||
item.MaterialSpec = material.MaterialSpec;
|
||||
item.MaterialType = material.MaterialType;
|
||||
item.MaterialUnit = material.MaterialUnit;
|
||||
item.Batch = material.Batch;
|
||||
item.Qty = material.Qty;
|
||||
item.SupplierCode = material.SupplierCode;
|
||||
item.CreateBy = Wtm.LoginUserInfo.ITCode;
|
||||
item.CreateTime = DateTime.Now;
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
return FFResult().CloseDialog().RefreshGrid(index: 1);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Edit
|
||||
|
||||
Reference in new issue
Block a user