Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Service/DwyService.php

app/Service/DwyService.php

@@ -314,6 +314,28 @@ class DwyService extends Service
 
     }
 
+    //限制领标
+    public function setLimitForBoxOut($data){
+        if(empty($data['token']) || empty($data['list']) || empty($data['mac'])) return [false, '缺少必要参数,操作失败'];
+
+        foreach ($data['list'] as $value){
+            $key = $data['mac'] . $value['order_item_id'] . hash('md5', $value['title']);
+            $bool = $this->limitingSendRequestBackg($key, $value['num'], 3600);
+            if(! $bool) return [false, '同一产品相同商标限制同时操作，请稍后操作！'];
+        }
+
+        return [true, ''];
+    }
+
+    //删除限制领标
+    public function delLimitForBoxOut($data){
+        if(empty($data['device_code']) || empty($data['material_list'])) return ;
+
+        foreach ($data['material_list'] as $value){
+            $key = $data['device_code'] . $value['order_item_id'] . hash('md5', $value['material_code_show']);
+            $this->dellimitingSendRequestBackg($key);
+        }
+    }
 
     public function post_helper($url, $data, $auth)
     {