|
|
@@ -3779,16 +3779,32 @@ class common {
|
|
|
$html_tr = "";
|
|
|
$dest_op_arr = array();
|
|
|
foreach($shipmentsData['data'] as $shipment){
|
|
|
- $html_tr .="<tr style=\"color: #ED6D00;\">
|
|
|
- <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['h_bol']."</td>
|
|
|
- <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['ctnr']."</td>
|
|
|
- <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['package_type']."</td>
|
|
|
- <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['kgw']."</td>
|
|
|
- </tr>";
|
|
|
+ // $html_tr .="<tr style=\"color: #ED6D00;\">
|
|
|
+ // <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['h_bol']."</td>
|
|
|
+ // <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['ctnr']."</td>
|
|
|
+ // <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['package_type']."</td>
|
|
|
+ // <td align=\"center\" style=\" width: 162px;padding: 10px;word-wrap: break-word; word-break: break-all; white-space: normal;\">".$shipment['kgw']."</td>
|
|
|
+ // </tr>";
|
|
|
+ $html_tr .='<tr style="color: #ED6D00;">
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['h_bol'].'</td>
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['ctnr'].'</td>
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['po_no'].'</td>
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['service'].'</td>
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['package_type'].'</td>
|
|
|
+ <td align="center"
|
|
|
+ style=" width: 162px;padding: 10px 6px;word-wrap: break-word; word-break: break-all; white-space: normal;">'.$shipment['kgw'].'</td>
|
|
|
+ </tr>';
|
|
|
if(!empty($shipment['dest_op'])){
|
|
|
$dest_op_arr[] = $shipment['dest_op'];
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //{{consignee_name}}
|
|
|
|
|
|
$kln_pic_email = $data['kln_pic'];
|
|
|
//这票的创建者email
|
|
|
@@ -3827,6 +3843,7 @@ class common {
|
|
|
"action_reason" =>"",
|
|
|
"action_comments" =>$log['notes'],
|
|
|
"link" =>$links,
|
|
|
+ "consignee_name" =>$data['consignee'],
|
|
|
"html_tr" =>$html_tr);
|
|
|
|
|
|
$contents = common::excuteObjectSql("select subject, ra_content as content from ra_online_email_tpl where ra_type = 'Delivery_".$status."'");
|
