Browse Source

Merge branch 'dev' of http://219.151.179.47:3000/chenlong/GoldHoo into dev

# Conflicts:
#	src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Web.config
#	src/Befri.Goldhoo/Befri.Goldhoo.MvcUI/Web.config
陈龙 1 week ago
parent
commit
b18f8e36aa

+ 2 - 0
.gitignore

@@ -112,3 +112,5 @@ UpgradeLog*.XML
 /src/Befri.Goldhoo/.vs
 /src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/.vs
 /src/Befri.Goldhoo/Befri.Goldhoo.DataServices.WebApi/.vs
+/src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Web.config
+/src/Befri.Goldhoo/Befri.Goldhoo.MvcUI/Web.config

+ 7 - 1
src/Befri.Goldhoo/Befri.Goldhoo.DataAccess/shop_order/PurchaseOrderDAO.cs

@@ -457,9 +457,15 @@ WHERE Rol.LineStatus >= 60 AND Rol.LineStatus <> 90 AND ISNULL(Rol.BearPrice,0)
             return DataTableMapper.ToObject<BusinessUnit>(db.ExecuteDataSet(command).Tables[0].Rows[0]);
         }
 
+        /// <summary>
+        /// 采购订单行店铺折扣更新
+        /// </summary>
+        /// <param name="purchaseOrderPurchaseOrderId"></param>
+        /// <param name="priceRatio"></param>
+        /// <returns></returns>
         public int UpdatePoLineSpecialFareByShopPriceRatio(int purchaseOrderPurchaseOrderId, decimal priceRatio)
         {
-            const string sql = @"UPDATE line SET SpecialFare = Price * ( @Ratio - 1 ) FROM shop_order.PurchaseOrderLine line INNER JOIN basedata.Inventory item ON line.InventoryId = item.InventoryId AND item.PriceType = 1 WHERE line.PurchaseOrderId = @PurchaseOrderId";
+            const string sql = @"UPDATE line SET SpecialFare = line.Price * ( @Ratio - 1 ) FROM shop_order.PurchaseOrderLine line INNER JOIN basedata.Inventory item ON line.InventoryId = item.InventoryId AND item.PriceType = 1 WHERE line.PurchaseOrderId = @PurchaseOrderId";
             DatabaseProviderFactory factory = new DatabaseProviderFactory();
             Database db = factory.CreateDefault();
             DbCommand command = db.GetSqlStringCommand(sql);

+ 1 - 0
src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/App_Common/BaseController.cs

@@ -146,6 +146,7 @@ namespace Befri.Goldhoo.Mobile.MvcUI
                                            "Win10-Long",
                                            "Ant-pc",
                                            "iZewu2vj3y9je2Z",
+                                            "Angel03",
                                             "angel03",
                                             "::1",
                                             "39.106.194.30"