出库页面配置中文

手动入库(无单据入库,打印入库)
This commit is contained in:
zgf 2024-01-20 19:58:16 +08:00
parent cce238c833
commit 9d6c5639b5
9 changed files with 164 additions and 4 deletions

View File

@ -5,6 +5,9 @@ using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
using WalkingTec.Mvvm.Mvc.Admin.ViewModels.DataPrivilegeVMs;
using System.Linq;
namespace HHWMS.Web.Controllers
{
@ -227,5 +230,22 @@ namespace HHWMS.Web.Controllers
}
#endregion
[HttpPost]
public ActionResult GetMaterial(string code)
{
var dc2 = Wtm.CreateDC(cskey: "hangyong");
var query = dc2.Set<Material2>()
.CheckContain(code, x => x.Code)
.Select(x => new Material2_View
{
Code = x.Code,
Type = x.Type,
Name = x.Name,
Specification = x.Specification,
MasterUnit = x.MasterUnit
})
.OrderBy(x => x.ID);
return JsonMore(query);
}
}
}

View File

@ -77,6 +77,11 @@ namespace HHWMS.Web.Controllers
[FixConnection(CsName = "hangyong")]
public ActionResult Create(ReceiptDetail2VM vm)
{
if (string.IsNullOrEmpty(vm.Entity.MaterialCode))
{
return FFResult().Alert("物料必选!");
}
var dc = Wtm.CreateDC(cskey: "hangyong");
Wtm.DC = dc;
if (!ModelState.IsValid)
@ -96,6 +101,7 @@ namespace HHWMS.Web.Controllers
var mater = dc.Set<Material2>()
.FirstOrDefault(x => x.ID == int.Parse(vm.Entity.MaterialCode));
vm.Entity.MaterialCode = mater?.Code;
vm.Entity.Lot = mater?.Specification;
vm.Entity.Unit = mater?.MasterUnit;
vm.Entity.Batch = vm.Entity.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2);
vm.DoAdd();

View File

@ -94,7 +94,72 @@ namespace HHWMS.Web.Controllers
}
else
{
return FFResult().CloseDialog().RefreshGrid(index:0);
return FFResult().CloseDialog().RefreshPage();
}
}
}
[ActionDescription("Sys.Create")]
public ActionResult Create2()
{
var vm = Wtm.CreateVM<ReceiptDetail2VM>();
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Create")]
[FixConnection(CsName = "hangyong")]
public ActionResult Create2(ReceiptDetail2VM vm)
{
if (string.IsNullOrEmpty(vm.Entity.MaterialCode))
{
return FFResult().Alert("物料必选!");
}
if (string.IsNullOrEmpty(vm.Entity.Batch))
{
return FFResult().Alert("批次信息不能为空!");
}
var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode;
var dc = Wtm.CreateDC(cskey: "hangyong");
Wtm.DC = dc;
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
var _unit = new UnitWork(Wtm);
var header = new ReceiptHeader2
{
WarehouseId = int.Parse(warehouseId),
Code = _unitwork.GetSerialNumber("SDR"),
Type = "SDR",
FirstStatus = 0,
LastStatus = 0,
TotalLines = 1,
TotalQty = 0,
};
_unit.Add(header);
vm.Entity.WarehouseId = header.WarehouseId;
vm.Entity.ReceiptId = header.ID;
vm.Entity.ReceiptCode = header?.Code;
vm.Entity.Status = 0;
var mater = dc.Set<Material2>()
.FirstOrDefault(x => x.ID == int.Parse(vm.Entity.MaterialCode));
vm.Entity.MaterialCode = mater?.Code;
vm.Entity.Lot = mater?.Specification;
vm.Entity.Unit = mater?.MasterUnit;
vm.DoAdd();
if (!ModelState.IsValid)
{
vm.DoReInit();
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshPage();
}
}
}

View File

