1256

app/admin/controller/Allot.php

@@ -109,7 +109,7 @@ class Allot extends BaseController
                         ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
                         ->join("supplier n","n.code=v.supplierNo","left")
                         ->where(['c.wsm_code' => $wsm_out, 'good_type_code' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
-                        ->field("b.type_code,a.good_name,a.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name,n.code")->find();
+                        ->field("b.type_code,a.good_name,a.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
                    //var_dump(Db::name("good_type")->getLastSql());
                     if (empty($st)) {
                         Db::rollback();
@@ -147,6 +147,7 @@ class Allot extends BaseController
             return error_show(1002,"调拨编号不能为空");
         }
         $str = Db::name('allot_stock')->where(['id'=>$id,'is_del'=>0])->find();
+       // var_dump( Db::name('allot_stock')->getLastSql());
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }

app/admin/route/app.php

@@ -100,8 +100,8 @@ Route::rule('checkedit','admin/Check/edit');
 Route::rule('checkedell','admin/Check/dell');
 Route::rule('checkestatus','admin/Check/statu');
 
-Route::rule('versionlist','admin/Version/list');
-Route::rule('versioncreate','admin/Version/create');
+//Route::rule('veversioncreatersionlist','admin/Version/list');
+//Route::rule('','admin/Version/create');
 
 Route::rule('allotlist','admin/Allot/list');
 Route::rule('allotcreate','admin/Allot/create');