From 400d8c1f9358269d36dd0745a427d073665f9cc5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 29 May 2024 11:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=88=90=E5=8A=9F=E6=97=B6=E8=BF=94=E5=9B=9E=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BA=86=E5=95=86=E5=93=81=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/retail/CashierclassController.php    | 2 +-
 app/admin/lists/retail/CashierinfoLists.php               | 4 ++--
 app/api/controller/operation/OpurchaseclassController.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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) {