uploadflag 累减 查询的时候 != 1 倒序
查询接口新增id,updatetime,detailid,查询新增uploadflag
This commit is contained in:
1 parent
6729d5fd7d
commit
648e6b148e
4 files changed
+23
-7
No files matched your search
@@ -17,6 +17,7 @@ namespace HHWMS.Web
|
|||||||
protected override IEnumerable<IGridColumn<InventoryApi_View>> InitGridHeader()
|
protected override IEnumerable<IGridColumn<InventoryApi_View>> InitGridHeader()
|
||||||
{
|
{
|
||||||
return new List<GridColumn<InventoryApi_View>>{
|
return new List<GridColumn<InventoryApi_View>>{
|
||||||
|
this.MakeGridHeader(x => x.ID),
|
||||||
this.MakeGridHeader(x => x.WareHouse),
|
this.MakeGridHeader(x => x.WareHouse),
|
||||||
this.MakeGridHeader(x => x.MaterialCode),
|
this.MakeGridHeader(x => x.MaterialCode),
|
||||||
this.MakeGridHeader(x => x.FigureNo),
|
this.MakeGridHeader(x => x.FigureNo),
|
||||||
@@ -29,8 +30,11 @@ namespace HHWMS.Web
|
|||||||
this.MakeGridHeader(x => x.Remark),
|
this.MakeGridHeader(x => x.Remark),
|
||||||
this.MakeGridHeader(x => x.LocationCode),
|
this.MakeGridHeader(x => x.LocationCode),
|
||||||
this.MakeGridHeader(x => x.SourceCode),
|
this.MakeGridHeader(x => x.SourceCode),
|
||||||
|
this.MakeGridHeader(x => x.MoDetailId),
|
||||||
this.MakeGridHeader(x => x.Qty),
|
this.MakeGridHeader(x => x.Qty),
|
||||||
this.MakeGridHeader(x => x.Createtime),
|
this.MakeGridHeader(x => x.Createtime),
|
||||||
|
this.MakeGridHeader(x => x.UpdateTime),
|
||||||
|
this.MakeGridHeader(x => x.UploadFlag),
|
||||||
this.MakeGridHeaderAction(width: 200)
|
this.MakeGridHeaderAction(width: 200)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -46,14 +50,17 @@ namespace HHWMS.Web
|
|||||||
.CheckContain(Searcher.BatchCode, x=>x.BatchCode)
|
.CheckContain(Searcher.BatchCode, x=>x.BatchCode)
|
||||||
.CheckContain(Searcher.NextBatch, x=>x.Lot)
|
.CheckContain(Searcher.NextBatch, x=>x.Lot)
|
||||||
.CheckContain(Searcher.SuFigureNo, x=>x.SupplierCode)
|
.CheckContain(Searcher.SuFigureNo, x=>x.SupplierCode)
|
||||||
|
.CheckWhere(Searcher.UploadFlag,x => x.UploadErpFlag == Searcher.UploadFlag)
|
||||||
.Select(x => new InventoryApi_View
|
.Select(x => new InventoryApi_View
|
||||||
{
|
{
|
||||||
|
ID = x.ID,
|
||||||
WareHouse = x.ZoneId == 1027 ? "xb" : x.ZoneId == 1028 ? "cp" : "mj" ,
|
WareHouse = x.ZoneId == 1027 ? "xb" : x.ZoneId == 1028 ? "cp" : "mj" ,
|
||||||
MaterialCode = x.MaterialCode,
|
MaterialCode = x.MaterialCode,
|
||||||
FigureNo = x.MaterialType,
|
FigureNo = x.MaterialType,
|
||||||
MaterialName = x.MaterialName,
|
MaterialName = x.MaterialName,
|
||||||
MaterialSpec = x.MaterialSpec,
|
MaterialSpec = x.MaterialSpec,
|
||||||
SourceCode = x.SourceCode,
|
SourceCode = x.SourceCode,
|
||||||
|
MoDetailId = x.ReceiptDetailId,
|
||||||
Company = x.CompanyCode,
|
Company = x.CompanyCode,
|
||||||
Remark = x.Batch,
|
Remark = x.Batch,
|
||||||
BatchCode = x.BatchCode,
|
BatchCode = x.BatchCode,
|
||||||
@@ -61,15 +68,19 @@ namespace HHWMS.Web
|
|||||||
LocationCode = x.LocationCode,
|
LocationCode = x.LocationCode,
|
||||||
Qty = x.Qty,
|
Qty = x.Qty,
|
||||||
Createtime = x.CreateTime,
|
Createtime = x.CreateTime,
|
||||||
NextBatch = x.Lot
|
NextBatch = x.Lot,
|
||||||
|
UpdateTime = x.UpdateTime,
|
||||||
|
UploadFlag = x.UploadErpFlag
|
||||||
}).OrderBy(x => x.MaterialCode);
|
}).OrderBy(x => x.MaterialCode);
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class InventoryApi_View : TopBasePoco {
|
public class InventoryApi_View : BasePoco {
|
||||||
|
public new int ID { get; set; }
|
||||||
public String WareHouse { get; set; }
|
public String WareHouse { get; set; }
|
||||||
|
public string MoDetailId { get; set; }
|
||||||
public string MaterialCode { get; set; }
|
public string MaterialCode { get; set; }
|
||||||
public string MaterialName { get; set; }
|
public string MaterialName { get; set; }
|
||||||
public string MaterialSpec { get; set; }
|
public string MaterialSpec { get; set; }
|
||||||
@@ -83,5 +94,6 @@ namespace HHWMS.Web
|
|||||||
public string LocationCode { get; set; }
|
public string LocationCode { get; set; }
|
||||||
public decimal? Qty { get; set; }
|
public decimal? Qty { get; set; }
|
||||||
public DateTime? Createtime { get; set; }
|
public DateTime? Createtime { get; set; }
|
||||||
|
public int? UploadFlag { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +26,7 @@ namespace HHWMS.Web
|
|||||||
[Display(Name = "Inventory.SupplierCode")]
|
[Display(Name = "Inventory.SupplierCode")]
|
||||||
public String SuFigureNo { get; set; }
|
public String SuFigureNo { get; set; }
|
||||||
public String WareHouse { get; set; }
|
public String WareHouse { get; set; }
|
||||||
|
public int UploadFlag { get; set; }
|
||||||
|
|
||||||
public string NextBatch { get; set; }
|
public string NextBatch { get; set; }
|
||||||
protected override void InitVM()
|
protected override void InitVM()
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ namespace HHWMS.Web
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
inventory.UploadErpFlag = 0;
|
inventory.UploadErpFlag -= 1;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,13 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
var _unitwork = new UnitWork(Wtm);
|
var _unitwork = new UnitWork(Wtm);
|
||||||
|
|
||||||
var inv = _unitwork.FindSingle<Inventory>(x => x.UploadErpFlag == 0
|
var inv = _unitwork.Find<Inventory>(x =>
|
||||||
&& x.TaskStatus != InventoryTaskStatusEnum.Locked
|
x.UploadErpFlag != 1
|
||||||
// && !string.IsNullOrEmpty(x.ReceiptDetailId)
|
&& x.TaskStatus != InventoryTaskStatusEnum.Locked
|
||||||
);
|
// && !string.IsNullOrEmpty(x.ReceiptDetailId)
|
||||||
|
)
|
||||||
|
.OrderByDescending(x => x.UploadErpFlag)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
// 使用通用的ProcessErpFinishIn方法
|
// 使用通用的ProcessErpFinishIn方法
|
||||||
var invVM = Wtm.CreateVM<InventoryVM>();
|
var invVM = Wtm.CreateVM<InventoryVM>();
|
||||||
|
|||||||
Reference in new issue
Block a user