1
This commit is contained in:
@@ -139,6 +139,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
.WhereIF(queryJson != null && queryJson["type"] != null, a => a.type == queryJson["type"].ToString())
|
.WhereIF(queryJson != null && queryJson["type"] != null, a => a.type == queryJson["type"].ToString())
|
||||||
.WhereIF(queryJson != null && queryJson["bill_code"] != null, a => a.bill_code.Contains(queryJson["bill_code"].ToString()))
|
.WhereIF(queryJson != null && queryJson["bill_code"] != null, a => a.bill_code.Contains(queryJson["bill_code"].ToString()))
|
||||||
.WhereIF(queryJson != null && queryJson["status"] != null, a => a.status == queryJson["status"].ToString())
|
.WhereIF(queryJson != null && queryJson["status"] != null, a => a.status == queryJson["status"].ToString())
|
||||||
|
.WhereIF(queryJson != null && queryJson["erp_bill_code"] != null && queryJson["erp_bill_code"].ToString() != "", a => a.erp_bill_code.Contains(queryJson["erp_bill_code"].ToString()))
|
||||||
.WhereIF(!isShowJZGL, a => a.type != WmsWareHouseConst.MATERIALTRANSFER_JZGLRK_CODE)
|
.WhereIF(!isShowJZGL, a => a.type != WmsWareHouseConst.MATERIALTRANSFER_JZGLRK_CODE)
|
||||||
.Select((a, b, c, d, e, f) => new WmsMaterialTransfer
|
.Select((a, b, c, d, e, f) => new WmsMaterialTransfer
|
||||||
{
|
{
|
||||||
@@ -185,6 +186,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
List<WmsMaterialTransferD> wmsTransferInstockDs = _db.Queryable<WmsMaterialTransferD, BasMaterial>((a, b) =>
|
List<WmsMaterialTransferD> wmsTransferInstockDs = _db.Queryable<WmsMaterialTransferD, BasMaterial>((a, b) =>
|
||||||
new JoinQueryInfos(JoinType.Left, a.material_id == b.id)
|
new JoinQueryInfos(JoinType.Left, a.material_id == b.id)
|
||||||
)
|
)
|
||||||
|
.WhereIF(queryJson != null && queryJson["tablefield120-code_batch"] != null && queryJson["tablefield120-code_batch"].ToString() != "", a => a.code_batch.Contains(queryJson["tablefield120-code_batch"].ToString()))
|
||||||
.Select((a, b) => new WmsMaterialTransferD
|
.Select((a, b) => new WmsMaterialTransferD
|
||||||
{
|
{
|
||||||
id = a.id,
|
id = a.id,
|
||||||
|
|||||||
Reference in New Issue
Block a user