ad

app/admin/controller/Base.php

@@ -122,7 +122,7 @@ class Base extends \app\BaseController
 	 * @return mixed|string
 	* @throws \think\Exception
 	 */
-    public function CheckGood($good,$isZx,$thNo=''){
+    public function CheckGoodZx($good,$isZx,$thNo=''){
   	    $spuCode= makeNo("SKU");
   	    //查询是否存在转库存品记录 存在则返回库存编号
   	    $newCode= Db::name("good_change_log")->where(["oldCode"=>$good['spuCode']])->value("newCode",'');

app/admin/controller/Orderback.php

@@ -450,7 +450,7 @@ class Orderback extends Base
 		          $goon = Db::name('good_basic')->where(['spuCode' => $sale['good_code']])->find();
 		          $isZx=2;
 		      }
-              $spuCode = $this->CheckGood($goon,$isZx,$param['thNo']);
+              $spuCode = $this->CheckGoodZx($goon,$isZx,$param['thNo']);
             }
             $out =Db::name("order_out")->where(['outCode'=>$info['outCode']])->find();
             if($out==false){

app/admin/controller/Reorder.php

@@ -942,7 +942,7 @@ class Reorder extends Base
 						          $goon = Db::name('good_basic')->where(['spuCode' => $orderinfo['good_code']])->find();
 						          $isZx=2;
 						      }
-				              $spuCode = $this->CheckGood($goon,$isZx,$code);
+				              $spuCode = $this->CheckGoodZx($goon,$isZx,$code);
                                 $wsmcode = $info['return_wsm'];
 		                        if ($wsmcode == "") {
 		                            Db::rollback();