diff --git a/app/Constants/Admin/DepotCode.php b/app/Constants/Admin/DepotCode.php index e986136..e8ef12c 100644 --- a/app/Constants/Admin/DepotCode.php +++ b/app/Constants/Admin/DepotCode.php @@ -14,4 +14,11 @@ class DepotCode extends AbstractConstants const int IS_NO_DEL = 1; const int IS_DEL = 2; + + /*** + * @var int 1=已入库 2=已出库 + */ + const INT INPUT = 1; + + const INT OUTPUT = 2; } \ No newline at end of file diff --git a/app/Model/DepotPurchase.php b/app/Model/DepotPurchase.php index c943923..666a2da 100644 --- a/app/Model/DepotPurchase.php +++ b/app/Model/DepotPurchase.php @@ -16,6 +16,7 @@ use Hyperf\DbConnection\Model\Model; * @property string $purchase_price * @property string $number * @property string $sum_price + * @property int $status * @property int $city_id * @property int $kitchen_id * @property int $operator_id @@ -38,7 +39,7 @@ class DepotPurchase extends Model /** * The attributes that should be cast to native types. */ - protected array $casts = ['id' => 'integer', 'depot_id' => 'integer', 'material_id' => 'integer', 'supplier_id' => 'integer', 'type' => 'integer', 'city_id' => 'integer', 'kitchen_id' => 'integer', 'operator_id' => 'integer', 'is_del' => 'integer']; + protected array $casts = ['id' => 'integer', 'depot_id' => 'integer', 'material_id' => 'integer', 'supplier_id' => 'integer', 'type' => 'integer', 'status' => 'integer', 'city_id' => 'integer', 'kitchen_id' => 'integer', 'operator_id' => 'integer', 'is_del' => 'integer']; const CREATED_AT = 'create_time'; diff --git a/app/Service/Admin/Depot/DepotService.php b/app/Service/Admin/Depot/DepotService.php index 440c420..0a9c694 100644 --- a/app/Service/Admin/Depot/DepotService.php +++ b/app/Service/Admin/Depot/DepotService.php @@ -173,6 +173,7 @@ class DepotService extends BaseService{ $depotPurchase->purchase_price = $purchase_price; $depotPurchase->number = $number; $depotPurchase->sum_price = $sum_price; + $depotPurchase->status = DepotCode::INPUT; $depotPurchase->city_id = $cityId; $depotPurchase->kitchen_id = $kitchenId; $depotPurchase->operator_id = $this->adminId; @@ -233,6 +234,7 @@ class DepotService extends BaseService{ $id = (int)$this->request->input('id'); // $number = (double)$this->request->input('number'); $info = $this->DepotPurchaseModel->getDepotPurchase($id); + $info->status = DepotCode::OUTPUT; if (!empty($info)){ $depotPurchase = new DepotPurchase(); $depotPurchase->depot_id = $info->depot_id; @@ -270,7 +272,7 @@ class DepotService extends BaseService{ $materialStock->current_stock = $materialStock->current_stock - $depotPurchase->number; } - if (!$depotPurchase->save() || !$materialStock->save()) throw new ErrException('采购退货失败'); + if (!$depotPurchase->save() || !$materialStock->save() || !$info->save()) throw new ErrException('采购退货异常'); return $this->return->success(); }