25698

app/admin/controller/Allot.php

@@ -147,13 +147,13 @@ class Allot extends BaseController
                         $temp['addtime'] = date("Y-m-d H:i:s");
                         $temp['updatetime'] = date("Y-m-d H:i:s");
                         $dm[]=$temp;
-                        $io = Db::name('allot_info')->insertAll($dm);
-                       //var_dump(Db::name('allot_info')->getLastSql());
-                        if ($io) {
-                            DB::commit();
-                            return error_show(0, "调拨创建成功");
-                        }
                     }
+                $io = Db::name('allot_info')->insertAll($dm);
+                //var_dump(Db::name('allot_info')->getLastSql());
+                if ($io) {
+                    DB::commit();
+                    return error_show(0, "调拨创建成功");
+                }
             }
             Db::rollback();
             return error_show(1002,"调拨创建失败");
@@ -171,12 +171,29 @@ class Allot extends BaseController
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }
-        $stv = Db::name('warehouse_info')->where(['supplierNo'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code')->find();
-        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code')->find();
-        $st = Db::name('warehouse_info')->where(['supplierNo'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code')->find();
+        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        if(empty($stv)){
+            return error_show(1002,"未找到仓库数据");
+        }
+        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
+        if(empty($vr)){
+            return error_show(1001,"未找到供应商数据");
+        }
+        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        if(empty($st)){
+            return error_show(1003,"未找到仓库数据");
+        }
         $var = Db::name('supplier')->where(['code'=>$st['supplierNo'],'is_del'=>0])->field('name,code')->find();
+        if(empty($var)){
+            return error_show(1004,"未找到供应商数据");
+        }
+        // var_dump(Db::name('supplier')->getLastSql());
         $str ['wsm_out_name']=$vr['name'];
         $str ['wsm_in_name']=$var['name'];
+        $str ['ckc_name']=$stv['name'];
+        $str ['ckr_name']=$st['name'];
+        $str['out_code']=$vr['rcode'];
+        $str['in_code']=$var['code'];
 //        $str = Db::name('allot_stock')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_out","left")
 //            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,")
 //            ->where(['a.id'=>$id,'a.is_del'=>0])->find();