采购订单

This commit is contained in:
zgf 2023-12-24 15:12:17 +08:00
parent 612c69fa1a
commit 6aeb151982
21 changed files with 881 additions and 65 deletions

View File

@ -0,0 +1,231 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs;
namespace HHWMS.Web.Controllers
{
[Area("xwms")]
[ActionDescription("入库单")]
public partial class ReceiptHeader2Controller : BaseController
{
private readonly IUnitWork _unitwork;
public ReceiptHeader2Controller(IUnitWork unitwork)
{
_unitwork = unitwork;
}
#region Search
[ActionDescription("Sys.Search")]
public ActionResult Index()
{
var vm = Wtm.CreateVM<ReceiptHeader2ListVM>();
return PartialView(vm);
}
[ActionDescription("Sys.Search")]
[HttpPost]
[FixConnection(CsName = "hangyong")]
public string Search(ReceiptHeader2Searcher searcher)
{
var dc = Wtm.CreateDC(cskey:"hangyong");
Wtm.DC = dc;
var vm = Wtm.CreateVM<ReceiptHeader2ListVM>(passInit: true);
if (ModelState.IsValid)
{
vm.Searcher = searcher;
return vm.GetJson(false);
}
else
{
return vm.GetError();
}
}
#endregion
#region Create
[ActionDescription("Sys.Create")]
public ActionResult Create()
{
var vm = Wtm.CreateVM<ReceiptHeader2VM>();
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Create")]
public ActionResult Create(ReceiptHeader2VM vm)
{
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
vm.DoAdd();
if (!ModelState.IsValid)
{
vm.DoReInit();
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid();
}
}
}
#endregion
#region Edit
[ActionDescription("Sys.Edit")]
public ActionResult Edit(string id)
{
var vm = Wtm.CreateVM<ReceiptHeader2VM>(id);
return PartialView(vm);
}
[ActionDescription("Sys.Edit")]
[HttpPost]
[ValidateFormItemOnly]
public ActionResult Edit(ReceiptHeader2VM vm)
{
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
vm.DoEdit();
if (!ModelState.IsValid)
{
vm.DoReInit();
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID);
}
}
}
#endregion
#region Delete
[ActionDescription("Sys.Delete")]
public ActionResult Delete(string id)
{
var vm = Wtm.CreateVM<ReceiptHeader2VM>(id);
return PartialView(vm);
}
[ActionDescription("Sys.Delete")]
[HttpPost]
public ActionResult Delete(string id, IFormCollection nouse)
{
var vm = Wtm.CreateVM<ReceiptHeader2VM>(id);
vm.DoDelete();
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid();
}
}
#endregion
#region Details
[ActionDescription("Sys.Details")]
public ActionResult Details(string id)
{
var vm = Wtm.CreateVM<ReceiptHeader2VM>(id);
return PartialView(vm);
}
#endregion
#region BatchEdit
[HttpPost]
[ActionDescription("Sys.BatchEdit")]
public ActionResult BatchEdit(string[] IDs)
{
var vm = Wtm.CreateVM<ReceiptHeader2BatchVM>(Ids: IDs);
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.BatchEdit")]
public ActionResult DoBatchEdit(ReceiptHeader2BatchVM vm, IFormCollection nouse)
{
if (!ModelState.IsValid || !vm.DoBatchEdit())
{
return PartialView("BatchEdit",vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchEditSuccess", vm.Ids.Length]);
}
}
#endregion
#region BatchDelete
[HttpPost]
[ActionDescription("Sys.BatchDelete")]
public ActionResult BatchDelete(string[] IDs)
{
var vm = Wtm.CreateVM<ReceiptHeader2BatchVM>(Ids: IDs);
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.BatchDelete")]
public ActionResult DoBatchDelete(ReceiptHeader2BatchVM vm, IFormCollection nouse)
{
if (!ModelState.IsValid || !vm.DoBatchDelete())
{
return PartialView("BatchDelete",vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]);
}
}
#endregion
#region Import
[ActionDescription("Sys.Import")]
public ActionResult Import()
{
var vm = Wtm.CreateVM<ReceiptHeader2ImportVM>();
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Import")]
public ActionResult Import(ReceiptHeader2ImportVM vm, IFormCollection nouse)
{
if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData())
{
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.ImportSuccess", vm.EntityList.Count.ToString()]);
}
}
#endregion
#region Export
[ActionDescription("Sys.Export")]
[HttpPost]
public IActionResult ExportExcel(ReceiptHeader2ListVM vm)
{
return vm.GetExportData();
}
#endregion
}
}

