Browse Source

Merge branch 'wugg-dev' of wugg/phpstock into version1.5

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

+ 11 - 11
app/admin/controller/Filing.php

@@ -117,7 +117,7 @@ class Filing extends Base
 			"platform_id"=>0,
 			"good_code"=>$goodCode,
 			"skuCode"=>'',
-			"cat_id"=>$param['cat'],
+			"cat_id"=>$param['cat_id'],
 			"good_name"=>$param['goodName'],
 			"good_num"=>$param['goodNum'],
 			"good_type"=>1,
@@ -129,10 +129,10 @@ class Filing extends Base
 			"is_activity"=>0,
 			"activity_code"=>'',
 			"is_stock"=>0,
-			"arrive_time"=>$param['send_time'],
+			"arrive_time"=>$param['sendtime'],
 			"customer_code"=>$param['khNo'],
 			"supplierNo"=>$param['companyNo'],
-			"platform_order"=>$param['poNo'],
+			"platform_order"=>$param['poCode'],
 			"send_num"=>$param['goodNum'],
 			"wsend_num"=>0,
 			"send_status"=>3,
@@ -140,7 +140,7 @@ class Filing extends Base
 			"status"=>2,
 			"is_del"=>0,
 			"pay_id"=>$param['pay_id'],
-			"workNo"=>$param['workNo'],
+			"workNo"=>$param['workCode'],
 			"addtime"=>date("Y-m-d H:i:s"),
 			"updatetime"=>date("Y-m-d H:i:s"),
 			"cgderid"=>$param['buyerid'],
@@ -222,7 +222,7 @@ class Filing extends Base
 			"addr_code"=>$param['addr_code'],
 			"contactor"=>$param['contactor'],
 			"mobile"=>$param['mobile'],
-			"arrive_time"=>$param['send_time'],
+			"arrive_time"=>$param['sendtime'],
 			"customer_code"=>$param['khNo'],
 			"receipt_quantity"=>$param['goodNum'],
 			"addtime"=>date("Y-m-d H:i:s"),
@@ -356,17 +356,17 @@ class Filing extends Base
     	->findOrEmpty();
     	if(empty($cgd)) return error_show(1004,"采购单不存在");
 		$good =Db::name("good_zixun")->where(["spuCode"=>$saleinfo['good_code']])->findOrEmpty();
-		if(empty($goodinfo)) return error_show(1004,"商品信息不存在");
+		if(empty($good)) return error_show(1004,"商品信息不存在");
 		$addr =Db::name("order_addr")->where(["orderCode"=>$param['orderCode']])->findOrEmpty();
 		if(empty($addr)) return error_show(1004,"地址信息不存在");
 		$cgdPrice= round( $saleinfo['sale_price']*(1-$param['cgd_tax']),2);
 		$qrddata=[
 			"origin_price"=>$cgdPrice,
-			"arrive_time"=>$param['send_time'],
+			"arrive_time"=>$param['sendtime'],
 			"customer_code"=>$param['khNo'],
 			"supplierNo"=>$param['companyNo'],
-			"platform_order"=>$param['poNo'],
-			"workNo"=>$param['workNo'],
+			"platform_order"=>$param['poCode'],
+			"workNo"=>$param['workCode'],
 			"updatetime"=>date("Y-m-d H:i:s"),
 			"cgderid"=>$param['buyerid'],
 			"cgder"=>$param['buyer_name']
@@ -392,7 +392,7 @@ class Filing extends Base
 			"addr_code"=>$param['addr_code'],
 			"contactor"=>$param['contactor'],
 			"mobile"=>$param['mobile'],
-			"arrive_time"=>$param['send_time'],
+			"arrive_time"=>$param['sendtime'],
 			"customer_code"=>$param['khNo'],
 			"updatetime"=>date("Y-m-d H:i:s"),
 			];
@@ -404,7 +404,7 @@ class Filing extends Base
 			if($qrd==false) throw new Exception("采购单更新失败");
 			$qrd =Db::name("good_zixun")->where($good)->update($goodinfo);
 			if($qrd==false) throw new Exception("商品信息更新失败");
-			$qrd =Db::name("order_addr")->where($addr)->insert($orderAddr);
+			$qrd =Db::name("order_addr")->where($addr)->update($orderAddr);
 			if($qrd==false) throw new Exception("销售单地址更新失败");
 			Db::commit();
 			return app_show(0,'订单更新成功');