销售备货调整。

ButcherFactory.BO/Bill/StockUpEntity.cs

@@ -21,17 +21,19 @@ namespace ButcherFactory.BO
     public decimal? UnitNum { get; set; }
     public decimal? SSecondNumber { get; set; }
     public decimal? SUnitNum { get; set; }
-    public decimal? Rate { get; set; }
-    [DbColumn(DefaultValue = 0)]
-    public bool StandardPic { get; set; }
-    public bool Finishd
+    public bool StandardPic { get; set; }
+    public bool StockUpBySecondNum { get; set; }
+    public bool FinishAssign { get; set; }
+    public bool Finishd
     {
       get
       {
-        //if (StandardPic)
+        if (FinishAssign)
+          return true;
+        if (StockUpBySecondNum)
+          return (SecondNumber ?? 0) <= (SSecondNumber ?? 0);
         return (UnitNum ?? 0) <= (SUnitNum ?? 0) + (DownFloat ?? 0);
-        //return (SecondNumber ?? 0) <= (SSecondNumber ?? 0);
-      }
+      }
     }
     public long? SendQueue { get; set; }
 

ButcherFactory.BO/LocalBL/SegmentStockUpBL.cs

@@ -20,11 +20,11 @@ namespace ButcherFactory.BO.LocalBL
     /// <summary>
     /// </summary>
     /// <param name="code"></param>
-    /// <returns>GoodsCode:StringExt1,Weight:DecimalExt1</returns>
-    public static Tuple<string, decimal?, bool> StockUpScan(string code)
-    {
-      var json = ButcherFactoryUtil.SecondUrlCall<string>(MESPath + "SegmentInStoreRpc/StockUpScan", code);
-      return JsonConvert.DeserializeObject<Tuple<string, decimal?, bool>>(json);
+    /// <returns>GoodsCode:StringExt1,Weight:DecimalExt1</returns>
+    public static Tuple<string, decimal?, bool> StockUpScan(string code)
+    {
+      var json = ButcherFactoryUtil.SecondUrlCall<string>(MESPath + "SegmentInStoreRpc/StockUpScan", code);
+      return JsonConvert.DeserializeObject<Tuple<string, decimal?, bool>>(json);
     }
 
     public static List<SaleOutStoreInfo> GetSaleOutStoreList(DateTime date)
@@ -65,28 +65,28 @@ namespace ButcherFactory.BO.LocalBL
       session.ExecuteNonQuery(delete);
     }
 
-    //当明细备完后，要返回该明细已备数量。
-    public static AlreadyStockUp Insert(SegmentStockUp detail, AlreadyStockUp already, decimal totalNumber)
-    {
-      try
-      {
+    //当明细备完后，要返回该明细已备数量。
+    public static AlreadyStockUp Insert(SegmentStockUp detail, AlreadyStockUp already, decimal totalNumber, bool stockBySecond)
+    {
+      try
+      {
         var json = JsonConvert.SerializeObject(new { DetailID = detail.DetailID, StandardPic = detail.StandardPic, BarCode = detail.BarCode, SecondNumber = detail.SecondNumber, UnitNumber = detail.UnitNumber });
-        var r = RpcFacade.Call<string>(RpcPath + "SaleOutStoreRpc/InsertStockUpDetail", json, JsonConvert.SerializeObject(already), totalNumber);
-        var outSide = JsonConvert.DeserializeObject<AlreadyStockUp>(r);
-        if (outSide.State == 1)
-        {
-          using (var session = DmoSession.New())
-          {
-            session.Insert(detail);
-            session.Commit();
-          }
-        }
-        return outSide;
-      }
-      catch
-      {
-        return null;
-      }
+        var r = RpcFacade.Call<string>(RpcPath + "SaleOutStoreRpc/InsertStockUpDetail", json, JsonConvert.SerializeObject(already), totalNumber, stockBySecond);
+        var outSide = JsonConvert.DeserializeObject<AlreadyStockUp>(r);
+        if (outSide.State == 1)
+        {
+          using (var session = DmoSession.New())
+          {
+            session.Insert(detail);
+            session.Commit();
+          }
+        }
+        return outSide;
+      }
+      catch
+      {
+        return null;
+      }
     }
 
     public static List<AlreadyStockUp> SyncAlreadyNumber(IEnumerable<long> detailIDs, long? maxID)

ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs

@@ -284,18 +284,22 @@ namespace ButcherFactory.SegmentStockUp_
       detail.Customer_Name = saleOutStore.Customer_Name;
       detail.UnitNumber = scan.Item2;
       detail.StandardPic = scan.Item3;
-      if (detail.UnitNumber.HasValue && saleOutStore.Rate.HasValue)
-        detail.SecondNumber = detail.UnitNumber * saleOutStore.Rate;
-      else
+      //if (detail.UnitNumber.HasValue && saleOutStore.Rate.HasValue)
+      //  detail.SecondNumber = detail.UnitNumber * saleOutStore.Rate;
+      //else
         detail.SecondNumber = 1;
-      var number = saleOutStore.UnitNum - (config.AllowDownWeight ?? 0);
+        var number = 0m;
+        if (saleOutStore.StockUpBySecondNum)
+          number = saleOutStore.SecondNumber ?? 0;
+        else
+          number = (saleOutStore.UnitNum ?? 0) - (config.AllowDownWeight ?? 0);
       //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 back = SegmentStockUpBL.Insert(detail, already, number.Value);
+      var back = SegmentStockUpBL.Insert(detail, already, number,saleOutStore.StockUpBySecondNum);
       if (back == null)
       {
         InfoBox.Show("提示", "网络错误！", Color.Red, 1, this);
@@ -352,7 +356,9 @@ namespace ButcherFactory.SegmentStockUp_
         item.UnitNum = g.Sum(x => x.UnitNum ?? 0);
         item.SSecondNumber = g.Sum(x => x.SSecondNumber ?? 0);
         item.SUnitNum = g.Sum(x => x.SUnitNum ?? 0);
-        item.DownFloat = config.AllowDownWeight;
+        item.DownFloat = config.AllowDownWeight;
+        item.StockUpBySecondNum = f.StockUpBySecondNum;
+        item.FinishAssign = f.FinishAssign;
       }
       mainList = new BindingList<SaleOutStoreInfo>(main.OrderBy(x => x.Finishd).ToList());
 
@@ -394,19 +400,8 @@ namespace ButcherFactory.SegmentStockUp_
     {
       AbortTask();
       StartTask();
-      //SegmentStockUpPrint.Print(new SegmentStockUp { DeliverGoodsLine_Name = "莱阳线商品线", Date = DateTime.Today, BarCode = "260912011201810160800008" }, 123.5m, "");
     }
 
-    //private void dataPicker_Click(object sender, EventArgs e)
-    //{
-    //  var cs = new CalendarSelecter();
-    //  if (cs.ShowDialog() == true)
-    //  {
-    //    sendTime = cs.Result;
-    //    dataPicker.Text = sendTime.ToString("yyyy-MM-dd");
-    //  }
-    //}
-
     private void mainGridView_CellClick(object sender, DataGridViewCellEventArgs e)
     {
       if (e.RowIndex < 0)