View File

@ -94,9 +94,42 @@ public class XWMSPOHController : BaseController
var _unitwork = new UnitWork(Wtm);
var receipt = new ReceiptHeader2();
receipt.Code = "12345";
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<ReceiptDetail2>();
foreach(var item in data)
{
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 = item.ITMDES1_0;
detail.Lot = 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());
return JsonMore(null);
}
}

View File

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.Models;
namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
{
public partial class ReceiptHeader2BatchVM : BaseBatchVM<ReceiptHeader2, ReceiptHeader2_BatchEdit>
{
public ReceiptHeader2BatchVM()
{
ListVM = new ReceiptHeader2ListVM();
LinkedVM = new ReceiptHeader2_BatchEdit();
}
}
/// <summary>
/// Class to define batch edit fields
/// </summary>
public class ReceiptHeader2_BatchEdit : BaseVM
{
protected override void InitVM()
{
}
}
}

View File

@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.Models;
namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
{
public partial class ReceiptHeader2TemplateVM : BaseTemplateVM
{
public ExcelPropety Code_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Code);
public ExcelPropety CompanyId_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.CompanyId);
public ExcelPropety CompanyCode_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.CompanyCode);
public ExcelPropety Type_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Type);
public ExcelPropety SourceCode_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.SourceCode);
public ExcelPropety SourcePlatform_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.SourcePlatform);
public ExcelPropety SupplierId_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.SupplierId);
public ExcelPropety SupplierCode_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.SupplierCode);
public ExcelPropety SupplierName_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.SupplierName);
public ExcelPropety TotalQty_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.TotalQty);
public ExcelPropety TotalLines_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.TotalLines);
public ExcelPropety FreeScan_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.FreeScan);
public ExcelPropety Remark_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Remark);
public ExcelPropety UploadStatus_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.UploadStatus);
public ExcelPropety Uploadremark_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Uploadremark);
public ExcelPropety UploadTime_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.UploadTime);
public ExcelPropety AppointmentTime_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.AppointmentTime);
public ExcelPropety FirstStatus_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.FirstStatus);
public ExcelPropety LastStatus_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.LastStatus);
public ExcelPropety Enable_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Enable);
public ExcelPropety Deleted_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Deleted);
public ExcelPropety Scanid_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Scanid);
public ExcelPropety UserDef1_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.UserDef1);
public ExcelPropety UserDef2_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.UserDef2);
public ExcelPropety UserDef3_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.UserDef3);
public ExcelPropety Station_Excel = ExcelPropety.CreateProperty<ReceiptHeader2>(x => x.Station);
protected override void InitVM()
{
}
}
public class ReceiptHeader2ImportVM : BaseImportVM<ReceiptHeader2TemplateVM, ReceiptHeader2>
{
}
}

View File

