|
|
@@ -105,7 +105,7 @@ sql;
|
|
|
/** @var MaterialBox|\stdClass $box */
|
|
|
//$box = MaterialBox::query()->find($boxId);
|
|
|
//if (!$this->getBoxLocation($box->code))return false;
|
|
|
- if (StationTaskMaterialBox::query()->select(DB::raw(1))->where("status","!=",'完成')->where("material_box_id",$boxId)->first())return false;
|
|
|
+ if (StationTaskMaterialBox::query()->select(DB::raw(1))->whereNotIn("status",['完成','取消'])->where("material_box_id",$boxId)->first())return false;
|
|
|
return true;
|
|
|
}
|
|
|
}
|