添加库存查询条件
入库保存时,依据容器的code,并不是前端传递的code
This commit is contained in:
1 parent
38c126c7b7
commit
17b3236989
4 files changed
+12
-4
No files matched your search
@@ -110,6 +110,7 @@ namespace HHWMS.Web
|
|||||||
var query = DC.Set<Inventory>()
|
var query = DC.Set<Inventory>()
|
||||||
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
|
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
|
||||||
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
|
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
|
||||||
|
.CheckContain(Searcher.ContainerCode, x => x.ContainerCode)
|
||||||
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
|
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
|
||||||
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
|
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
|
||||||
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
|
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
|
||||||
|
|||||||
@@ -14,8 +14,12 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
[Display(Name = "Task.ZoneCode")]
|
[Display(Name = "Task.ZoneCode")]
|
||||||
public String ZoneCode { get; set; }
|
public String ZoneCode { get; set; }
|
||||||
[Display(Name = "Inventory.LocationCode")]
|
[Display(Name = "Container.LocationCode")]
|
||||||
public String LocationCode { get; set; }
|
public String LocationCode { get; set; }
|
||||||
|
|
||||||
|
[Display(Name = "Task.ContainerCode")]
|
||||||
|
public String ContainerCode { get; set; }
|
||||||
|
|
||||||
[Display(Name = "Inventory.UniqueCode")]
|
[Display(Name = "Inventory.UniqueCode")]
|
||||||
public String UniqueCode { get; set; }
|
public String UniqueCode { get; set; }
|
||||||
[Display(Name = "Inventory.MaterialCode")]
|
[Display(Name = "Inventory.MaterialCode")]
|
||||||
|
|||||||
@@ -5,6 +5,9 @@
|
|||||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||||
<wt:textbox field="Searcher.MaterialCode" />
|
<wt:textbox field="Searcher.MaterialCode" />
|
||||||
<wt:textbox field="Searcher.MaterialName" />
|
<wt:textbox field="Searcher.MaterialName" />
|
||||||
|
<wt:textbox field="Searcher.ContainerCode" />
|
||||||
|
<wt:textbox field="Searcher.LocationCode" />
|
||||||
|
|
||||||
@*<wt:textbox field="Searcher.MaterialType" />
|
@*<wt:textbox field="Searcher.MaterialType" />
|
||||||
<wt:textbox field="Searcher.MaterialSpec" />
|
<wt:textbox field="Searcher.MaterialSpec" />
|
||||||
<wt:textbox field="Searcher.MaterialUnit" />
|
<wt:textbox field="Searcher.MaterialUnit" />
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
var inventory = new Inventory()
|
var inventory = new Inventory()
|
||||||
{
|
{
|
||||||
ZoneCode = ZoneCodeEnum.立库,
|
ZoneCode = ZoneCodeEnum.立库,
|
||||||
ContainerCode = containerCode,
|
ContainerCode = container.Code,
|
||||||
MaterialCode = material.MaterialCode,
|
MaterialCode = material.MaterialCode,
|
||||||
MaterialName = material.MaterialName,
|
MaterialName = material.MaterialName,
|
||||||
MaterialType = material.MaterialType,
|
MaterialType = material.MaterialType,
|
||||||
@@ -108,7 +108,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
MaterialCode = material.MaterialCode,
|
MaterialCode = material.MaterialCode,
|
||||||
MaterialName = material.MaterialName,
|
MaterialName = material.MaterialName,
|
||||||
MaterialUnit = material.MaterialUnit,
|
MaterialUnit = material.MaterialUnit,
|
||||||
ContainerCode = containerCode,
|
ContainerCode = container.Code,
|
||||||
Qty = qty,
|
Qty = qty,
|
||||||
CreateTime = DateTime.Now,
|
CreateTime = DateTime.Now,
|
||||||
CreateBy = "WMS",
|
CreateBy = "WMS",
|
||||||
@@ -194,7 +194,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
ZoneCode = ZoneCodeEnum.立库,
|
ZoneCode = ZoneCodeEnum.立库,
|
||||||
TaskNo = _unitWork.GetSerialNumber("In"),
|
TaskNo = _unitWork.GetSerialNumber("In"),
|
||||||
TaskType = TaskTypeEnum.立库入库,
|
TaskType = TaskTypeEnum.立库入库,
|
||||||
ContainerCode = containerCode,
|
ContainerCode = container.Code,
|
||||||
FromLocation = "",
|
FromLocation = "",
|
||||||
ToLocation = location.Code,
|
ToLocation = location.Code,
|
||||||
Status = TaskStatusEnum.待下发,
|
Status = TaskStatusEnum.待下发,
|
||||||
|
|||||||
Reference in new issue
Block a user