再次修改
This commit is contained in:
@@ -124,16 +124,21 @@ namespace BarCode.Web.Domain.Entitys
|
|||||||
/// /// <param name="isNotCount">是否不计数</param>
|
/// /// <param name="isNotCount">是否不计数</param>
|
||||||
public Result UnSerialNumber(string serialNumber, string materialNumber,string isNotCount)
|
public Result UnSerialNumber(string serialNumber, string materialNumber,string isNotCount)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
var detail = this.Details.FirstOrDefault(f => f.MaterialNumber.Equals(materialNumber));
|
var detail = this.Details.FirstOrDefault(f => f.MaterialNumber.Equals(materialNumber));
|
||||||
|
|
||||||
|
if (isNotCount != "1")
|
||||||
|
{
|
||||||
if (detail == null)
|
if (detail == null)
|
||||||
return Result.ReFailure(ResultCodes.BoxMaterialNoDataError);
|
return Result.ReFailure(ResultCodes.BoxMaterialNoDataError);
|
||||||
var serial = detail.SerialNumbers.FirstOrDefault(f => f.Equals(serialNumber));
|
var serial = detail.SerialNumbers.FirstOrDefault(f => f.Equals(serialNumber));
|
||||||
if (serial == null && isNotCount!="1")
|
if (serial == null)
|
||||||
return Result.ReFailure(ResultCodes.BoxSerialNumberNoDataError);
|
return Result.ReFailure(ResultCodes.BoxSerialNumberNoDataError);
|
||||||
|
}
|
||||||
|
if(detail!=null)
|
||||||
|
{
|
||||||
detail.SerialNumbers.Remove(serialNumber);
|
detail.SerialNumbers.Remove(serialNumber);
|
||||||
|
|
||||||
|
|
||||||
// detail.Qty = detail.SerialNumbers.Count();
|
|
||||||
if (isNotCount == "1")
|
if (isNotCount == "1")
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -149,6 +154,12 @@ namespace BarCode.Web.Domain.Entitys
|
|||||||
if (detail.Qty <= 0)
|
if (detail.Qty <= 0)
|
||||||
this.Status = BoxStatus.NoUse;
|
this.Status = BoxStatus.NoUse;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// detail.Qty = detail.SerialNumbers.Count();
|
||||||
|
|
||||||
|
|
||||||
////如果数量为0了就删除这条明细
|
////如果数量为0了就删除这条明细
|
||||||
//if (detail.SerialNumbers.Count() <= 0)
|
//if (detail.SerialNumbers.Count() <= 0)
|
||||||
// this.Details.Remove(detail);
|
// this.Details.Remove(detail);
|
||||||
|
|||||||
Reference in New Issue
Block a user