Showing
3 changed files
with
16 additions
and
14 deletions
| @@ -337,19 +337,16 @@ public class ShipmentsOrderInfoController extends DefaultBaseController { | @@ -337,19 +337,16 @@ public class ShipmentsOrderInfoController extends DefaultBaseController { | ||
| 337 | if (StringUtils.isNotBlank(latex)) { | 337 | if (StringUtils.isNotBlank(latex)) { |
| 338 | LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7); | 338 | LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7); |
| 339 | } | 339 | } |
| 340 | - // 处理订单类型 | ||
| 341 | - String orderType = handleContractType(detail.getContractType()); | ||
| 342 | - | ||
| 343 | ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity()); | 340 | ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity()); |
| 344 | if ("TYPE_2".equals(type)) { | 341 | if ("TYPE_2".equals(type)) { |
| 345 | ExcelUtil.setCellValue(sheet, startRow, 10, detail.getActualShipmentQuantity()); | 342 | ExcelUtil.setCellValue(sheet, startRow, 10, detail.getActualShipmentQuantity()); |
| 346 | ExcelUtil.setCellValue(sheet, startRow, 11, detail.getNum()); | 343 | ExcelUtil.setCellValue(sheet, startRow, 11, detail.getNum()); |
| 347 | ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice()); | 344 | ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice()); |
| 348 | - ExcelUtil.setCellValue(sheet, startRow, 13, orderType); | 345 | + ExcelUtil.setCellValue(sheet, startRow, 13, detail.getOrderType()); |
| 349 | ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo()); | 346 | ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo()); |
| 350 | } else { | 347 | } else { |
| 351 | ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee()); | 348 | ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee()); |
| 352 | - ExcelUtil.setCellValue(sheet, startRow, 15, orderType); | 349 | + ExcelUtil.setCellValue(sheet, startRow, 15, detail.getOrderType()); |
| 353 | } | 350 | } |
| 354 | startRow++; | 351 | startRow++; |
| 355 | } | 352 | } |
| @@ -76,12 +76,6 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto { | @@ -76,12 +76,6 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto { | ||
| 76 | private String packagingFee; | 76 | private String packagingFee; |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | - * 合同类型 | ||
| 80 | - */ | ||
| 81 | - @TableField(exist = false) | ||
| 82 | - private String contractType; | ||
| 83 | - | ||
| 84 | - /** | ||
| 85 | * 客户ID | 79 | * 客户ID |
| 86 | */ | 80 | */ |
| 87 | @TableField(exist = false) | 81 | @TableField(exist = false) |
| @@ -44,8 +44,10 @@ | @@ -44,8 +44,10 @@ | ||
| 44 | ELSE '其它' | 44 | ELSE '其它' |
| 45 | END AS order_type, | 45 | END AS order_type, |
| 46 | o.ordering_unit AS customer_id, | 46 | o.ordering_unit AS customer_id, |
| 47 | + o.packaging_fee, | ||
| 47 | c.name AS customer_name, | 48 | c.name AS customer_name, |
| 48 | tb.order_spec_id, | 49 | tb.order_spec_id, |
| 50 | + ol.brand, | ||
| 49 | ol.thickness, | 51 | ol.thickness, |
| 50 | ol.thickness_tol_pos, | 52 | ol.thickness_tol_pos, |
| 51 | ol.thickness_tol_neg, | 53 | ol.thickness_tol_neg, |
| @@ -56,11 +58,15 @@ | @@ -56,11 +58,15 @@ | ||
| 56 | ol.length_tol_pos, | 58 | ol.length_tol_pos, |
| 57 | ol.length_tol_neg, | 59 | ol.length_tol_neg, |
| 58 | ol.quantity, | 60 | ol.quantity, |
| 61 | + ol.sales_price, | ||
| 62 | + ol.status, | ||
| 59 | tb.parent_id, | 63 | tb.parent_id, |
| 60 | - tb.status, | ||
| 61 | tb.shipments_date, | 64 | tb.shipments_date, |
| 62 | tb.shipments_time, | 65 | tb.shipments_time, |
| 63 | tb.can_shipments, | 66 | tb.can_shipments, |
| 67 | + tb.actual_shipment_quantity, | ||
| 68 | + tb.num, | ||
| 69 | + tb.yield_batch_no, | ||
| 64 | tb.del_flag, | 70 | tb.del_flag, |
| 65 | ws.name AS workshop_name, | 71 | ws.name AS workshop_name, |
| 66 | tb.create_by_id, | 72 | tb.create_by_id, |
| @@ -196,7 +202,12 @@ | @@ -196,7 +202,12 @@ | ||
| 196 | o.delivery_method, | 202 | o.delivery_method, |
| 197 | o.settlement_terms, | 203 | o.settlement_terms, |
| 198 | o.packaging_fee, | 204 | o.packaging_fee, |
| 199 | - sc.type as contract_type, | 205 | + CASE |
| 206 | + WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销' | ||
| 207 | + WHEN sc.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸' | ||
| 208 | + WHEN sc.type = 'PROCESS_STD_AGMT' THEN '加工' | ||
| 209 | + ELSE '其它' | ||
| 210 | + END AS order_type, | ||
| 200 | c.name AS customer_name, | 211 | c.name AS customer_name, |
| 201 | tb.order_spec_id, | 212 | tb.order_spec_id, |
| 202 | ol.brand, | 213 | ol.brand, |
| @@ -211,8 +222,8 @@ | @@ -211,8 +222,8 @@ | ||
| 211 | ol.length_tol_neg, | 222 | ol.length_tol_neg, |
| 212 | ol.quantity, | 223 | ol.quantity, |
| 213 | ol.sales_price, | 224 | ol.sales_price, |
| 225 | + ol.status, | ||
| 214 | tb.parent_id, | 226 | tb.parent_id, |
| 215 | - tb.status, | ||
| 216 | tb.shipments_date, | 227 | tb.shipments_date, |
| 217 | tb.shipments_time, | 228 | tb.shipments_time, |
| 218 | tb.can_shipments, | 229 | tb.can_shipments, |