@ -0,0 +1,107 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using HHWMS.Web.Models;
namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
{
public partial class ReceiptHeader2ListVM : BasePagedListVM<ReceiptHeader2_View, ReceiptHeader2Searcher>
{
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>
{
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "xwms", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "xwms"),
};
}
protected override IEnumerable<IGridColumn<ReceiptHeader2_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptHeader2_View>>{
this.MakeGridHeader(x => x.Code),
this.MakeGridHeader(x => x.CompanyId),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.Type),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.SourcePlatform),
this.MakeGridHeader(x => x.SupplierId),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.SupplierName),
this.MakeGridHeader(x => x.TotalQty),
this.MakeGridHeader(x => x.TotalLines),
this.MakeGridHeader(x => x.FreeScan),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeader(x => x.UploadStatus),
this.MakeGridHeader(x => x.Uploadremark),
this.MakeGridHeader(x => x.UploadTime),
this.MakeGridHeader(x => x.AppointmentTime),
this.MakeGridHeader(x => x.FirstStatus),
this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.Enable),
this.MakeGridHeader(x => x.Deleted),
this.MakeGridHeader(x => x.Scanid),
this.MakeGridHeader(x => x.UserDef1),
this.MakeGridHeader(x => x.UserDef2),
this.MakeGridHeader(x => x.UserDef3),
this.MakeGridHeader(x => x.Station),
this.MakeGridHeaderAction(width: 200)
};
}
public override IOrderedQueryable<ReceiptHeader2_View> GetSearchQuery()
{
var query = DC.Set<ReceiptHeader2>()
.Select(x => new ReceiptHeader2_View
{
ID = x.ID,
Code = x.Code,
CompanyId = x.CompanyId,
CompanyCode = x.CompanyCode,
Type = x.Type,
SourceCode = x.SourceCode,
SourcePlatform = x.SourcePlatform,
SupplierId = x.SupplierId,
SupplierCode = x.SupplierCode,
SupplierName = x.SupplierName,
TotalQty = x.TotalQty,
TotalLines = x.TotalLines,
FreeScan = x.FreeScan,
Remark = x.Remark,
UploadStatus = x.UploadStatus,
Uploadremark = x.Uploadremark,
UploadTime = x.UploadTime,
AppointmentTime = x.AppointmentTime,
FirstStatus = x.FirstStatus,
LastStatus = x.LastStatus,
Enable = x.Enable,
Deleted = x.Deleted,
Scanid = x.Scanid,
UserDef1 = x.UserDef1,
UserDef2 = x.UserDef2,
UserDef3 = x.UserDef3,
Station = x.Station,
})
.OrderBy(x => x.ID);
return query;
}
}
public class ReceiptHeader2_View : ReceiptHeader2{
}
}

View File

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.Models;
namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
{
public partial class ReceiptHeader2Searcher : BaseSearcher
{
protected override void InitVM()
{
}
}
}

View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.Models;
namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
{
public partial class ReceiptHeader2VM : BaseCRUDVM<ReceiptHeader2>
{
public ReceiptHeader2VM()
{
}
protected override void InitVM()
{
}
public override void DoAdd()
{
base.DoAdd();
}
public override void DoEdit(bool updateAllFields = false)
{
base.DoEdit(updateAllFields);
}
public override void DoDelete()
{
base.DoDelete();
}
}
}

View File

