|
@@ -1191,7 +1191,7 @@ class ocean_order {
|
|
|
|
|
|
|
|
//处理ocean_reference
|
|
//处理ocean_reference
|
|
|
$ref_no = array();
|
|
$ref_no = array();
|
|
|
- $ref_arr = common::excuteListSql("select * from ocean_reference where lower(serial_no) = '" . strtolower($serial_no) . "'");
|
|
|
|
|
|
|
+ $ref_arr = common::excuteListSql("select * from ocean_reference where ref_code <> 'PO' and lower(serial_no) = '" . strtolower($serial_no) . "'");
|
|
|
if(!empty($ref_arr)){
|
|
if(!empty($ref_arr)){
|
|
|
foreach($ref_arr as $ref) {
|
|
foreach($ref_arr as $ref) {
|
|
|
$ref_no[] = array("label"=>$ref["ref_code"],"value"=>$ref["ref_value"]);
|
|
$ref_no[] = array("label"=>$ref["ref_code"],"value"=>$ref["ref_value"]);
|
|
@@ -1201,7 +1201,7 @@ class ocean_order {
|
|
|
$ocean_container_column = array();
|
|
$ocean_container_column = array();
|
|
|
$container_column = column::getInstance()->getDisplayColumnAll('Ocean_Container');
|
|
$container_column = column::getInstance()->getDisplayColumnAll('Ocean_Container');
|
|
|
//特殊处理po_no,配置column在查询的时候，不好
|
|
//特殊处理po_no,配置column在查询的时候，不好
|
|
|
- $container_column[] = array("database_column_name" => "po_no","name"=>"PO_NO");
|
|
|
|
|
|
|
+ $container_column[] = array("database_column_name" => "po_no","name"=>"PO No.");
|
|
|
$container_column_config = array("Quantity" => array("formatter"=>"number","digits"=>0),
|
|
$container_column_config = array("Quantity" => array("formatter"=>"number","digits"=>0),
|
|
|
"Gross Weight" => array("formatter"=>"number","digits"=>3),
|
|
"Gross Weight" => array("formatter"=>"number","digits"=>3),
|
|
|
"Gross Weight" => array("formatter"=>"number","digits"=>3),
|
|
"Gross Weight" => array("formatter"=>"number","digits"=>3),
|
