mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修改打印功能，提供更详细的错误信息，并开放打印功能给已打印记录

Browse Source
This commit is contained in:
mkm 2024-05-30 16:15:38 +08:00
parent cae70f13aa
commit 9c1d2dd62e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/retail/CashierclassController.php
View File

@ -144,7 +144,7 @@ class CashierclassController extends BaseAdminController
}else{ }else{
$res=CashierclassLogic::prints($id); $res=CashierclassLogic::prints($id);
if(CashierclassLogic::hasError()){ if(CashierclassLogic::hasError()){
return $this->fail('打印失败'); return $this->fail(CashierclassLogic::getError());
}else{ }else{
return $this->success('ok',$res); return $this->success('ok',$res);
} }

2
app/admin/logic/retail/CashierclassLogic.php
View File

@ -170,7 +170,7 @@ class CashierclassLogic extends BaseLogic
* 打印 * 打印
*/ */
public static function prints($id){ public static function prints($id){
$find = Cashierclass::where('id', $id)->where('is_print',0)->field('id,merchant,real_name,user_phone,user_address,uid,number,total,actual,create_time')->find(); $find = Cashierclass::where('id', $id)->field('id,merchant,real_name,user_phone,user_address,uid,number,total,actual,create_time')->find();
if ($find) { if ($find) {
$merchant = Merchant::where('mer_id', $find['merchant'])->field('mer_name,uid,service_phone')->find(); $merchant = Merchant::where('mer_id', $find['merchant'])->field('mer_name,uid,service_phone')->find();
$mer_user_info = User::where('id', $merchant['uid'])->field('real_name,mobile')->find(); $mer_user_info = User::where('id', $merchant['uid'])->field('real_name,mobile')->find();