Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -541,6 +541,12 @@ public class Goods implements Serializable {
 	@Column(name = "go_autopublish", columnDefinition = "TINYINT(1)")
 	private Boolean autoPublish;
 
+	/**
+	 * 成本单价
+	 */
+	@Transient
+	private Double costPrice;
+
 	@Transient
 	private ProductAttachSubmit productAttachSubmit;
 
@@ -1695,6 +1701,7 @@ public class Goods implements Serializable {
         g.setReserve(product.getErpReserve());
         g.setMinPackQty(product.getMinPackQty());
         g.setPackaging(product.getPackaging());
+		g.setCostPrice(product.getPrice());
 		return g;
 	}
 
@@ -1950,4 +1957,13 @@ public class Goods implements Serializable {
 			}
 		}
 	}
+
+	public Double getCostPrice() {
+		return costPrice;
+	}
+
+	public Goods setCostPrice(Double costPrice) {
+		this.costPrice = costPrice;
+		return this;
+	}
 }

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -6,9 +6,9 @@ define(['app/app'], function(app) {
 		document.title = '订单详情-优软商城';
 		// 保存订单编号信息
 		$scope.orderId = $stateParams.orderid;
-		$scope.acceptGoods = false // 是否是 收货入库进来
-		$scope.CheckId = 'autoMonth0' // 当前发货点选择按钮
-    $scope.ChooseItem = '' // 当前选择发货单
+		$scope.acceptGoods = false; // 是否是 收货入库进来
+		$scope.CheckId = 'autoMonth0'; // 当前发货点选择按钮
+    	$scope.ChooseItem = '';// 当前选择发货单
 		$scope.orderStatus = true
 
     // 获取当前收货单所对应的物品信息
@@ -278,9 +278,9 @@ define(['app/app'], function(app) {
 
 		// 设置当前选择的发货单
 		$scope.ChooseSendGoodsItem = function(item, ind) {
-      $scope.CheckId = `autoMonth${ind}`
-			$scope.ChooseItem = item
-      getReceiveInfo()
+		  $scope.CheckId = 'autoMonth' + ind;
+		  $scope.ChooseItem = item;
+		  getReceiveInfo();
 		}
 
     // 确认收货

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -462,9 +462,12 @@ define([ 'app/app' ], function(app) {
         };
 
         var inSaveOtherCheck = function(type) {
-            console.log(type, 'type')
             Goods.getByEnterpriseId({invoiceId: type.invoiceid}, null, function(data) {
-                console.log('data', data, type.invoiceId)
+                if(data.code === 1) {
+                    toaster.pop("success", "信息保存成功");
+                }
+            }, function(response) {
+                toaster.pop('error', '错误', response.data);
             })
         };