longyi 6 tháng trước cách đây
mục cha
commit
1c89aae917

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1833 - 1829
core/CoreApp/controllers/Boss.php


+ 5 - 1
core/CoreApp/controllers/Bosstest.php

@@ -1236,19 +1236,23 @@ class Bosstest extends Start_Controller {
 						if(isset($sp[$title[1]]))
 						{
 							$sp[$title[1]]['n'] += $title[2];
+							$sp[$title[1]]['number'] .= $val['number']."<br />";
 						}
 						else
 						{
 							$wh = explode('-',$w[$k]);
 							$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");
 							$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';
-							$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'j'=>$jm,'n'=>$title[2]);
+							$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'j'=>$jm,'n'=>$title[2],'number'=>$val['number']."<br />");
 						}
 						$sp[$title[1]]['warehouse'] = isset($warehouses[$val['type']])?$warehouses[$val['type']]:'仓库异常';
 					}
 
 				}
 			}
+			echo "<pre>";
+			var_dump($sp);
+			die;
 			$sp = array_values($sp);
 			$title = "商品统计".date('Y-m-d H-i-s',time()); 
             $titlename = "<table border=1>

+ 1 - 1
core/CoreApp/controllers/Systemfout.php

@@ -584,7 +584,7 @@ class Systemfout extends Start_Controller {
     					echo json_encode(array('msg'=>'重量错误,请重新称重!','success'=>false));exit;
     				}
                     if($numweight < ($y['jweight']/1000)){
-        				json_encode(array('msg'=>'重量小于净重,请重新称重!','success'=>false));exit;
+        			    echo json_encode(array('msg'=>'重量小于净重,请重新称重!','success'=>false));exit;
         			}
     				//Fedex(杭州),UPS,DHL官方-美国 需要判断实际重量和净重差 其他快递不需要
     				if(in_array($y['express'],[3,24,42])){