diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php index 5a33b7df1..1053faeee 100644 --- a/app/admin/controller/warehouse_order/WarehouseOrderController.php +++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php @@ -74,10 +74,10 @@ class WarehouseOrderController extends BaseAdminController $warehouse_id = $this->request->post('warehouse_id'); $delivery_time = $this->request->post('delivery_time'); $mark = $this->request->post('mark'); - $order_type = $this->request->post('order_type', 1); + $type = $this->request->post('order_type', 1); Db::startTrans(); try { - if($order_type==1){ + if($type==1){ $code=getNewOrderId('TGY'); }else{ $code=getNewOrderId('BS'); @@ -104,7 +104,8 @@ class WarehouseOrderController extends BaseAdminController 'nums' => $arr['stock'], 'status' => 1, 'admin_id' => $this->adminId, - 'order_type' => $order_type, + 'type' => $type, + 'order_type' => 0, ]; $storeProduct = StoreProduct::where('id', $arr['id'])->find(); $data['total_price'] = bcmul($arr['stock'], $storeProduct['purchase'], 2); @@ -112,7 +113,7 @@ class WarehouseOrderController extends BaseAdminController $data['oid'] = $res['id']; $data['financial_pm'] = 0; $data['price'] = $storeProduct['price']; - WarehouseProductLogic::add($data); + WarehouseProductLogic::setOutbound($data); $finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]); }