@ -0,0 +1,12 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2BatchVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.BatchDeleteConfirm"]</wt:quote>
<wt:hidden field="Ids" />
<wt:grid vm="ListVM" use-local-data="true" height="300" hidden-checkbox="true" hidden-panel="true"/>
<wt:row align="AlignEnum.Right">
<wt:submitbutton theme=" ButtonThemeEnum.Warm" text="@Localizer["Sys.Delete"]"/>
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,14 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2BatchVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<div style="margin-bottom:10px">@Localizer["Sys.BatchEditConfirm"] </div>
<wt:row items-per-row="ItemsPerRowEnum.Two">
</wt:row>
<wt:hidden field="Ids" />
<wt:grid vm="ListVM" use-local-data="true" height="300" hidden-checkbox="true" hidden-panel="true"/>
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,37 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2VM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:textbox field="Entity.Code" />
<wt:textbox field="Entity.CompanyId" />
<wt:textbox field="Entity.CompanyCode" />
<wt:textbox field="Entity.Type" />
<wt:textbox field="Entity.SourceCode" />
<wt:textbox field="Entity.SourcePlatform" />
<wt:textbox field="Entity.SupplierId" />
<wt:textbox field="Entity.SupplierCode" />
<wt:textbox field="Entity.SupplierName" />
<wt:textbox field="Entity.TotalQty" />
<wt:textbox field="Entity.TotalLines" />
<wt:textbox field="Entity.FreeScan" />
<wt:textbox field="Entity.Remark" />
<wt:textbox field="Entity.UploadStatus" />
<wt:textbox field="Entity.Uploadremark" />
<wt:datetime field="Entity.UploadTime" />
<wt:datetime field="Entity.AppointmentTime" />
<wt:textbox field="Entity.FirstStatus" />
<wt:textbox field="Entity.LastStatus" />
<wt:combobox field="Entity.Enable" />
<wt:combobox field="Entity.Deleted" />
<wt:textbox field="Entity.Scanid" />
<wt:textbox field="Entity.UserDef1" />
<wt:textbox field="Entity.UserDef2" />
<wt:textbox field="Entity.UserDef3" />
<wt:textbox field="Entity.Station" />
</wt:row>
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,39 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2VM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.Code" />
<wt:display field="Entity.CompanyId" />
<wt:display field="Entity.CompanyCode" />
<wt:display field="Entity.Type" />
<wt:display field="Entity.SourceCode" />
<wt:display field="Entity.SourcePlatform" />
<wt:display field="Entity.SupplierId" />
<wt:display field="Entity.SupplierCode" />
<wt:display field="Entity.SupplierName" />
<wt:display field="Entity.TotalQty" />
<wt:display field="Entity.TotalLines" />
<wt:display field="Entity.FreeScan" />
<wt:display field="Entity.Remark" />
<wt:display field="Entity.UploadStatus" />
<wt:display field="Entity.Uploadremark" />
<wt:display field="Entity.UploadTime" />
<wt:display field="Entity.AppointmentTime" />
<wt:display field="Entity.FirstStatus" />
<wt:display field="Entity.LastStatus" />
<wt:display field="Entity.Enable" />
<wt:display field="Entity.Deleted" />
<wt:display field="Entity.Scanid" />
<wt:display field="Entity.UserDef1" />
<wt:display field="Entity.UserDef2" />
<wt:display field="Entity.UserDef3" />
<wt:display field="Entity.Station" />
</wt:row>
<wt:hidden field="Entity.ID" />
<wt:row align="AlignEnum.Right">
<wt:submitbutton theme=" ButtonThemeEnum.Warm" text="@Localizer["Sys.Delete"]"/>
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,36 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2VM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.Code" />
<wt:display field="Entity.CompanyId" />
<wt:display field="Entity.CompanyCode" />
<wt:display field="Entity.Type" />
<wt:display field="Entity.SourceCode" />
<wt:display field="Entity.SourcePlatform" />
<wt:display field="Entity.SupplierId" />
<wt:display field="Entity.SupplierCode" />
<wt:display field="Entity.SupplierName" />
<wt:display field="Entity.TotalQty" />
<wt:display field="Entity.TotalLines" />
<wt:display field="Entity.FreeScan" />
<wt:display field="Entity.Remark" />
<wt:display field="Entity.UploadStatus" />
<wt:display field="Entity.Uploadremark" />
<wt:display field="Entity.UploadTime" />
<wt:display field="Entity.AppointmentTime" />
<wt:display field="Entity.FirstStatus" />
<wt:display field="Entity.LastStatus" />
<wt:display field="Entity.Enable" />
<wt:display field="Entity.Deleted" />
<wt:display field="Entity.Scanid" />
<wt:display field="Entity.UserDef1" />
<wt:display field="Entity.UserDef2" />
<wt:display field="Entity.UserDef3" />
<wt:display field="Entity.Station" />
</wt:row>
<wt:row align="AlignEnum.Right">
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,38 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2VM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:textbox field="Entity.Code" />
<wt:textbox field="Entity.CompanyId" />
<wt:textbox field="Entity.CompanyCode" />
<wt:textbox field="Entity.Type" />
<wt:textbox field="Entity.SourceCode" />
<wt:textbox field="Entity.SourcePlatform" />
<wt:textbox field="Entity.SupplierId" />
<wt:textbox field="Entity.SupplierCode" />
<wt:textbox field="Entity.SupplierName" />
<wt:textbox field="Entity.TotalQty" />
<wt:textbox field="Entity.TotalLines" />
<wt:textbox field="Entity.FreeScan" />
<wt:textbox field="Entity.Remark" />
<wt:textbox field="Entity.UploadStatus" />
<wt:textbox field="Entity.Uploadremark" />
<wt:datetime field="Entity.UploadTime" />
<wt:datetime field="Entity.AppointmentTime" />
<wt:textbox field="Entity.FirstStatus" />
<wt:textbox field="Entity.LastStatus" />
<wt:combobox field="Entity.Enable" />
<wt:combobox field="Entity.Deleted" />
<wt:textbox field="Entity.Scanid" />
<wt:textbox field="Entity.UserDef1" />
<wt:textbox field="Entity.UserDef2" />
<wt:textbox field="Entity.UserDef3" />
<wt:textbox field="Entity.Station" />
</wt:row>
<wt:hidden field="Entity.ID" />
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,14 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2ImportVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row align="AlignEnum.Right">
<wt:downloadTemplateButton vm="@Model" />
</wt:row>
<wt:upload field="UploadFileId" label-text="@Model.Localizer["Sys.UploadTemplate"]" upload-type="ExcelFile" />
<wt:grid vm="ErrorListVM" use-local-data="true" hidden-checkbox="true" hidden-grid-index="true" hidden-panel="true" height="300"/>
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
</wt:row>
</wt:form>

