From cbbb390e1d0569f776656179566f39b84ef9edab Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Wed, 7 Nov 2018 16:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=9C=A8=E9=85=8D?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Rpcs/SaleOutStoreRpc.cs                   | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/B3CowButcherManageToSale/Rpcs/SaleOutStoreRpc.cs b/B3CowButcherManageToSale/Rpcs/SaleOutStoreRpc.cs
index 090afb6..43846eb 100644
--- a/B3CowButcherManageToSale/Rpcs/SaleOutStoreRpc.cs
+++ b/B3CowButcherManageToSale/Rpcs/SaleOutStoreRpc.cs
@@ -5,6 +5,7 @@ using System.Text;
 using BWP.B3CowButcherManage.BO;
 using BWP.B3Frameworks.Utils;
 using BWP.B3Sale.BO;
+using BWP.B3Sale.Utils;
 using Forks.EnterpriseServices.DomainObjects2;
 using Forks.EnterpriseServices.DomainObjects2.DQuery;
 using Forks.EnterpriseServices.JsonRpc;
@@ -162,28 +163,30 @@ namespace BWP.B3CowButcherManageToSale.Rpcs
     session.ExecuteNonQuery(delete);
   }
 
-  private static Tuple<Money<decimal>?, Money<decimal>?> UpdateAssignNumber(IDmoSession session, long billID, long detailID, bool isAdd = true)
-  {
-    var weightingInfo = GetWeightingInfor(session, detailID);
-
-    var update = new DQUpdateDom(typeof(SaleOutStore_Detail));
-    update.Columns.Add(new DQUpdateColumn("AssignUnitNum", DQExpression.Value(weightingInfo.Item1)));
-    update.Columns.Add(new DQUpdateColumn("AssignMainUnitNum", DQExpression.Value(weightingInfo.Item1)));
-    update.Columns.Add(new DQUpdateColumn("AssignSecondaryUnit1Num", DQExpression.Value(weightingInfo.Item2)));
-    if (isAdd)
-      update.Columns.Add(new DQUpdateColumn("PackageNum", DQExpression.Add(DQExpression.IfNull(DQExpression.Field("PackageNum"), DQExpression.Value(0)), DQExpression.Value(1))));
-    else
-      update.Columns.Add(new DQUpdateColumn("PackageNum", DQExpression.Add(DQExpression.IfNull(DQExpression.Field("PackageNum"), DQExpression.Value(0)), DQExpression.Value(-1))));
-    update.Where.Conditions.Add(DQCondition.EQ("ID", detailID));
-    session.ExecuteNonQuery(update);
-
-    var update2 = new DQUpdateDom(typeof(SaleOutStore));
-    update2.Columns.Add(new DQUpdateColumn("RowVersion", DQExpression.Add(DQExpression.Field("RowVersion"), DQExpression.Value(1))));
-    update2.Where.Conditions.Add(DQCondition.EQ("ID", billID));
-    session.ExecuteNonQuery(update2);
+    private static Tuple<Money<decimal>?, Money<decimal>?> UpdateAssignNumber(IDmoSession session, long billID, long detailID, bool isAdd = true)
+    {
+      var weightingInfo = GetWeightingInfor(session, detailID);
+      var assigning = true;
+      if (weightingInfo.Item1 == null || weightingInfo.Item1 <= 0)
+        assigning = false;
+      var update = new DQUpdateDom(typeof(SaleOutStore_Detail));
+      update.Columns.Add(new DQUpdateColumn("AssignUnitNum", DQExpression.Value(weightingInfo.Item1)));
+      update.Columns.Add(new DQUpdateColumn("AssignMainUnitNum", DQExpression.Value(weightingInfo.Item1)));
+      update.Columns.Add(new DQUpdateColumn("AssignSecondaryUnit1Num", DQExpression.Value(weightingInfo.Item2)));
+      if (isAdd)
+        update.Columns.Add(new DQUpdateColumn("PackageNum", DQExpression.Add(DQExpression.IfNull(DQExpression.Field("PackageNum"), DQExpression.Value(0)), DQExpression.Value(1))));
+      else
+        update.Columns.Add(new DQUpdateColumn("PackageNum", DQExpression.Add(DQExpression.IfNull(DQExpression.Field("PackageNum"), DQExpression.Value(0)), DQExpression.Value(-1))));
+      update.Where.Conditions.Add(DQCondition.EQ("ID", detailID));
+      session.ExecuteNonQuery(update);
 
-    return weightingInfo;
-  }
+      var update2 = new DQUpdateDom(typeof(SaleOutStore));
+      update2.Columns.Add(new DQUpdateColumn("RowVersion", DQExpression.Add(DQExpression.Field("RowVersion"), DQExpression.Value(1))));
+      update2.Columns.Add(new DQUpdateColumn("AssignState", assigning ? DQExpression.Value(配货状态.正在配货) : DQExpression.Value(配货状态.未配货)));
+      update2.Where.Conditions.Add(DQCondition.EQ("ID", billID));
+      session.ExecuteNonQuery(update2);
+      return weightingInfo;
+    }
 
   static Tuple<Money<decimal>?, Money<decimal>?> GetWeightingInfor(IDmoSession session, long detailID)
   {