fix:depot

This commit is contained in:
LAPTOP-7SGDREK0\shiweijun
2025-02-28 09:59:04 +08:00
parent 01d70dd374
commit b139ea8db4

View File

@@ -594,63 +594,72 @@ class DepotService extends BaseService{
public function recycle():array public function recycle():array
{ {
$materialId = (int)$this->request->input('material_id'); Db::beginTransaction();
$supplierId = (int)$this->request->input('supplier_id'); try {
$number = (double)$this->request->input('number'); $materialId = (int)$this->request->input('material_id');
$saleId = (int)$this->request->input('sale_id'); $supplierId = (int)$this->request->input('supplier_id');
$cityId = (int)$this->request->input('city_id'); $number = (double)$this->request->input('number');
$kitchenId = (int)$this->request->input('kitchen_id'); $saleId = (int)$this->request->input('sale_id');
$depotInfo = $this->DepotModel $cityId = (int)$this->request->input('city_id');
->getInfoByName('回收仓库',$kitchenId); $kitchenId = (int)$this->request->input('kitchen_id');
if (empty($depotInfo)) $depotInfo = $this->DepotModel
throw new ErrException('未创建回收仓库'); ->getInfoByName('回收仓库',$kitchenId);
else if (empty($depotInfo))
$depotId = $depotInfo->id; throw new ErrException('未创建回收仓库');
else
$depotId = $depotInfo->id;
if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId) if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId)
throw new ErrException('该角色没有权限'); throw new ErrException('该角色没有权限');
$saleInfo = $this->DepotSaleModel $saleInfo = $this->DepotSaleModel
->where('is_del',MaterialCode::IS_NO_DEL) ->where('is_del',MaterialCode::IS_NO_DEL)
->where('id',$saleId) ->where('id',$saleId)
->first(); ->first();
$saleInfo->back_number = $saleInfo->back_number + $number; $saleInfo->back_number = $saleInfo->back_number + $number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number); $saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
if ($saleInfo->back_number > $saleInfo->number) if ($saleInfo->back_number > $saleInfo->number)
throw new ErrException('回收数量不能大于出库数量'); throw new ErrException('回收数量不能大于出库数量');
$materialStock = $this->MaterialStockModel $materialStock = $this->MaterialStockModel
->where('material_id',$materialId) ->where('material_id',$materialId)
->where('depot_id',$depotId) ->where('depot_id',$depotId)
->where('supplier_id',$supplierId) ->where('supplier_id',$supplierId)
->first(); ->first();
$depotRecycle = new DepotRecycle(); $depotRecycle = new DepotRecycle();
$depotRecycle->depot_id = $depotId; $depotRecycle->depot_id = $depotId;
$depotRecycle->material_id = $materialId; $depotRecycle->material_id = $materialId;
$depotRecycle->supplier_id = $supplierId; $depotRecycle->supplier_id = $supplierId;
$depotRecycle->recycle_price = $saleInfo->sale_price; $depotRecycle->recycle_price = $saleInfo->sale_price;
$depotRecycle->number = $number; $depotRecycle->number = $number;
$depotRecycle->sum_price = $saleInfo->sale_price * $number; $depotRecycle->sum_price = $saleInfo->sale_price * $number;
$depotRecycle->sale_id = $saleId; $depotRecycle->sale_id = $saleId;
$depotRecycle->status = MaterialCode::AUDITED; $depotRecycle->status = MaterialCode::AUDITED;
$depotRecycle->city_id = $cityId; $depotRecycle->city_id = $cityId;
$depotRecycle->kitchen_id = $kitchenId; $depotRecycle->kitchen_id = $kitchenId;
$depotRecycle->operator_id = $this->adminId; $depotRecycle->operator_id = $this->adminId;
if (empty($materialStock)){ if (empty($materialStock)){
$materialStock = new MaterialStock(); $materialStock = new MaterialStock();
$materialStock->depot_id = $depotId; $materialStock->depot_id = $depotId;
$materialStock->material_id = $materialId; $materialStock->material_id = $materialId;
$materialStock->supplier_id = $supplierId; $materialStock->supplier_id = $supplierId;
$materialStock->current_stock = $number; $materialStock->current_stock = $number;
$materialStock->unit_price = $depotRecycle->recycle_price; $materialStock->unit_price = $depotRecycle->recycle_price;
}
else
$materialStock->current_stock = $materialStock->current_stock + $number;
if (!$saleInfo->save() || !$depotRecycle->save() || !$materialStock->save()) throw new ErrException('回收发生异常');
DB::commit();
} catch (ErrException $error) {
Db::rollBack();
throw new ErrException($error->getMessage());
} }
else
$materialStock->current_stock = $materialStock->current_stock + $number;
if (!$saleInfo->save() || !$depotRecycle->save() || !$materialStock->save()) throw new ErrException('回收发生异常');
return $this->return->success(); return $this->return->success();
@@ -658,39 +667,46 @@ class DepotService extends BaseService{
public function recycleUpdate():array public function recycleUpdate():array
{ {
$id = (int)$this->request->input('id'); Db::beginTransaction();
$number = (double)$this->request->input('number'); try {
$id = (int)$this->request->input('id');
$number = (double)$this->request->input('number');
if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId) if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId)
throw new ErrException('该角色没有权限'); throw new ErrException('该角色没有权限');
$info = $this->DepotRecycleModel $info = $this->DepotRecycleModel
->where('id',$id) ->where('id',$id)
->first(); ->first();
$old_number = $info->number; $old_number = $info->number;
$sum_price = $info->recycle_price * $number; $sum_price = $info->recycle_price * $number;
$info->number = $number; $info->number = $number;
$info->sum_price = $sum_price; $info->sum_price = $sum_price;
$materialStock = $this->MaterialStockModel $materialStock = $this->MaterialStockModel
->where('material_id',$info->material_id) ->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id) ->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id) ->where('supplier_id',$info->supplier_id)
->first(); ->first();
$materialStock->current_stock = $materialStock->current_stock + $number - $old_number; $materialStock->current_stock = $materialStock->current_stock + $number - $old_number;
$saleInfo = $this->DepotSaleModel $saleInfo = $this->DepotSaleModel
->where('id',$info->sale_id) ->where('id',$info->sale_id)
->first(); ->first();
$saleInfo->back_number = $saleInfo->back_number + $number - $old_number; $saleInfo->back_number = $saleInfo->back_number + $number - $old_number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number); $saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
if ($saleInfo->back_number > $saleInfo->number) if ($saleInfo->back_number > $saleInfo->number)
throw new ErrException('回收数量不能大于出库数量'); throw new ErrException('回收数量不能大于出库数量');
if (!$info->save() || !$materialStock->save() || !$saleInfo->save()) throw new ErrException('商品回收数量修改失败'); if (!$info->save() || !$materialStock->save() || !$saleInfo->save()) throw new ErrException('商品回收数量修改失败');
DB::commit();
} catch (ErrException $error) {
Db::rollBack();
throw new ErrException($error->getMessage());
}
return $this->return->success(); return $this->return->success();
@@ -698,39 +714,47 @@ class DepotService extends BaseService{
public function recycleDelete():array public function recycleDelete():array
{ {
$id = (int)$this->request->input('id'); Db::beginTransaction();
try {
$id = (int)$this->request->input('id');
if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId) if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId)
throw new ErrException('该角色没有权限'); throw new ErrException('该角色没有权限');
$info = $this->DepotRecycleModel $info = $this->DepotRecycleModel
->where('id',$id) ->where('id',$id)
->first(); ->first();
if ($info->status == MaterialCode::AUDITED){ if ($info->status == MaterialCode::AUDITED){
throw new ErrException('该回收已审核通过'); throw new ErrException('该回收已审核通过');
}
$info->is_del = MaterialCode::IS_DEL;
$materialStock = $this->MaterialStockModel
->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id)
->first();
$materialStock->current_stock = $materialStock->current_stock - $info->number;
$saleInfo = $this->DepotSaleModel
->where('id',$info->sale_id)
->first();
$saleInfo->back_number = $saleInfo->back_number - $info->number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
if (!$info->save() || !$materialStock->save() || !$saleInfo->save())
throw new ErrException('商品回收删除失败');
DB::commit();
} catch (ErrException $error) {
Db::rollBack();
throw new ErrException($error->getMessage());
} }
$info->is_del = MaterialCode::IS_DEL;
$materialStock = $this->MaterialStockModel
->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id)
->first();
$materialStock->current_stock = $materialStock->current_stock - $info->number;
$saleInfo = $this->DepotSaleModel
->where('id',$info->sale_id)
->first();
$saleInfo->back_number = $saleInfo->back_number - $info->number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
if (!$info->save() || !$materialStock->save() || !$saleInfo->save())
throw new ErrException('商品回收删除失败');
return $this->return->success(); return $this->return->success();
} }
@@ -763,76 +787,84 @@ class DepotService extends BaseService{
public function recycleAudit():array public function recycleAudit():array
{ {
$id = (int)$this->request->input('id'); Db::beginTransaction();
$status = (int)$this->request->input('status'); try {
$id = (int)$this->request->input('id');
$status = (int)$this->request->input('status');
if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId) if (RoleCode::WAREHOUSE != $this->roleId && RoleCode::SUPER_ADMIN != $this->roleId && RoleCode::ADMIN != $this->roleId)
throw new ErrException('该角色没有权限'); throw new ErrException('该角色没有权限');
$info = $this->DepotRecycleModel $info = $this->DepotRecycleModel
->where('id',$id) ->where('id',$id)
->first(); ->first();
if ($info->status != MaterialCode::AUDITED){ if ($info->status != MaterialCode::AUDITED){
if ($status == MaterialCode::AUDITED){ if ($status == MaterialCode::AUDITED){
$saleInfo = $this->DepotSaleModel $saleInfo = $this->DepotSaleModel
->where('is_del',MaterialCode::IS_NO_DEL) ->where('is_del',MaterialCode::IS_NO_DEL)
->where('id',$info->sale_id) ->where('id',$info->sale_id)
->first(); ->first();
if (empty($saleInfo)){
throw new ErrException('无出库记录');
}
$saleInfo->back_number = $saleInfo->back_number + $info->number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
$materialStock = $this->MaterialStockModel
->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id)
->first();
if (empty($materialStock)){
$materialStock = new MaterialStock();
$materialStock->depot_id = $info->depotId;
$materialStock->material_id = $info->materialId;
$materialStock->supplier_id = $info->supplierId;
$materialStock->current_stock = $info->number;
$materialStock->unit_price = $info->recycle_price;
}
else
$materialStock->current_stock = $materialStock->current_stock + $info->number;
if (!$materialStock->save() || !$saleInfo->save()) throw new ErrException('回收审核异常');
if (empty($saleInfo)){
throw new ErrException('无出库记录');
} }
}
if ($info->status == MaterialCode::AUDITED){
if ($status == MaterialCode::UN_AUDIT || $status == MaterialCode::AUDIT_REFUSE){
$materialStock = $this->MaterialStockModel
->where('is_del',MaterialCode::IS_NO_DEL)
->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id)
->first();
$saleInfo->back_number = $saleInfo->back_number + $info->number; $materialStock->current_stock = $materialStock->current_stock - $info->number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
$materialStock = $this->MaterialStockModel $saleInfo = $this->DepotSaleModel
->where('material_id',$info->material_id) ->where('id',$info->sale_id)
->where('depot_id',$info->depot_id) ->first();
->where('supplier_id',$info->supplier_id)
->first();
if (empty($materialStock)){ $saleInfo->back_number = $saleInfo->back_number - $info->number;
$materialStock = new MaterialStock(); $saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
$materialStock->depot_id = $info->depotId;
$materialStock->material_id = $info->materialId; if (!$materialStock->save() || !$saleInfo->save()) throw new ErrException('回收审核异常');
$materialStock->supplier_id = $info->supplierId;
$materialStock->current_stock = $info->number;
$materialStock->unit_price = $info->recycle_price;
} }
else
$materialStock->current_stock = $materialStock->current_stock + $info->number;
if (!$materialStock->save() || !$saleInfo->save()) throw new ErrException('回收审核异常');
} }
$info->status = $status;
if (!$info->save()) throw new ErrException('回收审核异常');
DB::commit();
} catch (ErrException $error) {
Db::rollBack();
throw new ErrException($error->getMessage());
} }
if ($info->status == MaterialCode::AUDITED){
if ($status == MaterialCode::UN_AUDIT || $status == MaterialCode::AUDIT_REFUSE){
$materialStock = $this->MaterialStockModel
->where('is_del',MaterialCode::IS_NO_DEL)
->where('material_id',$info->material_id)
->where('depot_id',$info->depot_id)
->where('supplier_id',$info->supplier_id)
->first();
$materialStock->current_stock = $materialStock->current_stock - $info->number;
$saleInfo = $this->DepotSaleModel
->where('id',$info->sale_id)
->first();
$saleInfo->back_number = $saleInfo->back_number - $info->number;
$saleInfo->sum_price = $saleInfo->sale_price * ($saleInfo->number - $saleInfo->back_number);
if (!$materialStock->save() || !$saleInfo->save()) throw new ErrException('回收审核异常');
}
}
$info->status = $status;
if (!$info->save()) throw new ErrException('回收审核异常');
return $this->return->success(); return $this->return->success();