View File

@ -0,0 +1,8 @@
@model HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs.ReceiptHeader2ListVM
@inject IStringLocalizer<Program> Localizer;
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
</wt:row>
</wt:searchpanel>
<wt:grid vm="@Model" url="/xwms/ReceiptHeader2/Search"/>

View File

@ -196,6 +196,8 @@
height="650" stripe border
style="width: 100%"
size="small"
ref="tableData"
v-loading="loading"
@@cell-mouse-enter="handleCellEnter"
@@cell-mouse-leave="handleCellLeave"
@@selection-change="handleSelectionChange">
@ -293,6 +295,7 @@
value: 'R',
label: 'R'
}],
loading: false,
tableData: [],
currentPage: 1, // 当前页码
total: 20, // 总条数
@ -340,6 +343,26 @@
cell.querySelector('.item__input').style.display = 'none'
cell.querySelector('.item__txt').style.display = 'block'
}
if (property == "THISQTYSTU") {
// 库存单位除以系数
if (row.THISQTYSTU > row.QTYSTU_0) {
row.THISQTYSTU = row.QTYSTU_0;
this.$message.error("不能超出单据数量");
}
else {
row.THISQTYUOM = row.THISQTYSTU / row.UOMSTUCOE_0;
}
}
if (property == "THISQTYUOM") {
// 采购单位 乘 系数
if (row.THISQTYUOM > row.QTYUOM_0) {
row.THISQTYUOM = row.QTYUOM_0;
this.$message.error("不能超出单据数量");
}
else {
row.THISQTYSTU = row.THISQTYUOM * row.UOMSTUCOE_0;
}
}
},
//每页条数改变时触发 选择一页显示多少行
handleSizeChange(val) {
@ -354,7 +377,8 @@
this.multipleSelection = val;
},
search() {
var _this = this;
var _this = this;
_this.loading = true;
$.ajax({
type: "post",
dataType: "json",
@ -366,34 +390,60 @@
},
url: "/xwms/XWMSPOH/Search",
success: function (json) {
app.tableData = json.Data;
_this.tableData = json.Data;
_this.loading = false;
},
error: function (json) {
alert("加载失败");
this.$message.error("加载失败");
}
});
},
create() {
var _this = this;
$.ajax({
type: "post",
dataType: "json",
data: {
data: _this.multipleSelection
},
url: "/xwms/XWMSPOH/Create",
success: function (json) {
if (json.Code == 200) {
_this.$message({
message: "创建成功!"
});
_this.$refs.multipleTable.clearSelection();
_this.$confirm('注意:您确认要对此单据进行创建采购入库吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
//加校验
if (_this.verify(_this.multipleSelection)) {
_this.$message.error("请选择同一张采购单!");
} else {
$.ajax({
type: "post",
dataType: "json",
data: {
data: _this.multipleSelection
},
url: "/xwms/XWMSPOH/Create",
success: function (json) {
if (json.Code == 200) {
_this.$message("创建成功!");
_this.$refs.tableData.clearSelection();
}
else{
_this.$message.error("创建失败!" + json.Msg);
}
},
error: function (json) {
_this.$message.error("创建失败!");
}
},
error: function (json) {
alert("加载失败");
});
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消!'
});
});
},
verify(array) {
const tmp = new Set();
array.forEach(x => tmp.add(x.POHNUM_0));
return tmp.size > 1 ? true : false;
}
},
});

View File

