diff --git a/app/admin/controller/retail/CashierclassController.php b/app/admin/controller/retail/CashierclassController.php index d5ce524..d9b9e87 100644 --- a/app/admin/controller/retail/CashierclassController.php +++ b/app/admin/controller/retail/CashierclassController.php @@ -120,7 +120,7 @@ class CashierclassController extends BaseAdminController if ($id) { $res = Cashierclass::where('id', $id)->update(['is_print' => 1]); if ($res) { - return $this->success('设置成功', [], 1, 1); + return $this->success('设置成功'); } } return $this->success('设置失败'); diff --git a/app/admin/lists/retail/CashierinfoLists.php b/app/admin/lists/retail/CashierinfoLists.php index 913d1ff..c7256f5 100644 --- a/app/admin/lists/retail/CashierinfoLists.php +++ b/app/admin/lists/retail/CashierinfoLists.php @@ -54,8 +54,8 @@ class CashierinfoLists extends BaseAdminDataLists implements ListsSearchInterfac $cashier = Cashierclass::field('number')->where('id',$data['pid'])->findOrEmpty(); $room = Db::name('room')->where('id',$data['room'])->find(); $warehouse = Warehouse::field('name')->where('id',$data['warehouse'])->findOrEmpty(); - $unit=Db::name('unit')->where('id',$data['unit'])->value('name'); - $goods = Goods::field('name,imgs')->where('id',$data['goods'])->findOrEmpty(); + $goods = Goods::field('name,imgs,unit')->where('id',$data['goods'])->findOrEmpty(); + $unit=Db::name('unit')->where('id',$goods['unit'])->value('name'); $data['cashier_number'] = !$cashier->isEmpty() ? $cashier['number'] : ''; $data['room_data'] = !empty($room) ? $room : []; $data['warehouse_name'] = !$warehouse->isEmpty() ? $warehouse['name'] : ''; diff --git a/app/api/controller/operation/OpurchaseclassController.php b/app/api/controller/operation/OpurchaseclassController.php index ed72d18..0984ab0 100644 --- a/app/api/controller/operation/OpurchaseclassController.php +++ b/app/api/controller/operation/OpurchaseclassController.php @@ -46,7 +46,7 @@ class OpurchaseclassController extends BaseApiController $data = [ 'delivery_name' => $delivery_name, 'delivery_id' => $delivery_id, - 'supplier_id'=>$delivery_id, + 'supplier_id'=>$supplier_id, ]; $res = OpurchaseGoodsOfferLogic::express($data); if (true === $res) {