任务明细 出库明细 库存分析 启动出库
This commit is contained in:
1 parent
eef6df7099
commit
f5423e78fe
28 files changed
+500
-77
No files matched your search
@@ -10,9 +10,20 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class ShipmentDetailListVM : BasePagedListVM<ShipmentDetail_View, ShipmentDetailSearcher>
|
||||
{
|
||||
private IUnitWork _unitWork { get; set; }
|
||||
protected override void InitVM()
|
||||
{
|
||||
_unitWork = new UnitWork(Wtm);
|
||||
}
|
||||
protected override List<GridAction> InitGridAction()
|
||||
{
|
||||
return new List<GridAction>
|
||||
if (SearcherMode == ListVMSearchModeEnum.MasterDetail
|
||||
|| SearcherMode == ListVMSearchModeEnum.Custom1)
|
||||
{
|
||||
return new List<GridAction>();
|
||||
}
|
||||
else
|
||||
return new List<GridAction>
|
||||
{
|
||||
this.MakeStandardAction("ShipmentDetail", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800),
|
||||
this.MakeStandardAction("ShipmentDetail", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
|
||||
@@ -27,7 +38,28 @@ namespace HHWMS.Web
|
||||
|
||||
protected override IEnumerable<IGridColumn<ShipmentDetail_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetWidth(220),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.Batch),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
this.MakeGridHeader(x => x.Status)
|
||||
};
|
||||
}
|
||||
else if (SearcherMode == ListVMSearchModeEnum.Custom1)
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetWidth(220),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.Batch),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
this.MakeGridHeader(x => x.InventoryStatus)
|
||||
};
|
||||
}
|
||||
else
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
this.MakeGridHeader(x => x.Code_view),
|
||||
this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
@@ -52,7 +84,31 @@ namespace HHWMS.Web
|
||||
|
||||
public override IOrderedQueryable<ShipmentDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<ShipmentDetail>()
|
||||
InitVM();
|
||||
if (SearcherMode == ListVMSearchModeEnum.Custom1) {
|
||||
var tt = DC.Set<ShipmentDetail>()
|
||||
.CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId)
|
||||
.Select(x => new ShipmentDetail_View
|
||||
{
|
||||
ID = x.ID,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
Batch = x.Batch,
|
||||
Qty = x.Qty,
|
||||
InventoryStatus = x.InventoryStatus,
|
||||
Status = x.Status
|
||||
}).ToList();
|
||||
foreach(var item in tt.Where(x => x.Status < ShipStatusEnum.分配完成))
|
||||
{
|
||||
var invQty = _unitWork.Find<Inventory>(x => x.UniqueCode.Equals(item.UniqueCode))
|
||||
.Sum(x => x.Qty);
|
||||
item.InventoryStatus = invQty >= (item.Qty - item.DividedQty) ? "true" : "false";
|
||||
}
|
||||
return (IOrderedQueryable<ShipmentDetail_View>)tt.OrderBy(x => x.ID);
|
||||
}
|
||||
else
|
||||
{
|
||||
var query = DC.Set<ShipmentDetail>()
|
||||
.CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId)
|
||||
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
|
||||
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
|
||||
@@ -68,6 +124,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
ID = x.ID,
|
||||
Code_view = x.ShipmentHeader.Code,
|
||||
UniqueCode = x.UniqueCode,
|
||||
ZoneCode = x.ZoneCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
@@ -87,7 +144,8 @@ namespace HHWMS.Web
|
||||
Status = x.Status,
|
||||
})
|
||||
.OrderBy(x => x.ID);
|
||||
return query;
|
||||
return query;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,10 +8,20 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class ShipmentHeaderListVM : BasePagedListVM<ShipmentHeader_View, ShipmentHeaderSearcher>
|
||||
{
|
||||
public List<ComboSelectListItem> ShipTypes { get; set; }
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
var vm = Wtm.CreateVM<ShipmentHeaderVM>();
|
||||
ShipTypes = vm.ShipTypes;
|
||||
}
|
||||
protected override List<GridAction> InitGridAction()
|
||||
{
|
||||
return new List<GridAction>
|
||||
{
|
||||
this.MakeAction("ShipmentHeader","StartOut",Localizer["ShipmentHeader.StartOut"],"",GridActionParameterTypesEnum.SingleId,"shipment"),
|
||||
this.MakeAction("ShipmentHeader","Analyse",Localizer["ShipmentHeader.Analyse"],Localizer["ShipmentHeader.Analyse"],GridActionParameterTypesEnum.SingleId,"shipment")
|
||||
.SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,800),
|
||||
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800),
|
||||
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
|
||||
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800),
|
||||
@@ -25,18 +35,24 @@ namespace HHWMS.Web
|
||||
|
||||
protected override IEnumerable<IGridColumn<ShipmentHeader_View>> InitGridHeader()
|
||||
{
|
||||
InitVM();
|
||||
return new List<GridColumn<ShipmentHeader_View>>{
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
//this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.Code),
|
||||
this.MakeGridHeader(x => x.BillType),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode),
|
||||
this.MakeGridHeader(x => x.TotalQty),
|
||||
this.MakeGridHeader(x => x.TotalLines),
|
||||
this.MakeGridHeader(x => x.BillType)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
var data = ShipTypes.FirstOrDefault(x => x.Value.ToString() == a.BillType);
|
||||
return data?.Text ?? a.BillType;
|
||||
}),
|
||||
//this.MakeGridHeader(x => x.CompanyCode),
|
||||
//this.MakeGridHeader(x => x.SupplierCode),
|
||||
//this.MakeGridHeader(x => x.TotalQty),
|
||||
//this.MakeGridHeader(x => x.TotalLines),
|
||||
this.MakeGridHeader(x => x.FirstStatus),
|
||||
this.MakeGridHeader(x => x.LastStatus),
|
||||
//this.MakeGridHeader(x => x.LastStatus),
|
||||
this.MakeGridHeader(x => x.Remark),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
this.MakeGridHeaderAction(width: 300)
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -12,13 +12,24 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class ShipmentHeaderVM : BaseCRUDVM<ShipmentHeader>
|
||||
{
|
||||
|
||||
public ShipmentDetailListVM Details = new ShipmentDetailListVM();
|
||||
public List<ComboSelectListItem> ShipTypes { get; set; }
|
||||
public ShipmentHeaderVM()
|
||||
{
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
Details.CopyContext(this);
|
||||
Details.Searcher.ShipmentHeaderId = Entity.ID;
|
||||
|
||||
var CurrentCulture = Wtm.CurrentCulture;
|
||||
var dictDatas = DC.Set<SysDictData>().ToList();
|
||||
ShipTypes = dictDatas.Where(x => x.DictType == "ShipType").Select(x => new ComboSelectListItem
|
||||
{
|
||||
Text = CurrentCulture == "zh" ? x.DictLabel : x.DictLabelUs,
|
||||
Value = x.DictValue
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
public override void DoAdd()
|
||||
|
||||
Reference in new issue
Block a user