bug

B3ClientService.Web/Pages/B3ClientService/Reports/SectionInOutStoreAnalyse_/SectionInOutStoreAnalyse.cs

@@ -134,8 +134,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.SectionInOutStoreAnalyse_
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.GreaterThanOrEqual("Time", startTime), DQCondition.EQ("InStore", false)), DQExpression.Value(1))).ECastType<int?>(), "出库|头数"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.GreaterThanOrEqual("Time", startTime), DQCondition.EQ("InStore", false)), DQExpression.Field("Weight"))), "出库|重量"));
 
-      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("InStore", true), DQExpression.Value(1), DQExpression.Value(-1))).ECastType<int?>(), "期初库存|头数"));
-      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("InStore", true), DQExpression.Field("Weight"), DQExpression.Multiply(DQExpression.Value(-1), DQExpression.Field("Weight")))), "期初库存|重量"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("InStore", true), DQExpression.Value(1), DQExpression.Value(-1))).ECastType<int?>(), "期末库存|头数"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("InStore", true), DQExpression.Field("Weight"), DQExpression.Multiply(DQExpression.Value(-1), DQExpression.Field("Weight")))), "期末库存|重量"));
 
       query.GroupBy.Expressions.Add(DQExpression.Field("Goods_ID"));
       query.GroupBy.Expressions.Add(DQExpression.Field("Goods_Name"));

B3ClientService.Web/Pages/B3ClientService/Reports/SectionLossAnalyse_/SectionLossAnalyse.cs

@@ -103,7 +103,7 @@ namespace BWP.Web.Pages.B3ClientService.Reports.SectionLossAnalyse_
       query.Columns.Add(DQSelectColumn.Sum("PickWeight", "领料|重量"));
       query.Columns.Add(DQSelectColumn.Sum("InNumber", "入库|头数"));
       query.Columns.Add(DQSelectColumn.Sum("InWeight", "入库|重量"));
-      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Subtract(DQExpression.IfNull(DQExpression.Field("PickWeight"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field("InWeight"), DQExpression.Value(0)))).ECastType<int>(), "差异"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Subtract(DQExpression.IfNull(DQExpression.Field("PickWeight"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field("InWeight"), DQExpression.Value(0)))).ECastType<decimal>(), "差异"));
       if (!batchSelect.IsEmpty)
         query.Where.Conditions.Add(DQCondition.EQ("ProductBatch_ID", long.Parse(batchSelect.Value)));
       var args = new LoadArguments(query);

B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs

@@ -31,6 +31,8 @@ namespace BWP.B3ClientService.Rpcs
         query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("BarCode"), arr.Select(x => DQExpression.Value(x.BarCode)).ToArray()));
 
         var config = GetSectionConfig(session);
+        var tp = new List<Tuple<long, DateTime, long>>();
+        var list = new List<SectionStoreDetail>();
         using (var reader = session.ExecuteReader(query))
         {
           while (reader.Read())
@@ -51,27 +53,31 @@ namespace BWP.B3ClientService.Rpcs
               throw new Exception("未配置条段对应关系");
             e2.Goods_ID = c.Item2;
             e2.Worker_ID = entity.Worker_ID;
+            tp.Add(new Tuple<long, DateTime, long>((long)reader[2], entity.InStoreTime, entity.Worker_ID));
 
-            session.Insert(entity);
-            session.Insert(e2);
-
-            SetCarcassTakeOut(session, (long)reader[2], entity.InStoreTime, entity.Worker_ID);
+            list.Add(entity);
+            list.Add(e2);
           }
         }
+        foreach (var item in list)
+          session.Insert(item);
+
+        foreach (var item in tp)
+          SetCarcassTakeOut(session, item);
 
         session.Commit();
       }
       return arr.Count;
     }
 
-    static void SetCarcassTakeOut(IDmoSession session, long id, DateTime time, long worker_ID)
+    static void SetCarcassTakeOut(IDmoSession session, Tuple<long, DateTime, long> item)
     {
       var update = new DQUpdateDom(typeof(CarcassFullInfo));
       update.Columns.Add(new DQUpdateColumn("PickWeight", DQExpression.Field("InStoreWeight")));
-      update.Columns.Add(new DQUpdateColumn("PickWorker_ID", worker_ID));
-      update.Columns.Add(new DQUpdateColumn("PickTime", time));
+      update.Columns.Add(new DQUpdateColumn("PickWorker_ID", item.Item3));
+      update.Columns.Add(new DQUpdateColumn("PickTime", item.Item2));
       update.Columns.Add(new DQUpdateColumn("PickType", 领用类型.条转段));
-      update.Where.Conditions.Add(DQCondition.EQ("ID", id));
+      update.Where.Conditions.Add(DQCondition.EQ("ID", item.Item1));
       session.ExecuteNonQuery(update);
     }