|
@@ -147,6 +147,7 @@ class PurchaseOrderService extends Service
|
|
|
if(empty($order)) return [false, '采购订单不存在或已被删除'];
|
|
|
$order = $order->toArray();
|
|
|
$order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
|
|
|
+ $order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
|
|
|
$order['state_title'] = PurchaseOrder::$name[$order['state']] ?? '';
|
|
|
$sales = SalesOrder::where('id',$order['sales_order_id'])->value('order_number');
|
|
|
$order['sales_order_number'] = $sales;
|
|
@@ -173,10 +174,10 @@ class PurchaseOrderService extends Service
|
|
|
*/
|
|
|
public function del($data){
|
|
|
if($this->isEmpty($data,'order_number')) return [false,'请选择数据!'];
|
|
|
-
|
|
|
- $bool = PurchaseOrder::where('order_number',$data['order_number'])
|
|
|
- ->where('state','>',PurchaseOrder::STATE_ZERO)->exists();
|
|
|
- if($bool) return [false,'采购订单已审核,删除失败!'];
|
|
|
+ $order = PurchaseOrder::where('del_time',0)->where('order_number',$data['order_number'])->first();
|
|
|
+ if(empty($order)) return [false,'采购单不存在或已被删除'];
|
|
|
+ $order = $order->toArray();
|
|
|
+ if($order['state'] > PurchaseOrder::STATE_ZERO) return [false,'请确认采购订单状态,删除失败!'];
|
|
|
|
|
|
try{
|
|
|
DB::beginTransaction();
|