wugg 2 years ago
parent
commit
2e26aa33de
1 changed files with 7 additions and 1 deletions
  1. 7 1
      app/admin/controller/Filing.php

+ 7 - 1
app/admin/controller/Filing.php

@@ -54,6 +54,7 @@ class Filing extends Base
 	 		"tax"=>"",
 	 		"goodNum"=>"",
 	 		"goodPrice"=>"",
+	 		"goodUnit"=>"",
 	 		"mobile"=>"",
 	 		"addr"=>"",
 	 		"addr_code"=>"",
@@ -76,6 +77,7 @@ class Filing extends Base
 	 		"khNo|客户公司编号"=>"require|max:255|min:1",
 	 		"qrdType|订单类型"=>"require|number|in:1,2,3",
 	 		"goodName|商品名称"=>"require|max:255|min:1",
+	 		"goodUnit|商品单位"=>"require|number|gt:0",
 	 		"tax|税率"=>"require|number|gt:0",
 	 		"goodNum|商品数量"=>"require|number|gt:0",
 	 		"goodPrice|商品单价"=>"require|float|gt:0",
@@ -188,7 +190,7 @@ class Filing extends Base
 			"good_name"=>$param['goodName'],
 			"brand_id"=>0,
 			"cat_id"=>$param['cat_id'],
-			"good_unit"=>'',
+			"good_unit"=>$param['goodUnit'],
 			"good_type"=>1,
 			"moq"=>1,
 			"customized"=>0,
@@ -285,6 +287,7 @@ class Filing extends Base
     		"qrdType"=>$saleinfo['order_type'],
     		"goodName"=>$saleinfo['good_name'],
 	 		"tax"=>$goodinfo['tax'],
+	 		"good_unit"=>$goodinfo['good_unit'],
 	 		"goodNum"=>$saleinfo['good_num'],
 	 		"goodPrice"=>$saleinfo['sale_price'],
 	 		"mobile"=>$addr['mobile'],
@@ -314,6 +317,7 @@ class Filing extends Base
     		"workCode"=>"",
     		"khNo"=>"",
 	 		"tax"=>"",
+	 		"goodUnit"=>"",
 	 		"mobile"=>"",
 	 		"addr"=>"",
 	 		"addr_code"=>"",
@@ -333,6 +337,7 @@ class Filing extends Base
 //	 		"workCode|业务编号"=>"require|max:255|min:1",
 //	 		"khNo|客户公司编号"=>"require|max:255|min:1",
 	 		"mobile|联系人电话"=>"require|number|mobile",
+	 		"goodUnit|商品单位"=>"require|number|gt:0",
 	 		"contactor|联系人"=>"require|max:255|min:1",
 	 		"addr|收货地址"=>"require|max:255|min:1",
 	 		"addr_code|收货省市区"=>"require|max:255|min:1",
@@ -391,6 +396,7 @@ class Filing extends Base
 			"updatetime"=>date("Y-m-d H:i:s"),
 			];
 		$goodinfo =[
+			"good_unit"=>$param['goodUnit'],
 			"tax"=>$param['tax'],
 			"supplierNo"=>$param['supplierNo'],
 			"companyNo"=>$param['companyNo'],