@ -189,6 +189,7 @@
},
create() {
var _this = this;
$.ajax({
type: "post",
dataType: "json",
@ -208,6 +209,19 @@
alert("加载失败");
}
});
},
hasDuplicate(array) {
const seen = new Set();
for(let i = 0; i<array.length; i++) {
const objString = JSON.stringify(array[i]);
if (seen.has(objString)) {
return true;
}
seen.add(objString);
}
return false;
}
},
});

View File

@ -1,40 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
namespace HHWMS.Web
{
public class DataContext2 : FrameworkContext
{
public DataContext2(CS cs)
: base(cs)
{
}
public DataContext2(string cs, DBTypeEnum dbtype)
: base(cs, dbtype)
{
}
public DataContext2(string cs, DBTypeEnum dbtype, string version = null)
: base(cs, dbtype, version)
{
}
public DataContext2(DbContextOptions<DataContext2> options) : base(options) { }
public DbSet<ReceiptHeader2> ReceiptHeader2s { get; set; }
public DbSet<ReceiptDetail2> ReceiptDetail2s { get; set; }
}
}

View File

@ -14,156 +14,205 @@ namespace HHWMS.Web.Models
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
/// <summary>
/// 库区
/// </summary>
[Column("zoneCode")]
public string ZoneCode { get; set; }
/// <summary>
/// 货主id
/// </summary>
[Column("companyId")]
public int? CompanyId { get; set; }
/// <summary>
/// 货主编码
/// </summary>
[Column("companyCode")]
public string CompanyCode { get; set; }
/// <summary>
/// 上游系统单号
/// </summary>
[Column("sourceCode")]
public string SourceCode { get; set; }
/// <summary>
/// 供应商编码
/// </summary>
[Column("supplierCode")]
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
[Column("supplierName")]
public string SupplierName { get; set; }
/// <summary>
/// 订单号
/// </summary>
[Column("cPoCode")]
public string CPoCode { get; set; }
/// <summary>
/// 工作令号
/// </summary>
[Column("moCode")]
public string MoCode { get; set; }
/// <summary>
/// 上游系统行号
/// </summary>
[Column("sourceLine")]
public string SourceLine { get; set; }
/// <summary>
/// 入库单id
/// </summary>
[Column("receiptId")]
public int? ReceiptId { get; set; }
/// <summary>
/// 入库单编码
/// </summary>
[Column("receiptCode")]
public string ReceiptCode { get; set; }
/// <summary>
/// 物料Id
/// </summary>
[Column("materialId")]
public int? MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("materialCode")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("materialName")]
public string MaterialName { get; set; }
/// <summary>
/// 批次
/// </summary>
[Column("batch")]
public string Batch { get; set; }
/// <summary>
/// 批号---规格
/// </summary>
[Column("lot")]
public string Lot { get; set; }
/// <summary>
/// SN:铁损值
/// </summary>
[Column("sn")]
public string Sn { get; set; }
/// <summary>
/// 项目号:二维码
/// </summary>
[Column("project")]
public string Project { get; set; }
/// <summary>
/// 生产日期
/// </summary>
[Column("manufactureDate")]
public System.DateTime? ManufactureDate { get; set; }
/// <summary>
/// 失效日期
/// </summary>
[Column("expirationDate")]
public System.DateTime? ExpirationDate { get; set; }
/// <summary>
/// 物料状态:0:存货编码;1:批次;2:序列号
/// </summary>
[Column("inventoryStatus")]
public string InventoryStatus { get; set; }
/// <summary>
/// 系统数量
/// </summary>
[Column("qty")]
public decimal? Qty { get; set; }
/// <summary>
/// 收货数量
/// </summary>
[Column("qtyCompleted")]
public decimal? QtyCompleted { get; set; }
/// <summary>
/// 单位
/// </summary>
[Column("unit")]
public string Unit { get; set; }
/// <summary>
/// 采购数量
/// </summary>
[Column("purchasQty")]
public decimal? PurchasQty { get; set; }
/// <summary>
/// 采购单位
/// </summary>
[Column("purchasUnits")]
public string PurchasUnits { get; set; }
/// <summary>
/// 系数:库存单位/采购单位
/// </summary>
[Column("coefficient")]
public decimal? Coefficient { get; set; }
/// <summary>
/// 单价
/// </summary>
[Column("price")]
public decimal? Price { get; set; }
/// <summary>
/// 状态
/// </summary>
[Column("status")]
public int? Status { get; set; }
/// <summary>
///
///
/// </summary>
[Column("deleted")]
public bool? Deleted { get; set; }
/// <summary>
///
///
/// </summary>
[Column("autoId")]
public int? AutoId { get; set; }
/// <summary>
/// 宽度
/// </summary>
[Column("userDef1")]
public string UserDef1 { get; set; }
/// <summary>
/// 片厚
/// </summary>
[Column("userDef2")]
public string UserDef2 { get; set; }
/// <summary>
/// 直径
/// </summary>
@ -175,6 +224,7 @@ namespace HHWMS.Web.Models
/// </summary>
[Column("station")]
public string Station { get; set; }
/// <summary>
/// 已分配数量
/// </summary>

