1

app/Http/Controllers/Api/DwyController.php

@@ -941,7 +941,7 @@ class DwyController extends BaseController
         });
 //        list($status,$msg) = DwyService::getInstance()->setLimitForBoxOut($param);
 //        if(! $status) return ['status' => '201', 'data' => [],'msg'=> $msg];
-        $this->unusualRestock($data,$mac,$token);
+//        $this->unusualRestock($data,$mac,$token);
         if(empty($data))  return ['status' => '201', 'data' => $data,'msg'=>'无商标需要申领'];
         return ['status' => '200', 'data' => $data];
     }
@@ -1037,8 +1037,12 @@ class DwyController extends BaseController
             if (!isset($v['send_qty'])) $v['send_qty'] = 0;
             foreach ($list as $kk => $vv) {
                 if(!isset($vv['restock_qty'])) $vv['restock_qty'] = 0;
-                if($vv['restock_qty'] > 0)   return ['status' => '201','data'=>[], 'msg' => '不允许超出可领数量'];
+                if($vv['restock_qty'] > 0 && $vv['num'] > 0 )   return ['status' => '201','data'=>[], 'msg' => '不允许超出可领数量'];
                 if ($vv['num'] == 0 && $vv['restock_qty'] == 0) continue;
+                if($vv['num'] < 0) {
+                    $vv['num'] = $vv['restock_qty']+$vv['num'];
+                    $vv['restock_qty'] = 0;
+                }
                 if ($v['material_code_show'] === $vv['title']) {
                     $v['restore_qty'] = isset($vv['restock_qty']) && $vv['restock_qty'] > 0 ? $vv['restock_qty'] : 0;
                     if (($v['qty'] - $v['send_qty']) > $vv['num']) {
@@ -1103,7 +1107,7 @@ class DwyController extends BaseController
         });
 //        list($status,$msg) = DwyService::getInstance()->setLimitForBoxOut($param);
 //        if(! $status) return ['status' => '201', 'data' => [],'msg'=> $msg];
-        $this->unusualRestock1($data,$mac,$token);
+//        $this->unusualRestock1($data,$mac,$token);
         if(empty($data))  return ['status' => '201', 'data' => $data,'msg'=>'无商标需要申领'];
         return ['status' => '200', 'data' => $data];
     }

app/Model/SysConfig.php

@@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 class SysConfig extends Model
 {
-    protected $table = "sysconig"; //指定表
+    protected $table = "sysconfig"; //指定表
     const CREATED_AT = null;
     const UPDATED_AT = null;
     protected $dateFormat = 'U';