diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs index de91068..d404f2f 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs @@ -82,6 +82,7 @@ namespace HHWMS.Web.Controllers } else { + //vm.Entity.SourceLine = vm.DoAdd(); if (!ModelState.IsValid) { diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs index c2a6cb5..2806edc 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs @@ -39,6 +39,8 @@ namespace HHWMS.Web.Controllers var vm = Wtm.CreateVM(passInit: true); if (ModelState.IsValid) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + searcher.WarehouseId = int.Parse(warehouseId); vm.Searcher = searcher; return vm.GetJson(false); } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs index a2d45d8..8fe6792 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using ServiceReference1; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers; @@ -96,42 +97,54 @@ public class XWMSMFMController : BaseController [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - - var shipment = new ShipmentHeader2(); - shipment.Code = _unitwork.GetSerialNumber("SCC"); - shipment.SourceCode = data.FirstOrDefault().MFGNUM_0; - shipment.UserDef2 = data.FirstOrDefault().MFGLIN_0.ToString(); - shipment.Type = "SCC"; - shipment.FirstStatus = 0; - shipment.UserDef1 = data.FirstOrDefault().MFGFCY_0; - - _unitwork.Add(shipment); - - var detailList = new List(); - foreach (var item in data) + using (var tran = _unitwork.BeginTransaction()) { - var detail = new ShipmentDetail2(); - detail.ZoneCode = "L"; - detail.ShipmentId = shipment.ID; - detail.ShipmentCode = shipment.Code; - detail.SourceCode = item.MFGNUM_0; - detail.SourceLine = item.MFGLIN_0.ToString(); - detail.MaterialCode = item.ITMREF_0; - detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); - detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); - detail.Qty = item.THISQTYSTU; - detail.Unit = item.BOMSEQ_0.ToString(); - //detail.PurchasQty = item.THISQTYUOM; - //detail.PurchasUnits = item.UOM_0; - //detail.InventoryStatus = item.STA_0; - //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); - detail.Status = 0; - detail.CreateTime = DateTime.Now; - detailList.Add(detail); - } - _unitwork.BatchAdd(detailList.ToArray()); + try + { + var shipment = new ShipmentHeader2(); + shipment.WarehouseId = int.Parse(warehouseId); + shipment.Code = _unitwork.GetSerialNumber("SCC"); + shipment.SourceCode = data.FirstOrDefault().MFGNUM_0; + shipment.UserDef2 = data.FirstOrDefault().MFGLIN_0.ToString(); + shipment.Type = "SCC"; + shipment.FirstStatus = 0; + shipment.UserDef1 = data.FirstOrDefault().MFGFCY_0; + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.WarehouseId = shipment.WarehouseId; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.MFGNUM_0; + detail.SourceLine = item.MFGLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); + detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.Qty = item.THISQTYSTU; + detail.Unit = item.BOMSEQ_0.ToString(); + //detail.PurchasQty = item.THISQTYUOM; + //detail.PurchasUnits = item.UOM_0; + //detail.InventoryStatus = item.STA_0; + //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } return JsonMore(null); } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index 37ff364..197b22d 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -2,16 +2,12 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; -using System.Threading.Tasks; using System.Web; using HHWMS.Web.Models; -using MESTOWMSService; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json; -using ServiceReference1; -using SixLabors.ImageSharp.Drawing; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers; @@ -95,45 +91,57 @@ public class XWMSPOHController : BaseController [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - - var receipt = new ReceiptHeader2(); - receipt.Code = _unitwork.GetSerialNumber("CGR"); - receipt.SourceCode = data.FirstOrDefault().POHNUM_0; - receipt.SupplierCode = data.FirstOrDefault().BPSNUM_0; - receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; - receipt.Type = "CGR"; - receipt.FirstStatus = 0; - receipt.AppointmentTime = data.FirstOrDefault().ORDDAT_0; - receipt.UserDef2 = data.FirstOrDefault().POHFCY_0; - - _unitwork.Add(receipt); - - var detailList = new List(); - foreach(var item in data) + using (var tran = _unitwork.BeginTransaction()) { - var detail = new ReceiptDetail2(); - detail.ZoneCode = "L"; - detail.ReceiptId = receipt.ID; - detail.ReceiptCode = receipt.Code; - detail.SourceCode = item.POHNUM_0; - detail.SourceLine = item.POPLIN_0.ToString(); - detail.MaterialCode = item.ITMREF_0; - detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); - detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); - detail.Qty = item.THISQTYSTU; - detail.Unit = item.STU_0; - detail.PurchasQty = item.THISQTYUOM; - detail.PurchasUnits = item.UOM_0; - detail.Coefficient = item.UOMSTUCOE_0; - detail.InventoryStatus = item.STA_0; - detail.Batch = _unitwork.GetSerialNumber("HYB",5).Remove(3,2); - detail.Status = 0; - detail.CreateTime = DateTime.Now; - detailList.Add(detail); + try + { + var receipt = new ReceiptHeader2(); + receipt.WarehouseId = int.Parse(warehouseId); + receipt.Code = _unitwork.GetSerialNumber("CGR"); + receipt.SourceCode = data.FirstOrDefault().POHNUM_0; + receipt.SupplierCode = data.FirstOrDefault().BPSNUM_0; + receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; + receipt.Type = "CGR"; + receipt.FirstStatus = 0; + receipt.AppointmentTime = data.FirstOrDefault().ORDDAT_0; + receipt.UserDef2 = data.FirstOrDefault().POHFCY_0; + + _unitwork.Add(receipt); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ReceiptDetail2(); + detail.WarehouseId = receipt.WarehouseId; + detail.ReceiptId = receipt.ID; + detail.ReceiptCode = receipt.Code; + detail.SourceCode = item.POHNUM_0; + detail.SourceLine = item.POPLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); + detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.Qty = item.THISQTYSTU; + detail.Unit = item.STU_0; + detail.PurchasQty = item.THISQTYUOM; + detail.PurchasUnits = item.UOM_0; + detail.Coefficient = item.UOMSTUCOE_0; + detail.InventoryStatus = item.STA_0; + detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } } - _unitwork.BatchAdd(detailList.ToArray()); - return JsonMore(null); } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs index dabbff5..1795823 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using ServiceReference1; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers; @@ -57,7 +58,7 @@ public class XWMSPTHController : BaseController var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select - (x => new + (x => new { PRHFCY_0 = x.Field("PRHFCY_0"), RCPDAT_0 = x.Field("RCPDAT_0").ToShortDateString(), @@ -96,42 +97,54 @@ public class XWMSPTHController : BaseController [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - - var shipment = new ShipmentHeader2(); - shipment.Code = _unitwork.GetSerialNumber("CGT"); - shipment.SourceCode = data.FirstOrDefault().POHNUM_0; - shipment.ShipTo = data.FirstOrDefault().BPSNUM_0; - shipment.Type = "CGT"; - shipment.FirstStatus = 0; - shipment.AppointmentTime = data.FirstOrDefault().RCPDAT_0; - shipment.UserDef1 = data.FirstOrDefault().PRHFCY_0; - - _unitwork.Add(shipment); - - var detailList = new List(); - foreach (var item in data) + using (var tran = _unitwork.BeginTransaction()) { - var detail = new ShipmentDetail2(); - detail.ZoneCode = "L"; - detail.ShipmentId = shipment.ID; - detail.ShipmentCode = shipment.Code; - detail.SourceCode = item.PTHNUM_0; - detail.SourceLine = item.PTDLIN_0.ToString(); - detail.MaterialCode = item.ITMREF_0; - detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); - detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); - detail.Qty = item.THISQTYSTU; - detail.Unit = item.STU_0; - detail.PurchasQty = item.THISQTYUOM; - detail.PurchasUnits = item.UOM_0; - detail.InventoryStatus = item.STA_0; - detail.Status = 0; - detail.CreateTime = DateTime.Now; - detailList.Add(detail); - } - _unitwork.BatchAdd(detailList.ToArray()); + try + { + var shipment = new ShipmentHeader2(); + shipment.WarehouseId = int.Parse(warehouseId); + shipment.Code = _unitwork.GetSerialNumber("CGT"); + shipment.SourceCode = data.FirstOrDefault().POHNUM_0; + shipment.ShipTo = data.FirstOrDefault().BPSNUM_0; + shipment.Type = "CGT"; + shipment.FirstStatus = 0; + shipment.AppointmentTime = data.FirstOrDefault().RCPDAT_0; + shipment.UserDef1 = data.FirstOrDefault().PRHFCY_0; + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.WarehouseId = shipment.WarehouseId; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.PTHNUM_0; + detail.SourceLine = item.PTDLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); + detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.Qty = item.THISQTYSTU; + detail.Unit = item.STU_0; + detail.PurchasQty = item.THISQTYUOM; + detail.PurchasUnits = item.UOM_0; + detail.InventoryStatus = item.STA_0; + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } return JsonMore(null); } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs index 13a3dde..e9489b0 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using ServiceReference1; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers; @@ -53,7 +54,7 @@ public class XWMSSHIPController : BaseController var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select - (x => new + (x => new { SDHNUM_0 = x.Field("SDHNUM_0"), FCY_0 = x.Field("FCY_0"), @@ -84,48 +85,59 @@ public class XWMSSHIPController : BaseController [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - - var receipt = new ReceiptHeader2(); - receipt.Code = _unitwork.GetSerialNumber("DDS"); - receipt.SourceCode = data.FirstOrDefault().SDHNUM_0; - receipt.SupplierCode = data.FirstOrDefault().STOFCY_0; - receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; - receipt.Type = "DDS"; - receipt.FirstStatus = 0; - receipt.AppointmentTime = data.FirstOrDefault().SHIDAT_0; - receipt.UserDef2 = data.FirstOrDefault().FCY_0; - - _unitwork.Add(receipt); - - var detailList = new List(); - foreach (var item in data) + using (var tran = _unitwork.BeginTransaction()) { - var detail = new ReceiptDetail2(); - detail.ZoneCode = "L"; - detail.ReceiptId = receipt.ID; - detail.ReceiptCode = receipt.Code; - detail.SourceCode = item.SDHNUM_0; - detail.SourceLine = item.SDDLIN_0.ToString(); - detail.MaterialCode = item.ITMREF_0; - detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); - detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); - detail.Qty = item.QTYSTU_0; - detail.Unit = item.SAU_0; - detail.PurchasQty = item.QTY_0; - detail.PurchasUnits = item.SAU_0; - detail.InventoryStatus = item.STATUS; - detail.Batch = item.LOT_0; - detail.Status = 0; - detail.CreateTime = DateTime.Now; - detailList.Add(detail); + try + { + var receipt = new ReceiptHeader2(); + receipt.WarehouseId = int.Parse(warehouseId); + receipt.Code = _unitwork.GetSerialNumber("DDS"); + receipt.SourceCode = data.FirstOrDefault().SDHNUM_0; + receipt.SupplierCode = data.FirstOrDefault().STOFCY_0; + receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; + receipt.Type = "DDS"; + receipt.FirstStatus = 0; + receipt.AppointmentTime = data.FirstOrDefault().SHIDAT_0; + receipt.UserDef2 = data.FirstOrDefault().FCY_0; + + _unitwork.Add(receipt); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ReceiptDetail2(); + detail.WarehouseId = receipt.WarehouseId; + detail.ReceiptId = receipt.ID; + detail.ReceiptCode = receipt.Code; + detail.SourceCode = item.SDHNUM_0; + detail.SourceLine = item.SDDLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); + detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.Qty = item.QTYSTU_0; + detail.Unit = item.SAU_0; + detail.PurchasQty = item.QTY_0; + detail.PurchasUnits = item.SAU_0; + detail.InventoryStatus = item.STATUS; + detail.Batch = item.LOT_0; + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + receipt.TotalLines = detailList.Count(); + receipt.TotalQty = detailList.Sum(x => x.Qty); + _unitwork.Update(receipt); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } } - _unitwork.BatchAdd(detailList.ToArray()); - - receipt.TotalLines = detailList.Count(); - receipt.TotalQty = detailList.Sum(x => x.Qty); - _unitwork.Update(receipt); - return JsonMore(null); } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs index 3c35354..607ca97 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using ServiceReference1; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers; @@ -55,7 +56,7 @@ public class XWMSSOHController : BaseController var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select - (x => new + (x => new { SALFCY_0 = x.Field("SALFCY_0"), ORDDAT_0 = x.Field("ORDDAT_0").ToShortDateString(), @@ -84,44 +85,54 @@ public class XWMSSOHController : BaseController [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - - var shipment = new ShipmentHeader2(); - shipment.Code = _unitwork.GetSerialNumber("XSC"); - shipment.Type = "XSC"; - shipment.SourceCode = data.FirstOrDefault().SOHNUM_0; - shipment.ShipTo = data.FirstOrDefault().BPCORD_0; - shipment.FirstStatus = 0; - shipment.AppointmentTime = data.FirstOrDefault().ORDDAT_0; - shipment.UserDef1 = $"{data.FirstOrDefault().SALFCY_0} {data.FirstOrDefault().BPAADD_0}"; - - - _unitwork.Add(shipment); - - var detailList = new List(); - foreach (var item in data) + using (var tran = _unitwork.BeginTransaction()) { - var detail = new ShipmentDetail2(); - detail.ZoneCode = "L"; - detail.ShipmentId = shipment.ID; - detail.ShipmentCode = shipment.Code; - detail.SourceCode = item.SOHNUM_0; - detail.SourceLine = item.SOPLIN_0.ToString(); - detail.MaterialCode = item.ITMREF_0; - detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); - detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); - detail.Qty = item.THISQTYSTU; - detail.Unit = item.STU_0; - //detail.PurchasQty = item.THISQTYUOM; - //detail.PurchasUnits = item.UOM_0; - //detail.InventoryStatus = item.STA_0; - //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); - detail.Status = 0; - detail.CreateTime = DateTime.Now; - detailList.Add(detail); - } - _unitwork.BatchAdd(detailList.ToArray()); + try + { + var shipment = new ShipmentHeader2(); + shipment.WarehouseId = int.Parse(warehouseId); + shipment.Code = _unitwork.GetSerialNumber("XSC"); + shipment.Type = "XSC"; + shipment.SourceCode = data.FirstOrDefault().SOHNUM_0; + shipment.ShipTo = data.FirstOrDefault().BPCORD_0; + shipment.FirstStatus = 0; + shipment.AppointmentTime = data.FirstOrDefault().ORDDAT_0; + shipment.UserDef1 = $"{data.FirstOrDefault().SALFCY_0} {data.FirstOrDefault().BPAADD_0}"; + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.WarehouseId = shipment.WarehouseId; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.SOHNUM_0; + detail.SourceLine = item.SOPLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); + detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.Qty = item.THISQTYSTU; + detail.Unit = item.STU_0; + //detail.PurchasQty = item.THISQTYUOM; + //detail.PurchasUnits = item.UOM_0; + //detail.InventoryStatus = item.STA_0; + //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } return JsonMore(null); } } diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs index d22de52..875b16e 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs @@ -40,7 +40,8 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs { InitVM(); return new List>{ - this.MakeGridHeader(x => x.Code).SetFormat((a,b) => + this.MakeGridHeader(x => x.Code) + .SetFormat((a,b) => { string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')"); return rv; @@ -48,7 +49,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs this.MakeGridHeader(x => x.Type), this.MakeGridHeader(x => x.SourceCode).SetWidth(150), this.MakeGridHeader(x => x.SupplierCode).SetHide(), - this.MakeGridHeader(x => x.SupplierName).SetWidth(200), + this.MakeGridHeader(x => x.SupplierName).SetWidth(150), this.MakeGridHeader(x => x.TotalQty) .SetFormat((a,b) => { @@ -73,6 +74,11 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() + .CheckEqual(Searcher.WarehouseId, x => x.WarehouseId) + .CheckContain(Searcher.Code, x => x.Code) + .CheckContain(Searcher.Type, x => x.Type) + .CheckContain(Searcher.SourceCode, x => x.SourceCode) + .CheckContain(Searcher.SupplierName, x => x.SupplierName) .Select(x => new ReceiptHeader2_View { ID = x.ID, diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2Searcher.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2Searcher.cs index 4c34c24..d33f2fe 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2Searcher.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2Searcher.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -12,7 +12,36 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs { public partial class ReceiptHeader2Searcher : BaseSearcher { - + public Int32? WarehouseId { get; set; } + public String WarehouseCode { get; set; } + public String Code { get; set; } + public Int32? CompanyId { get; set; } + public String CompanyCode { get; set; } + public String Type { get; set; } + public String SourceCode { get; set; } + public String SourcePlatform { get; set; } + public Int32? SupplierId { get; set; } + public String SupplierCode { get; set; } + public String SupplierName { get; set; } + public Decimal? TotalQty { get; set; } + public Int32? TotalLines { get; set; } + public Int32? FreeScan { get; set; } + public String Remark { get; set; } + public Int32? UploadStatus { get; set; } + public String Uploadremark { get; set; } + public DateRange UploadTime { get; set; } + public DateRange AppointmentTime { get; set; } + public Int32? FirstStatus { get; set; } + public Int32? LastStatus { get; set; } + public Boolean? Enable { get; set; } + public Boolean? Deleted { get; set; } + public String Scanid { get; set; } + public String UserDef1 { get; set; } + public String UserDef2 { get; set; } + public String UserDef3 { get; set; } + public String Station { get; set; } + public String UserDef4 { get; set; } + public String UserDef5 { get; set; } protected override void InitVM() { } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml index adcd7fe..680fb9f 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml @@ -5,7 +5,7 @@ - +