|
|
@@ -109,14 +109,14 @@ class Resign extends BaseController
|
|
|
if($token==""){
|
|
|
return error_show(101,'token不能为空');
|
|
|
}
|
|
|
- $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
|
|
|
- if($customer==""){
|
|
|
- return error_show(1004,"参数customer_code不能为空");
|
|
|
- }
|
|
|
- $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
|
|
|
- if($supplier==""){
|
|
|
- return error_show(1004,"参数supplier_code不能为空");
|
|
|
- }
|
|
|
+// $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
|
|
|
+// if($customer==""){
|
|
|
+// return error_show(1004,"参数customer_code不能为空");
|
|
|
+// }
|
|
|
+// $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
|
|
|
+// if($supplier==""){
|
|
|
+// return error_show(1004,"参数supplier_code不能为空");
|
|
|
+// }
|
|
|
$good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
|
|
|
if($good_code==""){
|
|
|
return error_show(1004,"参数good_code不能为空");
|
|
|
@@ -133,7 +133,7 @@ class Resign extends BaseController
|
|
|
if($mark==""){
|
|
|
return error_show(1004,"参数remark不能为空");
|
|
|
}
|
|
|
- $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
|
|
|
+ $good =Db::name("good")->alias("a")->leftJoin("good_platform b","a.spuCod=b.spuCode")->where([["b.skuCode","=",
|
|
|
$good_code],["a.is_del","=",0]])->find();
|
|
|
if($good==false){
|
|
|
return error_show(1004,"未找到商品数据");
|
|
|
@@ -154,8 +154,8 @@ class Resign extends BaseController
|
|
|
"good_num"=>$good_num,
|
|
|
"skuCode"=>$good['skuCode'],
|
|
|
"wsm_code"=>'',
|
|
|
- "companyNo"=>$customer,
|
|
|
- "supplierNo"=>$supplier,
|
|
|
+ "companyNo"=>$good['companyNo'],
|
|
|
+ "supplierNo"=>$good['supplierNo'],
|
|
|
"file_url"=>$file_url,
|
|
|
"lasttime"=>$lastime,
|
|
|
"status"=>1,
|
