diff --git a/ButcherFactory.BO/Bill/StockUpEntity.cs b/ButcherFactory.BO/Bill/StockUpEntity.cs index 0b7b0c8..a935512 100644 --- a/ButcherFactory.BO/Bill/StockUpEntity.cs +++ b/ButcherFactory.BO/Bill/StockUpEntity.cs @@ -27,10 +27,10 @@ namespace ButcherFactory.BO public bool Finishd { get - { - //if (StandardPic) - return (UnitNum ?? 0) <= (SUnitNum ?? 0); - //return (SecondNumber ?? 0) <= (SSecondNumber ?? 0); + { + if (StandardPic) + return (UnitNum ?? 0) <= (SUnitNum ?? 0); + return (SecondNumber ?? 0) <= (SSecondNumber ?? 0); } } public long? SendQueue { get; set; } @@ -83,7 +83,7 @@ namespace ButcherFactory.BO public int State { get; set; } public long DetailID { get; set; } public long MaxID { get; set; } - //public bool StandardPic { get; set; } + public bool StandardPic { get; set; } public decimal? UnitNum { get; set; } public decimal? SecondNumber { get; set; } } diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs index 4177e44..cb2d2a6 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs @@ -146,7 +146,7 @@ namespace ButcherFactory.SegmentStockUp_ var mainFirst = allMain.FirstOrDefault(x => x.DetailID == item.DetailID); if (mainFirst != null) { - mainFirst.StandardPic = false;//item.StandardPic; + mainFirst.StandardPic = item.StandardPic; mainFirst.SUnitNum = item.UnitNum; mainFirst.SSecondNumber = item.SecondNumber; } @@ -276,11 +276,13 @@ namespace ButcherFactory.SegmentStockUp_ detail.SecondNumber = detail.UnitNumber * saleOutStore.Rate; else detail.SecondNumber = 1; - var number =saleOutStore.UnitNum ; + var number =saleOutStore.UnitNum ; + if (!detail.StandardPic) + number = saleOutStore.SecondNumber; - var already = alreadyList.FirstOrDefault(x => x.DetailID == detail.DetailID); - if (already == null) - already = new AlreadyStockUp() { DetailID = detail.DetailID };//StandardPic = detail.StandardPic + var already = alreadyList.FirstOrDefault(x => x.DetailID == detail.DetailID); + if (already == null) + already = new AlreadyStockUp() { DetailID = detail.DetailID };//StandardPic = detail.StandardPic var back = SegmentStockUpBL.Insert(detail, already, number.Value); if (back == null) { @@ -292,7 +294,7 @@ namespace ButcherFactory.SegmentStockUp_ InfoBox.Show("提示", "条码已使用过", Color.Green, 1, this); return; } - //back.StandardPic = detail.StandardPic; + back.StandardPic = detail.StandardPic; back.DetailID = detail.DetailID; if (back.State == 0) {