首页 发现 帮助
登录
chengwenliang
/
erp
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

昨晚usps和cne临时调整

longyi 8 月之前
父节点
7dd81cb66b
当前提交
654caa789e
共有 6 个文件被更改，包括 151 次插入 和 150 次删除
合并视图 显示文件统计
  1. 2 2
      core/CoreApp/controllers/Aatest.php
  2. 1 1
      core/CoreApp/controllers/Ac.php
  3. 11 10
      core/CoreApp/controllers/Systemprint.php
  4. 1 1
      core/CoreApp/models/Model_cne.php
  5. 4 4
      core/CoreApp/models/Model_usps.php
  6. 132 132
      template/erp/systemprint.html

+ 2 - 2
core/CoreApp/controllers/Aatest.php
查看文件 

@@ -89,8 +89,8 @@ class Aatest extends Start_Controller {
 
 		// die;
 
 		// die;
 
 		// die;
 
 		// die;
 
 		
 		
-		$list = $this->fullorder->find_all("waybill = 9200190251001335252684");
 
-		$v = $list['0'];
 
+		$list = $this->fullorder->get_waybill("9205590251001335253257");
 
+		$v = $list;
 
 		@$fs = $this->usps->get_logistics($v);
 
 		@$fs = $this->usps->get_logistics($v);
 
 		$csck[] = array($v['number'],$fs['f'],$fs['content']);
 
 		$csck[] = array($v['number'],$fs['f'],$fs['content']);
 
 		if(!isset($fs['f']))
 
 		if(!isset($fs['f']))

+ 1 - 1
core/CoreApp/controllers/Ac.php
查看文件 

@@ -222,7 +222,7 @@ class Ac extends Start_Controller {
 
 // 		$b  = $this->cne->get_data($fullorder);
 
 // 		$b  = $this->cne->get_data($fullorder);
 
 		//$b = $this->fedexv1->get_data($fullorder);
 
 		//$b = $this->fedexv1->get_data($fullorder);
 
 		//echo $fullorder['zzl'];
 
 		//echo $fullorder['zzl'];
 
-		// $b = $this->usps->get_data_new($fullorder);
 
+		$b = $this->usps->get_data($fullorder);
 
 	
 	
 		echo "<pre>";
 
 		echo "<pre>";
 
 		print_r($b);
 
 		print_r($b);

+ 11 - 10
core/CoreApp/controllers/Systemprint.php
查看文件 

@@ -900,19 +900,20 @@ class Systemprint extends Start_Controller {
 
 				{
 
 				{
 
 				    $barcode = $this->usps->get_data($fullorder);
 
 				    $barcode = $this->usps->get_data($fullorder);
 
 					//改新的去掉
 
 					//改新的去掉
 
-					// if(isset($barcode[0]))
 
-					// {
 
-					// 	$barcode = $barcode[0];
 
-					// }
 
-					//if(isset($barcode['LabelImage']) || isset($barcode[0]['LabelImage']))
 
+					if(isset($barcode[0]))
 
+					{
 
+						$barcode = $barcode[0];
 
+					}
 
+					if(isset($barcode['LabelImage']) || isset($barcode[0]['LabelImage']))
 
 					//改新的去掉
 
 					//改新的去掉
 
-					if(isset($barcode['labelImage']))
 
+					//if(isset($barcode['labelImage']))
 
 					{
 
 					{
 
 						$bctime = date('Ymd',$time);
 
 						$bctime = date('Ymd',$time);
 
-						//$Hwaybill = substr($barcode['BarcodeNumber'], 8); //改新的去掉  新的 Labellmage 改  labelImage
 
-						$Hwaybill = $barcode['trackingNumber'];
 
-					    $Hyd = $this->_pdf($barcode['labelImage'],'y-'.$Hwaybill,$bctime);
 
-						if(isset($barcode['labelImage']) && isset($Hwaybill))
 
+						$Hwaybill = substr($barcode['BarcodeNumber'], 8); //改新的去掉  新的 Labellmage 改  labelImage
 
+						//$Hwaybill = $barcode['trackingNumber'];
 
+					   // $Hyd = $this->_pdf($barcode['labelImage'],'y-'.$Hwaybill,$bctime);
 
+					    $Hyd = $this->_pdf($barcode['LabelImage'],'y-'.$Hwaybill,$bctime);
 
+						if(isset($barcode['LabelImage']) && isset($Hwaybill))
 
 						{
 
 						{
 
 							if($fullorder['waybill'] != "")
 
 							if($fullorder['waybill'] != "")
 
 							{
 
 							{

文件差异内容过多而无法显示
+ 1 - 1
core/CoreApp/models/Model_cne.php


文件差异内容过多而无法显示
+ 4 - 4
core/CoreApp/models/Model_usps.php


+ 132 - 132
template/erp/systemprint.html
查看文件 

@@ -1,133 +1,133 @@
 
-{Template header}

-<body>

-<div class="warp">

-<div class="fixed">

-<ul class="search">

-<li>订单号：<input value="" name="orderinfo" type="text"></li>

-<li>编号：<input value="" name="number" type="text"></li>

-<li>运单号：<input value="" name="waybill" type="text"></li>

-<li>打印状态：<select name="print" class="select">

-<option value="2">未打印</option>

-<option value="3">已打印</option>

-</select></li>

-<li>快递公司：<select name="express" class="select">

-<option value="">请选择</option>

-{loop express(100) as $val}

-<option value="{$val['id']}">{$val['servicename']}</option>

-{/loop}</select>

-</li>

-<li>

-店铺名称：<select name="shop" class="select">

-<option value="">请选择</option>

-{loop usershop() as $val}

-<option value="{$val['id']}">{$val['shopname']}</option>

-{/loop}</select>

-</li>

-<li>

-仓库名称：<select name="type" class="select">

-<option value="">请选择</option>

-{loop $warehouse as $val}

-<option value="{$val['id']}">{$val['title']}</option>

-{/loop}</select>

-</li>

-<li>

-产品分类：<select name="ckfl" class="select">

-<option value="">请选择</option>

-{loop typeclass(37,100) as $val}

-<option value="{$val['id']}">{$val['title']}</option>

-{/loop}</select>

-</li>

-<li>

-是否现货：<select name="sfxh" class="select">

-<option value="">请选择</option>

-<option value="1">有现货</option>

-<option value="0">无现货</option>

-</select>

-</li>

-<li>搜索品名：<input value="" name="so" type="text" style="width:260px"></li>

-<li>颜色：<select name="color" class="select">

-<option value="">请选择</option>{loop typeclassyc(8) as $val}

-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>

-<li>曲度：<select name="lowe" class="select">

-<option value="">请选择</option>{loop typeclassyc(15) as $val}

-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>

-<li>打印时间：<input id="timetk" value="{date('Y-m-d',time()-30*24*3600)} 19:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly>

-至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time())} 19:00" name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly></li>

-<li><span>确 定</span></li>

-</ul>

-<div class="control zjcz">

-<div class="tabprint">

-快递面单：<select name="printer" class="select" style="width:220px;">

-<option value="">选择打印机</option>

-</select>

-发票：<select name="fp_printer" class="select" style="width:220px;">

-    <option value="">选择打印机</option>

-    </select>

-</div>

-<a href="javascript:void(0);" class="printing">打 印</a>

-<a href="javascript:void(0);" class="exceldy">导出Excel</a>

-</div>

-<table class="datatitle data" border="0" style="border-collapse:collapse;">

-<tr>

-<td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>

-<td>店铺名称</td>

-<td>订单号</td>

-<td>编号</td>

-<td>快递公司</td>

-<td>运单号</td>

-<td>状态</td>

-<td>类型</td>

-<td>次数</td>

-<td>打印时间</td>

-<td>仓库品名</td>

-</tr>

-</table>

-</div>

-<table class="datatext data" border="0" style="border-collapse:collapse;">

-</table>

-<div class="bomf"></div>

-</div>

-<div class="print none"></div>

-<div class="ts"><p class="tsn"></p></div>

-<div class="systemwindow">

-<div>

-<p>是否确定删除所选信息？</p>

-<p><font class="button">确 定</font><font class="esc">取 消</font></p>

-</div>

-</div>

-<div class="tyrows"><div><p></p><p></p></div></div>

-<div class="list"><div><p>操作配置</p><ul class="fj"></ul><em></em></div></div>

-<span id="job" class="none"></span>

-<span id="site" class="none"></span>

-<script>

-var dataurl = "/systemprint/";var fdataurl = "/systemprint/";

-var sysprint = 1;

-var customon = 1;

-function custom(){

-$(".data tr").each(function() {

-$(this).find('td:eq(0)').css("width","1%");

-$(this).find('td:eq(1)').css("width","9%");

-$(this).find('td:eq(2)').css("width","9%");

-$(this).find('td:eq(3)').css("width","13%");

-$(this).find('td:eq(4)').css("width","9%");

-$(this).find('td:eq(5)').css("width","9%");

-$(this).find('td:eq(6)').css("width","5%");

-$(this).find('td:eq(7)').css("width","4%");

-$(this).find('td:eq(8)').css("width","5%");

-$(this).find('td:eq(9)').css("width","9%");

-$(this).find('td:eq(10)').css("width","27%");

-$(this).find('td:eq(10)').css("font-size","12px");

-});}

-window.onload = function() { 

-    if(typeof $("select[name='printer']").length < 1) return;

-    setTimeout(function(){ wprinter.printer()},1000);

-    setTimeout(function(){

-        let h = $("select[name='printer']").html()

-        $("select[name='fp_printer']").html(h)

-    },1100)

-};

-

-</script>

-<script type="text/javascript" src="{$theme}js/laydate.js"></script>

-<script type="text/javascript" src="{$theme}js/print.js?v=20250207331"></script>

+{Template header}
 
+<body>
 
+<div class="warp">
 
+<div class="fixed">
 
+<ul class="search">
 
+<li>订单号：<input value="" name="orderinfo" type="text"></li>
 
+<li>编号：<input value="" name="number" type="text"></li>
 
+<li>运单号：<input value="" name="waybill" type="text"></li>
 
+<li>打印状态：<select name="print" class="select">
 
+<option value="2">未打印</option>
 
+<option value="3">已打印</option>
 
+</select></li>
 
+<li>快递公司：<select name="express" class="select">
 
+<option value="">请选择</option>
 
+{loop express(100) as $val}
 
+<option value="{$val['id']}">{$val['servicename']}</option>
 
+{/loop}</select>
 
+</li>
 
+<li>
 
+店铺名称：<select name="shop" class="select">
 
+<option value="">请选择</option>
 
+{loop usershop() as $val}
 
+<option value="{$val['id']}">{$val['shopname']}</option>
 
+{/loop}</select>
 
+</li>
 
+<li>
 
+仓库名称：<select name="type" class="select">
 
+<option value="">请选择</option>
 
+{loop $warehouse as $val}
 
+<option value="{$val['id']}">{$val['title']}</option>
 
+{/loop}</select>
 
+</li>
 
+<li>
 
+产品分类：<select name="ckfl" class="select">
 
+<option value="">请选择</option>
 
+{loop typeclass(37,100) as $val}
 
+<option value="{$val['id']}">{$val['title']}</option>
 
+{/loop}</select>
 
+</li>
 
+<li>
 
+是否现货：<select name="sfxh" class="select">
 
+<option value="">请选择</option>
 
+<option value="1">有现货</option>
 
+<option value="0">无现货</option>
 
+</select>
 
+</li>
 
+<li>搜索品名：<input value="" name="so" type="text" style="width:260px"></li>
 
+<li>颜色：<select name="color" class="select">
 
+<option value="">请选择</option>{loop typeclassyc(8) as $val}
 
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
 
+<li>曲度：<select name="lowe" class="select">
 
+<option value="">请选择</option>{loop typeclassyc(15) as $val}
 
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
 
+<li>打印时间：<input id="timetk" value="{date('Y-m-d',time()-30*24*3600)} 19:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly>
 
+至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time())} 19:00" name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly></li>
 
+<li><span>确 定</span></li>
 
+</ul>
 
+<div class="control zjcz">
 
+<div class="tabprint">
 
+快递面单：<select name="printer" class="select" style="width:220px;">
 
+<option value="">选择打印机</option>
 
+</select>
 
+发票：<select name="fp_printer" class="select" style="width:220px;">
 
+    <option value="">选择打印机</option>
 
+    </select>
 
+</div>
 
+<a href="javascript:void(0);" class="printing">打 印</a>
 
+<a href="javascript:void(0);" class="exceldy">导出Excel</a>
 
+</div>
 
+<table class="datatitle data" border="0" style="border-collapse:collapse;">
 
+<tr>
 
+<td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
 
+<td>店铺名称</td>
 
+<td>订单号</td>
 
+<td>编号</td>
 
+<td>快递公司</td>
 
+<td>运单号</td>
 
+<td>状态</td>
 
+<td>类型</td>
 
+<td>次数</td>
 
+<td>打印时间</td>
 
+<td>仓库品名</td>
 
+</tr>
 
+</table>
 
+</div>
 
+<table class="datatext data" border="0" style="border-collapse:collapse;">
 
+</table>
 
+<div class="bomf"></div>
 
+</div>
 
+<div class="print none"></div>
 
+<div class="ts"><p class="tsn"></p></div>
 
+<div class="systemwindow">
 
+<div>
 
+<p>是否确定删除所选信息？</p>
 
+<p><font class="button">确 定</font><font class="esc">取 消</font></p>
 
+</div>
 
+</div>
 
+<div class="tyrows"><div><p></p><p></p></div></div>
 
+<div class="list"><div><p>操作配置</p><ul class="fj"></ul><em></em></div></div>
 
+<span id="job" class="none"></span>
 
+<span id="site" class="none"></span>
 
+<script>
 
+var dataurl = "/systemprint/";var fdataurl = "/systemprint/";
 
+var sysprint = 1;
 
+var customon = 1;
 
+function custom(){
 
+$(".data tr").each(function() {
 
+$(this).find('td:eq(0)').css("width","1%");
 
+$(this).find('td:eq(1)').css("width","9%");
 
+$(this).find('td:eq(2)').css("width","9%");
 
+$(this).find('td:eq(3)').css("width","13%");
 
+$(this).find('td:eq(4)').css("width","9%");
 
+$(this).find('td:eq(5)').css("width","9%");
 
+$(this).find('td:eq(6)').css("width","5%");
 
+$(this).find('td:eq(7)').css("width","4%");
 
+$(this).find('td:eq(8)').css("width","5%");
 
+$(this).find('td:eq(9)').css("width","9%");
 
+$(this).find('td:eq(10)').css("width","27%");
 
+$(this).find('td:eq(10)').css("font-size","12px");
 
+});}
 
+window.onload = function() { 
+    if(typeof $("select[name='printer']").length < 1) return;
 
+    setTimeout(function(){ wprinter.printer()},1000);
 
+    setTimeout(function(){
 
+        let h = $("select[name='printer']").html()
 
+        $("select[name='fp_printer']").html(h)
 
+    },1100)
 
+};
 
+
 
+</script>
 
+<script type="text/javascript" src="{$theme}js/laydate.js"></script>
 
+<script type="text/javascript" src="{$theme}js/print.js?v=20250207331"></script>
 
 {Template footer}
 
 {Template footer}