@ -36,7 +36,7 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.Type),
this.MakeGridHeader(x => x.Name).SetWidth(150),
this.MakeGridHeader(x => x.MasterUnit),
this.MakeGridHeader(x => x.ClassA),
this.MakeGridHeader(x => x.ClassA).SetHide(),
this.MakeGridHeaderAction(width: 200)
};
}
@ -45,6 +45,7 @@ namespace HHWMS.Web
{
var dc2 = Wtm.CreateDC(cskey: "hangyong");
var query = dc2.Set<Material2>()
.Where(x => x.WarehouseId == 6)
.CheckContain(Searcher.Code, x => x.Code)
.CheckContain(Searcher.Name, x => x.Name)
.CheckContain(Searcher.Type, x => x.Type)

View File

@ -32,6 +32,8 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
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"),
this.MakeAction("ReceiptHeader2","Create2",Localizer["Sys.SDRCreate"],Localizer["Sys.SDRCreate"],GridActionParameterTypesEnum.NoId,"xwms")
,
};
}
@ -111,7 +113,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
UserDef3 = x.UserDef3,
Station = x.Station,
})
.OrderBy(x => x.ID);
.OrderByDescending(x => x.ID);
return query;
}

View File

@ -0,0 +1,35 @@
@model HHWMS.Web.ReceiptDetail2VM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.One">
<wt:row id="selector">
<wt:selector field="Entity.MaterialCode" list-vm="MaterialList"
text-bind="MaterialList.EntityList[0].Code"
submit-func="test">
<wt:searchpanel vm="MaterialList">
<wt:row items-per-row=" ItemsPerRowEnum.Two">
<wt:textbox field="MaterialList.Searcher.Code" />
<wt:textbox field="MaterialList.Searcher.Name" />
<wt:textbox field="MaterialList.Searcher.Type" />
</wt:row>
</wt:searchpanel>
</wt:selector>
</wt:row>
<wt:textbox field="Entity.MaterialName"/>
<wt:textbox field="Entity.Batch" />
<wt:textbox field="Entity.Qty" />
<wt:combobox field="Entity.InventoryStatus" items="InventoryStatus" />
</wt:row>
<wt:hidden field="Entity.ReceiptId" />
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
</wt:row>
</wt:form>
<script>
function test(val) {
$('#ReceiptDetail2VM_Entity_MaterialName').val(val[0].Name);
ReceiptDetail2VM_Entity_InventoryStatus.setValue([val[0].ClassA]);
}
</script>

View File

@ -48,18 +48,21 @@ namespace HHWMS.Web.Models
/// 上游系统单号
/// </summary>
[Column("sourceCode")]
[Display(Name = "ReceiptDetail2.SourceCode")]
public string SourceCode { get; set; }
/// <summary>
/// 供应商编码
/// </summary>
[Column("supplierCode")]
[Display(Name = "ReceiptDetail2.SupplierCode")]
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
[Column("supplierName")]
[Display(Name = "ReceiptDetail2.SupplierName")]
public string SupplierName { get; set; }
/// <summary>
@ -78,6 +81,7 @@ namespace HHWMS.Web.Models
/// 上游系统行号
/// </summary>
[Column("sourceLine")]
[Display(Name = "ReceiptDetail2.SourceLine")]
public string SourceLine { get; set; }
/// <summary>
@ -89,7 +93,8 @@ namespace HHWMS.Web.Models
/// <summary>
/// 出库单编码
/// </summary>
[Column("shipmentCode")]
[Column("shipmentCode")]
[Display(Name = "Inventory.ShipCode")]
public string ShipmentCode { get; set; }
/// <summary>
@ -102,24 +107,28 @@ namespace HHWMS.Web.Models
/// 物料编码
/// </summary>
[Column("materialCode")]
[Display(Name = "ReceiptDetail2.MaterialCode")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("materialName")]
[Display(Name = "ReceiptDetail2.MaterialName")]
public string MaterialName { get; set; }
/// <summary>
/// 批次
/// </summary>
[Column("batch")]
[Display(Name = "ReceiptDetail2.Batch")]
public string Batch { get; set; }
/// <summary>
/// 批号----规格
/// </summary>
[Column("lot")]
[Display(Name = "ReceiptDetail2.Lot")]
public string Lot { get; set; }
/// <summary>
@ -156,12 +165,14 @@ namespace HHWMS.Web.Models
/// 库存状态
/// </summary>
[Column("inventoryStatus")]
[Display(Name = "ReceiptDetail2.InventoryStatus")]
public string InventoryStatus { get; set; }
/// <summary>
/// 发货数量
/// </summary>
[Column("qty")]
[Display(Name = "ReceiptDetail2.Qty")]
public decimal? Qty { get; set; }
/// <summary>
@ -174,18 +185,21 @@ namespace HHWMS.Web.Models
/// 单位
/// </summary>
[Column("unit")]
[Display(Name = "ReceiptDetail2.Unit")]
public string Unit { get; set; }
/// <summary>
/// 物料单价
/// </summary>
[Column("price")]
[Display(Name = "Bill.Price")]
public decimal? Price { get; set; }
/// <summary>
/// 状态
/// </summary>
[Column("status")]
[Display(Name = "ReceiptDetail2.Status")]
public int? Status { get; set; }
/// <summary>

