需求单No.141217

车间产品分标准件和非标准件，配货的时候标准件按报价数量进行备货，非标准件按辅数量进行备货。

B3ClientService.Web/Pages/B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetEdit.cs

@@ -132,7 +132,7 @@ namespace BWP.Web.Pages.B3ClientService.BaseInfos.ClientGoodsSet_
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("StandardWeight"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("StandardWeightUp"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("StandardWeightLow"));
-
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFCheckBox>("StandardPic"));
 
       var section = mPageLayoutManager.AddSection("Detail", "存货明细");
       titlePanel.SetPageLayoutSetting(mPageLayoutManager, section.Name);

B3ClientService/BO/Bill/SegmentProductionInfo.cs

@@ -56,6 +56,10 @@ namespace BWP.B3ClientService.BO
 
     [LogicName("重量")]
     public decimal? Weight { get; set; }
+
+    [LogicName("标准件")]
+    [DbColumn(DefaultValue = 0)]
+    public bool StandardPic { get; set; }
     #endregion
 
     #region 入库信息

B3ClientService/BO/CarcassFullInfoView.cs

@@ -1,4 +1,5 @@
-using Forks.EnterpriseServices.DataForm;
+using BWP.B3Frameworks.BO.NamedValueTemplate;
+using Forks.EnterpriseServices.DataForm;
 using Forks.EnterpriseServices.DomainObjects2;
 using Forks.EnterpriseServices.DomainObjects2.DQuery;
 using Forks.EnterpriseServices.SqlDoms;
@@ -134,6 +135,7 @@ namespace BWP.B3ClientService.BO
       query.Columns.Add(DQSelectColumn.Field("Date", "Time"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Value(true), "InStore"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Value(3), "Flag"));
+      query.Where.Conditions.Add(DQCondition.GreaterThanOrEqual("BillState", 单据状态.已审核));
       return query;
     }
   }

B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs

@@ -46,6 +46,10 @@ namespace BWP.B3ClientService.BO
 
     [LogicName("标准重量下限")]
     public decimal? StandardWeightLow { get; set; }
+
+    [LogicName("标准件")]
+    [DbColumn(DefaultValue = 0)]
+    public bool StandardPic { get; set; }
   }
 
   [Serializable]

B3ClientService/OfflinRpc/BaseInfoRpc.cs

@@ -88,6 +88,7 @@ namespace BWP.B3ClientService.Rpcs
       query.Columns.Add(DQSelectColumn.Field("StandardWeight", detail));
       query.Columns.Add(DQSelectColumn.Field("StandardWeightUp", detail));
       query.Columns.Add(DQSelectColumn.Field("StandardWeightLow", detail));
+      query.Columns.Add(DQSelectColumn.Field("StandardPic", detail));//8
       query.Columns.Add(DQSelectColumn.Field("Name", goods));
       query.Columns.Add(DQSelectColumn.Field("Code", goods));
       query.Columns.Add(DQSelectColumn.Field("Spec", goods));
@@ -149,12 +150,13 @@ namespace BWP.B3ClientService.Rpcs
               d.StandardWeight = (decimal?)reader[5];
               d.StandardWeightUp = (decimal?)reader[6];
               d.StandardWeightLow = (decimal?)reader[7];
+              d.StandardPic = (bool)reader[8];
             }
 
             if (!gsID.Contains(goodsID))
               gsID.Add(goodsID);
 
-            var gVersion = (int)reader[13];
+            var gVersion = (int)reader[14];
             if (!g2.Any(x => x.Item1 == goodsID))//insert
             {
               if (!gInsert.Any(x => x.ID == goodsID))
@@ -163,11 +165,11 @@ namespace BWP.B3ClientService.Rpcs
                 gInsert.Add(new MinGoods
                 {
                   ID = goodsID,
-                  Name = (string)reader[8],
-                  Code = (string)reader[9],
-                  Spec = (string)reader[10],
-                  MainUnit = (string)reader[11],
-                  GoodsType = (NamedValue<存货类别>?)reader[12],
+                  Name = (string)reader[9],
+                  Code = (string)reader[10],
+                  Spec = (string)reader[11],
+                  MainUnit = (string)reader[12],
+                  GoodsType = (NamedValue<存货类别>?)reader[13],
                   RowVersion = gVersion
                 });
               }
@@ -179,11 +181,11 @@ namespace BWP.B3ClientService.Rpcs
                 gUpdate.Add(new MinGoods
                 {
                   ID = goodsID,
-                  Name = (string)reader[8],
-                  Code = (string)reader[9],
-                  Spec = (string)reader[10],
-                  MainUnit = (string)reader[11],
-                  GoodsType = (NamedValue<存货类别>?)reader[12],
+                  Name = (string)reader[9],
+                  Code = (string)reader[10],
+                  Spec = (string)reader[11],
+                  MainUnit = (string)reader[12],
+                  GoodsType = (NamedValue<存货类别>?)reader[13],
                   RowVersion = gVersion
                 });
               }

B3ClientService/OfflinRpc/SegmentInStoreRpc.cs

@@ -147,11 +147,12 @@ namespace BWP.B3ClientService.Rpcs
       query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(main, "Goods_ID", goods, "ID"));
       query.Columns.Add(DQSelectColumn.Field("Code", goods));
       query.Columns.Add(DQSelectColumn.Field("Weight"));
+      query.Columns.Add(DQSelectColumn.Field("StandardPic"));
       query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("BarCode", barCode), DQCondition.IsNotNull(DQExpression.Field("InStoreTime")), DQCondition.IsNull(DQExpression.Field("BackTime"))));
-      var result = query.EExecuteScalar<string, decimal?>();
+      var result = query.EExecuteScalar<string, decimal?, bool>();
       if (result == null)
         return string.Empty;
-      return JsonConvert.SerializeObject(new ExtensionObj { StringExt1 = result.Item1, DecimalExt1 = result.Item2 });
+      return JsonConvert.SerializeObject(result);
     }
   }
 

B3ClientService/OfflinRpc/SegmentProductionRpc.cs

@@ -14,7 +14,7 @@ namespace BWP.B3ClientService.Rpcs
   [Rpc]
   public static class SegmentProductionRpc
   {
-    static string[] ProductInfoFields = new string[] { "ProductTime", "Worker_ID", "WorkUnit_ID", "ProductBatch_ID", "Goods_ID", "Weight" };
+    static string[] ProductInfoFields = new string[] { "ProductTime", "Worker_ID", "WorkUnit_ID", "ProductBatch_ID", "Goods_ID", "Weight", "StandardPic" };
     static Type MinDmoType = typeof(SegmentProductionMin);
 
     [Rpc(RpcFlags.SkipAuth)]
@@ -119,5 +119,6 @@ namespace BWP.B3ClientService.Rpcs
     public decimal? Weight { get; set; }
     public DateTime? InStoreTime { get; set; }
     public bool Delete { get; set; }
+    public bool StandardPic { get; set; }
   }
 }