|
@@ -224,7 +224,7 @@ namespace ZR.Service.Business.Balance
|
|
|
predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode || x.MaterialSpec == parm.MaterialCode);
|
|
|
predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BomNo), x => x.BomNo == parm.BomNo);
|
|
|
predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BnSnCode), x => x.BnSnCode == parm.BnSnCode);
|
|
|
- predicate.AndIF(parm.IsForAssemble, x => x.Status == 88);
|
|
|
+ predicate.AndIF(parm.IsForAssemble, x => x.Status < 99 && x.OutQty > 0);
|
|
|
predicate.AndIF(!parm.IsForAssemble, x => x.Status == 55);
|
|
|
//predicate.And(x => x.BalanceQty >= parm.Qty);
|
|
|
|
|
@@ -244,7 +244,7 @@ namespace ZR.Service.Business.Balance
|
|
|
var predicate1 = Expressionable.Create<StkBalanceDtl>();
|
|
|
predicate1.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode || x.MaterialSpec == parm.MaterialCode);
|
|
|
predicate1.AndIF(parm != null && !string.IsNullOrEmpty(parm.BnSnCode), x => x.BnSnCode == parm.BnSnCode);
|
|
|
- predicate1.AndIF(parm.IsForAssemble, x => x.Status == 88);
|
|
|
+ predicate1.AndIF(parm.IsForAssemble, x => x.Status < 99 && x.OutQty > 0);
|
|
|
predicate1.AndIF(!parm.IsForAssemble, x => x.Status == 55);
|
|
|
response = Queryable()
|
|
|
.Where(predicate1.ToExpression())
|