Commit 6823110f734ccb3d8f476984f053a18b24085252
Merge branch 'master_chujiang_0819' into master_plan
Showing
1 changed file
with
2 additions
and
0 deletions
| @@ -176,6 +176,7 @@ | @@ -176,6 +176,7 @@ | ||
| 176 | o.id as order_id, | 176 | o.id as order_id, |
| 177 | o.order_no, | 177 | o.order_no, |
| 178 | c.name AS customer_name, | 178 | c.name AS customer_name, |
| 179 | + ol.brand, | ||
| 179 | ol.thickness, | 180 | ol.thickness, |
| 180 | ol.thickness_tol_pos, | 181 | ol.thickness_tol_pos, |
| 181 | ol.thickness_tol_neg, | 182 | ol.thickness_tol_neg, |
| @@ -185,6 +186,7 @@ | @@ -185,6 +186,7 @@ | ||
| 185 | ol.length, | 186 | ol.length, |
| 186 | ol.length_tol_pos, | 187 | ol.length_tol_pos, |
| 187 | ol.length_tol_neg, | 188 | ol.length_tol_neg, |
| 189 | + ol.status, | ||
| 188 | ol.quantity, | 190 | ol.quantity, |
| 189 | ol.delivery_date as shipments_date | 191 | ol.delivery_date as shipments_date |
| 190 | from tbl_purchase_order_line ol | 192 | from tbl_purchase_order_line ol |