View File

@ -20,126 +20,151 @@ namespace HHWMS.Web.Models
/// </summary>
[Column("code")]
public string Code { get; set; }
/// <summary>
/// 货主id
/// </summary>
[Column("companyId")]
public int? CompanyId { get; set; }
/// <summary>
/// 货主编码
/// </summary>
[Column("companyCode")]
public string CompanyCode { get; set; }
/// <summary>
/// 入库类型
/// </summary>
[Column("type")]
public string Type { get; set; }
/// <summary>
/// 上游系统单号
/// </summary>
[Column("sourceCode")]
public string SourceCode { get; set; }
/// <summary>
/// 上游平台:单据ID
/// </summary>
[Column("sourcePlatform")]
public string SourcePlatform { get; set; }
/// <summary>
/// 供应商id
/// </summary>
[Column("supplierId")]
public int? SupplierId { get; set; }
/// <summary>
/// 供应商编码
/// </summary>
[Column("supplierCode")]
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
[Column("supplierName")]
public string SupplierName { get; set; }
/// <summary>
/// 总数量
/// </summary>
[Column("totalQty")]
public decimal? TotalQty { get; set; }
/// <summary>
/// 总行数
/// </summary>
[Column("totalLines")]
public int? TotalLines { get; set; }
/// <summary>
/// 扫码绑定标记
/// </summary>
[Column("freeScan")]
public int? FreeScan { get; set; }
/// <summary>
/// 入库单备注
/// </summary>
[Column("remark")]
public string Remark { get; set; }
/// <summary>
/// upload状态
/// </summary>
[Column("uploadStatus")]
public int? UploadStatus { get; set; }
/// <summary>
/// 上传备注
/// </summary>
[Column("uploadremark")]
public string Uploadremark { get; set; }
/// <summary>
/// 上传时间
/// </summary>
[Column("uploadTime")]
public System.DateTime? UploadTime { get; set; }
/// <summary>
/// 入库预约时间
/// </summary>
[Column("appointmentTime")]
public System.DateTime? AppointmentTime { get; set; }
/// <summary>
/// 单据头状态
/// </summary>
[Column("firstStatus")]
public int? FirstStatus { get; set; }
/// <summary>
/// 单据尾状态
/// </summary>
[Column("lastStatus")]
public int? LastStatus { get; set; }
/// <summary>
///
///
/// </summary>
[Column("enable")]
public bool? Enable { get; set; }
/// <summary>
///
///
/// </summary>
[Column("deleted")]
public bool? Deleted { get; set; }
/// <summary>
/// 扫描标识
/// </summary>
[Column("scanid")]
public string Scanid { get; set; }
/// <summary>
/// 自定义字段1
/// </summary>
[Column("userDef1")]
public string UserDef1 { get; set; }
/// <summary>
/// 自定义字段2
/// </summary>
[Column("userDef2")]
public string UserDef2 { get; set; }
/// <summary>
/// 自定义字段3
/// </summary>
[Column("userDef3")]
public string UserDef3 { get; set; }
/// <summary>
/// 站台
/// </summary>

View File

@ -17,7 +17,7 @@ namespace HHWMS.Web.Models
/// <summary>
/// 订单日期
/// </summary>
public DateOnly ORDDAT_0 { get; set; }
public DateTime ORDDAT_0 { get; set; }
/// <summary>
/// 供应商