View File

@ -30,6 +30,7 @@ namespace HHWMS.Web.Models
/// 出库单号
/// </summary>
[Column("code")]
[Display(Name = "Inventory.ShipCode")]
public string Code { get; set; }
/// <summary>
@ -48,6 +49,7 @@ namespace HHWMS.Web.Models
/// 上游系统单号
/// </summary>
[Column("sourceCode")]
[Display(Name = "ReceiptDetail2.SourceCode")]
public string SourceCode { get; set; }
/// <summary>
@ -60,12 +62,14 @@ namespace HHWMS.Web.Models
/// 出库单类型
/// </summary>
[Column("type")]
[Display(Name = "ReceiptHeader2.Type")]
public string Type { get; set; }
/// <summary>
/// 客户编码
/// </summary>
[Column("shipTo")]
[Display(Name = "ReceiptDetail2.SupplierCode")]
public string ShipTo { get; set; }
/// <summary>
@ -84,12 +88,14 @@ namespace HHWMS.Web.Models
/// 总数量
/// </summary>
[Column("totalQty")]
[Display(Name = "ReceiptHeader2.TotalQty")]
public decimal? TotalQty { get; set; }
/// <summary>
/// 总行数
/// </summary>
[Column("totalLines")]
[Display(Name = "ReceiptHeader2.TotalLines")]
public int? TotalLines { get; set; }
/// <summary>
@ -108,6 +114,7 @@ namespace HHWMS.Web.Models
/// 上传时间
/// </summary>
[Column("uploadTime")]
[Display(Name = "ReceiptHeader2.UploadTime")]
public System.DateTime? UploadTime { get; set; }
/// <summary>
@ -120,18 +127,21 @@ namespace HHWMS.Web.Models
/// 单据头状态
/// </summary>
[Column("firstStatus")]
[Display(Name = "ReceiptHeader2.FirstStatus")]
public int? FirstStatus { get; set; }
/// <summary>
/// 单据尾状态
/// </summary>
[Column("lastStatus")]
[Display(Name = "ReceiptHeader2.LastStatus")]
public int? LastStatus { get; set; }
/// <summary>
/// upload状态
/// </summary>
[Column("uploadStatus")]
[Display(Name = "ReceiptHeader2.UploadStatus")]
public int? UploadStatus { get; set; }
/// <summary>
@ -168,6 +178,7 @@ namespace HHWMS.Web.Models
/// 交易组
/// </summary>
[Column("userDef4")]
[Display(Name = "ReceiptHeader2.UserDef5")]
public string UserDef4 { get; set; }
}
}

View File

@ -1491,4 +1491,10 @@
<data name="Sys.CheckInv" xml:space="preserve">
<value>ERP对账</value>
</data>
<data name="Sys.SDRCreate" xml:space="preserve">
<value>手动入库</value>
</data>
<data name="Bill.Price" xml:space="preserve">
<value>单价</value>
</data>
</root>