入库
供应商,物料接口
This commit is contained in:
1 parent
8702a24e20
commit
cfbddf7e9e
19 files changed
+242
-28
No files matched your search
@@ -6,6 +6,7 @@ using WalkingTec.Mvvm.Mvc;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web;
|
||||
using HHWMS.Web.Models;
|
||||
using System.Linq;
|
||||
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
@@ -82,7 +83,18 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
//vm.Entity.SourceLine =
|
||||
var header = dc.Set<ReceiptHeader2>()
|
||||
.FirstOrDefault(x => x.ID == vm.Entity.ReceiptId);
|
||||
vm.Entity.WarehouseId = header.WarehouseId;
|
||||
vm.Entity.ReceiptCode = header?.Code;
|
||||
var detailList = dc.Set<ReceiptDetail2>()
|
||||
.Where(x => x.ReceiptId == vm.Entity.ReceiptId).ToList();
|
||||
vm.Entity.SourceLine = (detailList.Count() + 1).ToString();
|
||||
vm.Entity.Status = 0;
|
||||
var mater = dc.Set<Material2>()
|
||||
.FirstOrDefault(x => x.Code == vm.Entity.MaterialCode);
|
||||
vm.Entity.MaterialCode = mater?.Name;
|
||||
vm.Entity.Batch = vm.Entity.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2);
|
||||
vm.DoAdd();
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
|
||||
@@ -137,6 +137,10 @@ public class XWMSMFMController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -134,6 +134,11 @@ public class XWMSPOHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
receipt.TotalLines = detailList.Count();
|
||||
receipt.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(receipt);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -137,6 +137,11 @@ public class XWMSPTHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -131,6 +131,8 @@ public class XWMSSHIPController : BaseController
|
||||
receipt.TotalLines = detailList.Count();
|
||||
receipt.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(receipt);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -126,6 +126,12 @@ public class XWMSSOHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -32,16 +32,10 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<Material2_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<Material2_View>>{
|
||||
this.MakeGridHeader(x => x.Code),
|
||||
this.MakeGridHeader(x => x.Code).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.Name),
|
||||
this.MakeGridHeader(x => x.Name).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.MasterUnit),
|
||||
this.MakeGridHeader(x => x.AssistUnit),
|
||||
this.MakeGridHeader(x => x.WarehouseId),
|
||||
this.MakeGridHeader(x => x.WarehouseCode),
|
||||
this.MakeGridHeader(x => x.CompanyId),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.Barcode),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,8 +16,11 @@ namespace HHWMS.Web
|
||||
public String WarehouseCode { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "Material2.Code")]
|
||||
public String Code { get; set; }
|
||||
[Display(Name = "Material2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "Material2.Name")]
|
||||
public String Name { get; set; }
|
||||
public String Barcode { get; set; }
|
||||
public String Barcode2 { get; set; }
|
||||
|
||||
@@ -54,11 +54,7 @@ namespace HHWMS.Web
|
||||
}),
|
||||
|
||||
this.MakeGridHeader(x => x.Unit),
|
||||
this.MakeGridHeader(x => x.QtyCompleted)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
return a.QtyCompleted.ToString().TrimEnd('0').TrimEnd('.');
|
||||
}),
|
||||
this.MakeGridHeader(x => x.Project).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Status),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
|
||||
@@ -47,9 +47,9 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
return rv;
|
||||
}).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.SupplierName).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SupplierName),
|
||||
this.MakeGridHeader(x => x.TotalQty)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
@@ -57,16 +57,17 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
}),
|
||||
this.MakeGridHeader(x => x.TotalLines),
|
||||
this.MakeGridHeader(x => x.Remark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadStatus),
|
||||
this.MakeGridHeader(x => x.Uploadremark),
|
||||
this.MakeGridHeader(x => x.UploadStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.Uploadremark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.AppointmentTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.FirstStatus),
|
||||
this.MakeGridHeader(x => x.LastStatus),
|
||||
this.MakeGridHeader(x => x.FirstStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.LastStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef1).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef2).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef3).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station),
|
||||
this.MakeGridHeader(x => x.UserDef5).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@@ -79,6 +80,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
.CheckContain(Searcher.Type, x => x.Type)
|
||||
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
|
||||
.CheckContain(Searcher.SupplierName, x => x.SupplierName)
|
||||
.CheckContain(Searcher.UserDef5, x => x.UserDef5)
|
||||
.Select(x => new ReceiptHeader2_View
|
||||
{
|
||||
ID = x.ID,
|
||||
|
||||
@@ -14,14 +14,18 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
{
|
||||
public Int32? WarehouseId { get; set; }
|
||||
public String WarehouseCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.ReceiptCode")]
|
||||
public String Code { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SourceCode")]
|
||||
public String SourceCode { get; set; }
|
||||
public String SourcePlatform { get; set; }
|
||||
public Int32? SupplierId { get; set; }
|
||||
public String SupplierCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SupplierName")]
|
||||
public String SupplierName { get; set; }
|
||||
public Decimal? TotalQty { get; set; }
|
||||
public Int32? TotalLines { get; set; }
|
||||
@@ -41,6 +45,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
public String UserDef3 { get; set; }
|
||||
public String Station { get; set; }
|
||||
public String UserDef4 { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.UserDef5")]
|
||||
public String UserDef5 { get; set; }
|
||||
protected override void InitVM()
|
||||
{
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
</wt:searchpanel>
|
||||
</wt:selector>
|
||||
</wt:row>
|
||||
<wt:textbox field="Entity.MaterialName" />
|
||||
<wt:textbox field="Entity.Batch"/>
|
||||
@* <wt:textbox field="Entity.Batch"/> *@
|
||||
<wt:textbox field="Entity.Qty" />
|
||||
<wt:textbox field="Entity.Price" />
|
||||
<wt:combobox field="Entity.InventoryStatus" items="InventoryStatus" />
|
||||
|
||||
@@ -3,6 +3,11 @@
|
||||
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three" grid-id="ReceiptHeader2">
|
||||
<wt:textbox field="Searcher.Code" />
|
||||
<wt:textbox field="Searcher.Type" />
|
||||
<wt:textbox field="Searcher.SourceCode" />
|
||||
<wt:textbox field="Searcher.SupplierName" />
|
||||
<wt:textbox field="Searcher.UserDef5" />
|
||||
</wt:row>
|
||||
</wt:searchpanel>
|
||||
<wt:grid vm="@Model" id="ReceiptHeader2" url="/xwms/ReceiptHeader2/Search" limit="6" />
|
||||
|
||||
Reference in new issue
Block a user