diff --git a/ButcherFactory.BO/LocalBL/CarcassInStoreBL.cs b/ButcherFactory.BO/LocalBL/CarcassInStoreBL.cs index 58b1e47..c64d8bb 100644 --- a/ButcherFactory.BO/LocalBL/CarcassInStoreBL.cs +++ b/ButcherFactory.BO/LocalBL/CarcassInStoreBL.cs @@ -72,7 +72,7 @@ namespace ButcherFactory.BO.LocalBL var entity = CreateCarcassInStore(workUnitID, batchID, item, fromPad); entity.Goods_Name = GetGoodsName(item.Item1, session); if (batchID.HasValue) - entity.RowIndex = GetRowIndex(session, batchID.Value); + entity.RowIndex = GetRowIndex(session, batchID.Value) + 1; session.Insert(entity); list.Add(entity); } @@ -151,6 +151,7 @@ namespace ButcherFactory.BO.LocalBL public static BindingList GetLocalDataWithState(bool history) { var query = new DQueryDom(new JoinAlias(typeof(CarcassInStore))); + query.Columns.Add(DQSelectColumn.Field("RowIndex")); query.Columns.Add(DQSelectColumn.Field("ID")); query.Columns.Add(DQSelectColumn.Field("BarCode")); query.Columns.Add(DQSelectColumn.Field("Goods_Name")); @@ -173,13 +174,14 @@ namespace ButcherFactory.BO.LocalBL { var entity = new CarcassInStore(); result.Add(entity); - entity.ID = (long)reader[0]; - entity.BarCode = (string)reader[1]; - entity.Goods_Name = (string)reader[2]; + entity.RowIndex = (int?)reader[0]; + entity.ID = (long)reader[1]; + entity.BarCode = (string)reader[2]; + entity.Goods_Name = (string)reader[3]; if (history) { - entity.Weight = (decimal)reader[3]; - entity.BeforeWeight = (decimal?)reader[4]; + entity.Weight = (decimal)reader[4]; + entity.BeforeWeight = (decimal?)reader[5]; } } } diff --git a/ButcherFactory.BO/LocalBL/CarcassTakeOutBL.cs b/ButcherFactory.BO/LocalBL/CarcassTakeOutBL.cs index 585a1ec..fb13478 100644 --- a/ButcherFactory.BO/LocalBL/CarcassTakeOutBL.cs +++ b/ButcherFactory.BO/LocalBL/CarcassTakeOutBL.cs @@ -29,7 +29,7 @@ namespace ButcherFactory.BO.LocalBL entity.WorkUnit_ID = workUnitID; entity.BarCode = barCode; entity.UserID = AppContext.Worker.ID; - entity.RowIndex = GetRowIndex(session); + entity.RowIndex = GetRowIndex(session) + 1; session.Insert(entity); isNew = true; } @@ -87,6 +87,7 @@ namespace ButcherFactory.BO.LocalBL public static BindingList GetLocalDataWithState(bool history) { var query = new DQueryDom(new JoinAlias(typeof(CarcassTakeOut))); + query.Columns.Add(DQSelectColumn.Field("RowIndex")); query.Columns.Add(DQSelectColumn.Field("ID")); query.Columns.Add(DQSelectColumn.Field("BarCode")); query.Columns.Add(DQSelectColumn.Field("Goods_Name")); @@ -105,11 +106,12 @@ namespace ButcherFactory.BO.LocalBL { var entity = new CarcassTakeOut(); result.Add(entity); - entity.ID = (long)reader[0]; - entity.BarCode = (string)reader[1]; - entity.Goods_Name = (string)reader[2]; - entity.BeforeWeight = (decimal?)reader[3]; - entity.Weight = (decimal?)reader[4]; + entity.RowIndex = (int?)reader[0]; + entity.ID = (long)reader[1]; + entity.BarCode = (string)reader[2]; + entity.Goods_Name = (string)reader[3]; + entity.BeforeWeight = (decimal?)reader[4]; + entity.Weight = (decimal?)reader[5]; } } } diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs index d490c91..80ab795 100644 --- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs +++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs @@ -111,8 +111,6 @@ namespace ButcherFactory.CarcassInStore_ { lock (_lock) { - if (errorWeight.HasValue && weight != 0 && weight < errorWeight) - SoundPalyUtil.PlaySound("Sounds\\wtl.wav"); this.Invoke(new Action(() => { var last = needSubmitedList.LastOrDefault(); @@ -131,7 +129,10 @@ namespace ButcherFactory.CarcassInStore_ if (historyList.Any()) historyDataGrid.FirstDisplayedScrollingRowIndex = 0; historyDataGrid.Refresh(); - SoundPalyUtil.PlaySound(SoundType.ShotSucc); + if (errorWeight.HasValue && weight != 0 && weight < errorWeight) + SoundPalyUtil.PlaySound("Sounds\\wtl.wav"); + else + SoundPalyUtil.PlaySound(SoundType.ShotSucc); } })); }