瀏覽代碼

提交信息

lvhao 1 天之前
父節點
當前提交
d5203e2373
共有 2 個文件被更改,包括 12 次插入3 次删除
  1. 6 1
      core/CoreApp/controllers/Systemprint.php
  2. 6 2
      template/erp/systemprint_fhd.html

+ 6 - 1
core/CoreApp/controllers/Systemprint.php

@@ -2695,7 +2695,12 @@ class Systemprint extends Start_Controller {
 			if(!empty($info['waybill'])&&!empty($info['waybill'])){
 				$yd = base_url()."data/pdf/".date('Ymd',$info['printtime']).'/y-'.$info['waybill'].'.pdf' ;
 				if(file_exists("./data/pdf/".date('Ymd',$info['printtime']).'/y-'.$info['waybill'].'.pdf')){
-					$text = array('yd'=>$yd,'mode'=>100);
+					if(!in_array($info['express'],[76,77])){
+						$text = array('yd'=>$yd,'mode'=>100,'type'=>8);
+					}else{
+						$text = array('yd'=>$yd,'mode'=>100,'type'=>1);
+					}
+					
 					$this->logic_ding->sendToDing($info['number']."扫面发货单补发运单的text".json_encode($text,JSON_UNESCAPED_UNICODE));
 					echo json_encode([
 						'code'=>1,

+ 6 - 2
template/erp/systemprint_fhd.html

@@ -93,8 +93,12 @@ $("#scannumber").on("keypress",function(event){
                 console.log(c.msg)
                 $("#scannumber").focus();
                 if (c.code == 1) {
-                        
-                    wprinter.ydpdf(c.data);
+                    if(c.data.type == 8){
+                        wprinter.sbydpdf(c.data);
+                    }else{
+                        wprinter.ydpdf(c.data);
+                    }    
+                  
                     $(".systemwindow").hide();
                 }else if(c.code == 2){
                     $("#music_c")[0].play();