|
|
@@ -35,9 +35,9 @@ class MaterialBoxService
|
|
|
$boxes = MaterialBox::query()->select('id',"code")
|
|
|
->whereNotIn("id",$blacklist)
|
|
|
->where("id",">",$id)->where("code","like","IDE%")
|
|
|
- ->where("status",4)->limit(10)->orderBy("id")
|
|
|
+ ->where("status",4)->limit(50)->orderBy("id")
|
|
|
->whereNotIn("id",StationTaskMaterialBox::query()->select("material_box_id")
|
|
|
- ->where("status","!=","已完成")->groupBy("material_box_id"));
|
|
|
+ ->where("status","!=","完成")->groupBy("material_box_id"));
|
|
|
if ($modelId)$boxes->where("material_box_model_id",$modelId);
|
|
|
$boxes = $boxes->get();
|
|
|
if ($boxes->count()==0)break;
|