页面数量合计;

出库移库,默认状态
调整条码打印
This commit is contained in:
zgf committed 2024-01-20 15:15:38 +08:00
1 parent cec65caa32
commit 67227db833
12 files changed
+112 -326

No files matched your search

@@ -253,6 +253,14 @@ namespace HHWMS.Web.Controllers
{
try
{
var codeList = data.AsEnumerable().Select(x => x.MaterialCode).ToHashSet();
var matList = _unitwork.Find<Material2>(x => codeList.Contains(x.Code));
//var typeList = matList.Select(x => x.Type).ToHashSet();
var dc1 = Wtm.CreateDC(cskey: "default");
var statusList = dc1.Set<SysDictData>()
.Where(x => x.DictType == "MaterialType")
.ToList();
var shipment = new ShipmentHeader2();
shipment.WarehouseId = int.Parse(warehouseId);
shipment.Code = _unitwork.GetSerialNumber("QTC");
@@ -267,16 +275,19 @@ namespace HHWMS.Web.Controllers
var detailList = new List<ShipmentDetail2>();
foreach (var item in data)
{
var ma = matList.FirstOrDefault(y => y.Code == item.MaterialCode);
var st = statusList.FirstOrDefault(x => x.DictValue == ma.Type);
var detail = new ShipmentDetail2();
detail.WarehouseId = shipment.WarehouseId;
detail.ShipmentId = shipment.ID;
detail.ShipmentCode = shipment.Code;
detail.MaterialCode = item.MaterialCode;
detail.MaterialName = item.MaterialName;
detail.Lot = item.Lot;
detail.MaterialName = HttpUtility.HtmlDecode(item.MaterialName);
detail.Lot = HttpUtility.HtmlDecode(item.Lot);
detail.Qty = item.ThisQty;
detail.Unit = item.Unit;
detail.InventoryStatus = item.Status;
detail.InventoryStatus = "A,Q,R".Contains(item.Status) && !string.IsNullOrEmpty(item.Status) ? item.Status : st.Remark;
detail.Batch = item.Batch;
detail.Status = 0;
detail.CreateTime = DateTime.Now;
@@ -306,10 +317,6 @@ namespace HHWMS.Web.Controllers
var _unitwork = new UnitWork(Wtm);
var list = _unitwork.Find<Inventory2>(x =>
x.WarehouseId == int.Parse(warehouseId)
&& x.MaterialCode.Contains(materialCode)
&& x.MaterialName.Contains(materialName)
&& x.Batch.Contains(batch)
&& x.Lot.Contains(lot)
).Select(x => new
{
x.LocationCode,
@@ -320,10 +327,33 @@ namespace HHWMS.Web.Controllers
x.ContainerCode,
x.SupplierName,
x.Qty,
UserDef2 = x.Status ?? "",
UserDef2 = "",
ThisQty = x.Qty,
UserDef3 = ""
UserDef3 = "",
Status = "A,Q,R".Contains(x.Status) ? x.Status : "",
x.Unit
}).ToList();
if (!string.IsNullOrEmpty(materialCode))
{
list = list.Where(x => x.MaterialCode.Contains(materialCode))
.ToList();
}
if (!string.IsNullOrEmpty(materialName))
{
list = list.Where(x => x.MaterialName.Contains(HttpUtility.HtmlDecode(materialName)))
.ToList();
}
if (!string.IsNullOrEmpty(batch))
{
list = list.Where(x => x.Batch.Contains(batch))
.ToList();
}
if (!string.IsNullOrEmpty(lot))
{
list = list.Where(x => x.Lot.Contains(HttpUtility.HtmlDecode(lot)))
.ToList();
}
return JsonMore(list);
}
@@ -352,10 +382,19 @@ namespace HHWMS.Web.Controllers
var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode;
var _unitwork = new UnitWork(Wtm);
var dc = Wtm.CreateDC(cskey: "hangyong");
using (var trans = dc.BeginTransaction())
{
try
{
var codeList = data.AsEnumerable().Select(x => x.MaterialCode).ToHashSet();
var matList = _unitwork.Find<Material2>(x => codeList.Contains(x.Code));
//var typeList = matList.Select(x => x.Type).ToHashSet();
var dc1 = Wtm.CreateDC(cskey: "default");
var statusList = dc1.Set<SysDictData>()
.Where(x => x.DictType == "MaterialType")
.ToList();
var shipment = new ShipmentHeader2();
shipment.WarehouseId = int.Parse(warehouseId);
shipment.Code = _unitwork.GetSerialNumber("ZYC");
@@ -370,19 +409,21 @@ namespace HHWMS.Web.Controllers
var detailList = new List<ShipmentDetail2>();
foreach (var item in data)
{
var ma = matList.FirstOrDefault(y => y.Code == item.MaterialCode);
var st = statusList.FirstOrDefault(x => x.DictValue == ma.Type);
var detail = new ShipmentDetail2();
detail.WarehouseId = shipment.WarehouseId;
detail.ShipmentId = shipment.ID;
detail.ShipmentCode = shipment.Code;
detail.MaterialCode = item.MaterialCode;
detail.MaterialName = item.MaterialName;
detail.Lot = item.Lot;
detail.MaterialName = HttpUtility.HtmlDecode(item.MaterialName);
detail.Lot = HttpUtility.HtmlDecode(item.Lot);
detail.Qty = item.ThisQty;
detail.Unit = item.Unit;
detail.Unit = item.Unit ?? ma?.MasterUnit ?? "";
detail.UserDef3 = item.UserDef3;//地点
//detail.PurchasQty = item.THISQTYUOM;
//detail.PurchasUnits = item.UOM_0;
detail.InventoryStatus = item.Status;
detail.InventoryStatus = "A,Q,R".Contains(item.Status) && !string.IsNullOrEmpty(item.Status) ? item.Status : st.Remark;
detail.PurchasUnits = item.UserDef2;//状态
detail.Batch = item.Batch;
detail.Status = 0;