Revert "需求单No.138363

B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj

@@ -37,11 +37,11 @@
     <Reference Include="B3ButcherManage, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3ButcherManage.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3CowButcherManage.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3CowButcherManage.Web.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3Frameworks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs

@@ -288,7 +288,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       var gbl = BIFactory.Create<IGoodsPropertyBL>();
       var cannotUpdateID = new List<long>();
       var updateIDs = new List<long>();
-      long GoodsProperty_ID = 0;
+      //long GoodsProperty_ID = 0;
       foreach (var orderDetails in groupByOrderID) {
 
         var order = bl.Load(orderDetails.Key);
@@ -312,7 +312,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
             detail.Price = cDetail.Price;
             changed = true;
           }
-          GoodsProperty_ID = (long)detail.GoodsProperty_ID;
+          //GoodsProperty_ID = (long)detail.GoodsProperty_ID;
         }
 
         if (changed) {
@@ -325,9 +325,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
           updateIDs.Add(order.ID);
         }
       }
-      var GoodsProperty = gbl.Load(GoodsProperty_ID);
-      GoodsProperty.AdjustNum += 1;
-      gbl.Update(GoodsProperty);
+      //var GoodsProperty = gbl.Load(GoodsProperty_ID);
+      //GoodsProperty.AdjustNum += 1;
+      //gbl.Update(GoodsProperty);
       string msg;
       if (updateIDs.Count > 0)
         msg = string.Format("保存成功\n已更新销售订单No.{0}\n", string.Join(",", updateIDs));

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs

@@ -164,7 +164,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _grid.Columns.Add(new DFBrowseGridColumn("可用库存"));
       _grid.Columns.Add(new DFBrowseGridColumn("测算数量"));
       _grid.Columns.Add(new DFBrowseGridColumn("可用与预算合计"));
-      _grid.Columns.Add(new DFBrowseGridColumn("AdjustNum"));
+      //_grid.Columns.Add(new DFBrowseGridColumn("AdjustNum"));
       _grid.Columns.Add(new DFBrowseGridColumn("预计剩余数量"));
       _grid.Columns.Add(new DFBrowseGridColumn("预计剩余头数"));
       _grid.OnDetailDataBound += (htmlRow, dataRow, o) => {
@@ -173,8 +173,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
           return;
         var diff = (decimal?)row["预计剩余数量"];
 
+        AddLinkBt(o, row, 5, diff, htmlRow);
         AddLinkBt(o, row, 6, diff, htmlRow);
-        AddLinkBt(o, row, 7, diff, htmlRow);
       };
 
       tPanel.Controls.Add(_grid);
@@ -241,7 +241,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       AvailableStorageUtil.RegisgterAvaliableStorageUnionTable(dom, context);
       //汇总可用库存
       RegisgterAvaliableStorageSumTable(dom);
-      dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum", "AdjustNum" }, GetOrderDQueryDom());
+      dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum"}, GetOrderDQueryDom());
       dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number", "MainNumber","Date" }, GetOutputDQueryDom());
       dom.RegisterQueryTable(typeof(OutputConfigTmp), new[] { "GoodsProperty_ID", "Number" }, GetOutputConfigureDom());
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(bill, "GoodsProperty_ID", goodsProperty, "ID"));
@@ -251,7 +251,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID", bill));
       dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_Name", bill));
       dom.Columns.Add(DQSelectColumn.Field("UnitNum", bill));
-      dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill));
+      //dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill));
 
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number"), "可用库存"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Number"), "测算数量"));
@@ -331,8 +331,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       [Join("GoodsProperty_ID", "ID")]
       public string GoodsProperty_Name { get; set; }
 
-      [LogicName("调整次数")]
-      public int AdjustNum { get; set; }
+      //[LogicName("调整次数")]
+      //public int AdjustNum { get; set; }
 
     }
 
@@ -388,10 +388,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "Number")), "主数量"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "SecondNumber")), "主数量"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "UnitNum")), "主数量"));
-      dom.Columns.Add(DQSelectColumn.Field("AdjustNum", goodsProperty));
+      //dom.Columns.Add(DQSelectColumn.Field("AdjustNum", goodsProperty));
 
       dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "ID"));
-      dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "AdjustNum"));
+      //dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "AdjustNum"));
       dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核));
 
       dom.Where.Conditions.Add(DQCondition.EQ(bill, "Domain_ID", DomainContext.Current.ID));

B3_DongFangWanQi/B3_DongFangWanQi.csproj

@@ -51,7 +51,7 @@
     <Reference Include="B3SaleInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3SaleInterface.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3UnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>