From b6fcf4828bec2f3ea33950dcbe89db9f99f85373 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 27 Mar 2024 12:09:26 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionReportController.java | 32 ++- .../controller/QualityReportController.java | 23 +++ .../report/domain/DeviceAlarmRecord.java | 24 +++ .../domain/ProductionExecutionReport.java | 182 ++++++++++++++++++ .../aucma/report/domain/RepairRateReport.java | 90 +++++++++ .../aucma/report/domain/WIPInquiryReport.java | 152 +++++++++++++++ .../report/mapper/GeneralReportMapper.java | 11 +- .../service/IProductionReportService.java | 8 +- .../report/service/IQualityReportService.java | 7 + .../impl/ProductionReportServiceImpl.java | 8 +- .../impl/QualityReportServiceImpl.java | 16 ++ .../mapper/report/GeneralReportMapper.xml | 49 ++++- 12 files changed, 583 insertions(+), 19 deletions(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/ProductionExecutionReport.java create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/RepairRateReport.java create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java index c6d2c47..6549982 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java @@ -5,9 +5,7 @@ import com.aucma.common.core.domain.AjaxResult; import com.aucma.common.core.page.TableDataInfo; import com.aucma.common.utils.poi.ExcelUtil; -import com.aucma.report.domain.BoxTraceabilityDetailReport; -import com.aucma.report.domain.BoxTraceabilityReport; -import com.aucma.report.domain.InventoryRateReport; +import com.aucma.report.domain.*; import com.aucma.report.service.IProductionReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -56,19 +54,43 @@ public class ProductionReportController extends BaseController { */ @GetMapping("/productionExecutionReportList") public AjaxResult productionExecutionReportList(@RequestParam(required = false) Map hashMap) { - List> list = productionReportService.productionExecutionReportList(hashMap); + List list = productionReportService.productionExecutionReportList(hashMap); return success(list); } + /** + * 查询生产执行报表导出 + * @param hashMap + * @return + */ + @PostMapping("/productionExecutionReportList/export") + public void productionExecutionReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + List list = productionReportService.productionExecutionReportList(hashMap); + ExcelUtil util = new ExcelUtil<>(ProductionExecutionReport. class); + util.exportExcel(response, list, "清单率报表" ); + } + /** * 查询在制品查询报表 */ @GetMapping("/WIPInquiryReportList") public AjaxResult WIPInquiryReportList(@RequestParam(required = false) Map hashMap) { - List> list = productionReportService.WIPInquiryReportList(hashMap); + List list = productionReportService.WIPInquiryReportList(hashMap); return success(list); } + /** + * 在制品查询报表导出 + * @param hashMap + * @return + */ + @PostMapping("/WIPInquiryReportList/export") + public void WIPInquiryReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + List list = productionReportService.WIPInquiryReportList(hashMap); + ExcelUtil util = new ExcelUtil<>(WIPInquiryReport. class); + util.exportExcel(response, list, "清单率报表" ); + } + /** * 扫描下线记录报表 */ diff --git a/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java index 0b3e9fa..8ff6e51 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java @@ -176,4 +176,27 @@ public class QualityReportController extends BaseController { List> list = qualityReportService.pourRecordReportList(hashMap); return success(list); } + + /** + * 质量返修率报表 + * @param hashMap + * @return + */ + @GetMapping("/repairRateReportList") + public AjaxResult repairRateReportList(@RequestParam(required = false) Map hashMap) { + List list = qualityReportService.repairRateReportList(hashMap); + return success(list); + } + + /** + * 质量返修率报表导出 + * @param hashMap + * @return + */ + @PostMapping("/repairRateReportList/export" ) + public void repairRateReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + List list = qualityReportService.repairRateReportList(hashMap); + ExcelUtil util = new ExcelUtil<>(RepairRateReport. class); + util.exportExcel(response, list, "质量返修率报表" ); + } } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/DeviceAlarmRecord.java b/aucma-report/src/main/java/com/aucma/report/domain/DeviceAlarmRecord.java index 05d148b..d63ca88 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/DeviceAlarmRecord.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/DeviceAlarmRecord.java @@ -78,6 +78,30 @@ public class DeviceAlarmRecord extends BaseEntity { @Excel(name = "批次标识") private String batchId; + /** 参数编号 */ + @Excel(name = "参数编号") + private String paramCode; + + /** 参数值 */ + @Excel(name = "参数值") + private String paramValue; + + public String getParamCode() { + return paramCode; + } + + public void setParamCode(String paramCode) { + this.paramCode = paramCode; + } + + public String getParamValue() { + return paramValue; + } + + public void setParamValue(String paramValue) { + this.paramValue = paramValue; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ProductionExecutionReport.java b/aucma-report/src/main/java/com/aucma/report/domain/ProductionExecutionReport.java new file mode 100644 index 0000000..e8ac283 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/ProductionExecutionReport.java @@ -0,0 +1,182 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * 在制品查询报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class ProductionExecutionReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 产线编号 + */ + @Excel(name = "产线编号") + @JsonProperty("PRODUCT_LINE_CODE") + private String PRODUCT_LINE_CODE; + + /** + * 产线名称 + */ + @Excel(name = "产线名称") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + /** + * SAP订单编号 + */ + @Excel(name = "SAP订单编号") + @JsonProperty("ORDER_CODE") + private String ORDER_CODE; + + /** + * 工位编号 + */ + @Excel(name = "工位编号") + @JsonProperty("STATION_CODE") + private String STATION_CODE; + + /** + * 工位名称 + */ + @Excel(name = "工位名称") + @JsonProperty("STATION_NAME") + private String STATION_NAME; + + /** + * 物料编号 + */ + @Excel(name = "物料编号") + @JsonProperty("MATERIAL_CODE") + private String MATERIAL_CODE; + + /** + * 物料名称 + */ + @Excel(name = "物料名称") + @JsonProperty("MATERIAL_NAME") + private String MATERIAL_NAME; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + @JsonProperty("PRODUCT_CODE") + private String PRODUCT_CODE; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + @JsonProperty("PRODUCT_NAME") + private String PRODUCT_NAME; + + /** + * 数量 + */ + @Excel(name = "数量") + @JsonProperty("COMP_AMOUNT") + private Long COMP_AMOUNT; + + public String getPRODUCT_LINE_CODE() { + return PRODUCT_LINE_CODE; + } + + public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) { + this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE; + } + + public String getPRODUCT_LINE_NAME() { + return PRODUCT_LINE_NAME; + } + + public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) { + this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; + } + + public String getORDER_CODE() { + return ORDER_CODE; + } + + public void setORDER_CODE(String ORDER_CODE) { + this.ORDER_CODE = ORDER_CODE; + } + + public String getSTATION_CODE() { + return STATION_CODE; + } + + public void setSTATION_CODE(String STATION_CODE) { + this.STATION_CODE = STATION_CODE; + } + + public String getSTATION_NAME() { + return STATION_NAME; + } + + public void setSTATION_NAME(String STATION_NAME) { + this.STATION_NAME = STATION_NAME; + } + + public String getMATERIAL_CODE() { + return MATERIAL_CODE; + } + + public void setMATERIAL_CODE(String MATERIAL_CODE) { + this.MATERIAL_CODE = MATERIAL_CODE; + } + + public String getMATERIAL_NAME() { + return MATERIAL_NAME; + } + + public void setMATERIAL_NAME(String MATERIAL_NAME) { + this.MATERIAL_NAME = MATERIAL_NAME; + } + + public String getPRODUCT_CODE() { + return PRODUCT_CODE; + } + + public void setPRODUCT_CODE(String PRODUCT_CODE) { + this.PRODUCT_CODE = PRODUCT_CODE; + } + + public String getPRODUCT_NAME() { + return PRODUCT_NAME; + } + + public void setPRODUCT_NAME(String PRODUCT_NAME) { + this.PRODUCT_NAME = PRODUCT_NAME; + } + + public Long getCOMP_AMOUNT() { + return COMP_AMOUNT; + } + + public void setCOMP_AMOUNT(Long COMP_AMOUNT) { + this.COMP_AMOUNT = COMP_AMOUNT; + } + + @Override + public String toString() { + return "ProductionExecutionReport{" + + "PRODUCT_LINE_CODE='" + PRODUCT_LINE_CODE + '\'' + + ", PRODUCT_LINE_NAME='" + PRODUCT_LINE_NAME + '\'' + + ", ORDER_CODE='" + ORDER_CODE + '\'' + + ", STATION_CODE='" + STATION_CODE + '\'' + + ", STATION_NAME='" + STATION_NAME + '\'' + + ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' + + ", MATERIAL_NAME='" + MATERIAL_NAME + '\'' + + ", PRODUCT_CODE='" + PRODUCT_CODE + '\'' + + ", PRODUCT_NAME='" + PRODUCT_NAME + '\'' + + ", COMP_AMOUNT=" + COMP_AMOUNT + + '}'; + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/RepairRateReport.java b/aucma-report/src/main/java/com/aucma/report/domain/RepairRateReport.java new file mode 100644 index 0000000..62ea278 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/RepairRateReport.java @@ -0,0 +1,90 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * 质量问题前80报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class RepairRateReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 日期 + */ + @Excel(name = "日期") + @JsonProperty("INSPECTOR_TIME") + private String INSPECTOR_TIME; + + /** + * 异常数 + */ + @Excel(name = "异常数") + @JsonProperty("QUALITY_SUM") + private Long QUALITY_SUM; + + /** + * 下线数 + */ + @Excel(name = "下线数") + @JsonProperty("OFF_LINE_NUM") + private Long OFF_LINE_NUM; + + /** + * 返修率 + */ + @Excel(name = "返修率") + @JsonProperty("REPAIR_RATE") + private String REPAIR_RATE; + + /** + * 目标返修率 + */ +// @Excel(name = "目标返修率") + @JsonProperty("TARGET") + private String TARGET; + + public String getINSPECTOR_TIME() { + return INSPECTOR_TIME; + } + + public void setINSPECTOR_TIME(String INSPECTOR_TIME) { + this.INSPECTOR_TIME = INSPECTOR_TIME; + } + + public Long getQUALITY_SUM() { + return QUALITY_SUM; + } + + public void setQUALITY_SUM(Long QUALITY_SUM) { + this.QUALITY_SUM = QUALITY_SUM; + } + + public Long getOFF_LINE_NUM() { + return OFF_LINE_NUM; + } + + public void setOFF_LINE_NUM(Long OFF_LINE_NUM) { + this.OFF_LINE_NUM = OFF_LINE_NUM; + } + + public String getREPAIR_RATE() { + return REPAIR_RATE; + } + + public void setREPAIR_RATE(String REPAIR_RATE) { + this.REPAIR_RATE = REPAIR_RATE; + } + + public String getTARGET() { + return TARGET; + } + + public void setTARGET(String TARGET) { + this.TARGET = TARGET; + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java b/aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java new file mode 100644 index 0000000..1b94e73 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java @@ -0,0 +1,152 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * 在制品查询报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class WIPInquiryReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 产线编号 + */ + @Excel(name = "产线编号") + @JsonProperty("PRODUCT_LINE_CODE") + private String PRODUCT_LINE_CODE; + + /** + * 产线名称 + */ + @Excel(name = "产线名称") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + /** + * SAP订单编号 + */ + @Excel(name = "SAP订单编号") + @JsonProperty("ORDER_CODE") + private String ORDER_CODE; + + + + + /** + * 物料编号 + */ + @Excel(name = "物料编号") + @JsonProperty("MATERIAL_CODE") + private String MATERIAL_CODE; + + /** + * 物料名称 + */ + @Excel(name = "物料名称") + @JsonProperty("MATERIAL_NAME") + private String MATERIAL_NAME; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + @JsonProperty("PRODUCT_CODE") + private String PRODUCT_CODE; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + @JsonProperty("PRODUCT_NAME") + private String PRODUCT_NAME; + + /** + * 数量 + */ + @Excel(name = "数量") + @JsonProperty("COMP_AMOUNT") + private Long COMP_AMOUNT; + + public String getPRODUCT_LINE_CODE() { + return PRODUCT_LINE_CODE; + } + + public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) { + this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE; + } + + public String getPRODUCT_LINE_NAME() { + return PRODUCT_LINE_NAME; + } + + public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) { + this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; + } + + public String getORDER_CODE() { + return ORDER_CODE; + } + + public void setORDER_CODE(String ORDER_CODE) { + this.ORDER_CODE = ORDER_CODE; + } + + public String getMATERIAL_CODE() { + return MATERIAL_CODE; + } + + public void setMATERIAL_CODE(String MATERIAL_CODE) { + this.MATERIAL_CODE = MATERIAL_CODE; + } + + public String getMATERIAL_NAME() { + return MATERIAL_NAME; + } + + public void setMATERIAL_NAME(String MATERIAL_NAME) { + this.MATERIAL_NAME = MATERIAL_NAME; + } + + public String getPRODUCT_CODE() { + return PRODUCT_CODE; + } + + public void setPRODUCT_CODE(String PRODUCT_CODE) { + this.PRODUCT_CODE = PRODUCT_CODE; + } + + public String getPRODUCT_NAME() { + return PRODUCT_NAME; + } + + public void setPRODUCT_NAME(String PRODUCT_NAME) { + this.PRODUCT_NAME = PRODUCT_NAME; + } + + public Long getCOMP_AMOUNT() { + return COMP_AMOUNT; + } + + public void setCOMP_AMOUNT(Long COMP_AMOUNT) { + this.COMP_AMOUNT = COMP_AMOUNT; + } + + @Override + public String toString() { + return "ProductionExecutionReport{" + + "PRODUCT_LINE_CODE='" + PRODUCT_LINE_CODE + '\'' + + ", PRODUCT_LINE_NAME='" + PRODUCT_LINE_NAME + '\'' + + ", ORDER_CODE='" + ORDER_CODE + '\'' + + ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' + + ", MATERIAL_NAME='" + MATERIAL_NAME + '\'' + + ", PRODUCT_CODE='" + PRODUCT_CODE + '\'' + + ", PRODUCT_NAME='" + PRODUCT_NAME + '\'' + + ", COMP_AMOUNT=" + COMP_AMOUNT + + '}'; + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java index fda7623..c4da579 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java @@ -28,14 +28,14 @@ public interface GeneralReportMapper { * @param hashMap * @return */ - List> productionExecutionReportList(Map hashMap); + List productionExecutionReportList(Map hashMap); /** * 查询在制品查询报表 * @param hashMap * @return */ - List> WIPInquiryReportList(Map hashMap); + List WIPInquiryReportList(Map hashMap); /** * 质量缺陷统计分析 @@ -115,4 +115,11 @@ public interface GeneralReportMapper { * @return */ List boxTraceabilityDetailReport(Map hashMap); + + /** + * 质量返修率报表 + * @param hashMap + * @return + */ + List repairRateReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java index b7fe0ca..299c095 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java @@ -1,8 +1,6 @@ package com.aucma.report.service; -import com.aucma.report.domain.BoxTraceabilityDetailReport; -import com.aucma.report.domain.BoxTraceabilityReport; -import com.aucma.report.domain.InventoryRateReport; +import com.aucma.report.domain.*; import java.util.HashMap; import java.util.List; @@ -28,7 +26,7 @@ public interface IProductionReportService * @param hashMap * @return */ - List> productionExecutionReportList(Map hashMap); + List productionExecutionReportList(Map hashMap); /** @@ -36,7 +34,7 @@ public interface IProductionReportService * @param hashMap * @return */ - List> WIPInquiryReportList(Map hashMap); + List WIPInquiryReportList(Map hashMap); /** * 扫描下线记录报表 diff --git a/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java index a065b6b..f1b8060 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java @@ -78,4 +78,11 @@ public interface IQualityReportService * @return */ List qualityDefectsDetailListExport(Map hashMap); + + /** + * 质量返修率报表 + * @param hashMap + * @return + */ + List repairRateReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java index a7558cb..7b43bba 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -1,8 +1,6 @@ package com.aucma.report.service.impl; -import com.aucma.report.domain.BoxTraceabilityDetailReport; -import com.aucma.report.domain.BoxTraceabilityReport; -import com.aucma.report.domain.InventoryRateReport; +import com.aucma.report.domain.*; import com.aucma.report.mapper.GeneralReportMapper; import com.aucma.report.service.IProductionReportService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +35,7 @@ public class ProductionReportServiceImpl implements IProductionReportService { * @return */ @Override - public List> productionExecutionReportList(Map hashMap) { + public List productionExecutionReportList(Map hashMap) { return reportMapper.productionExecutionReportList(hashMap); } @@ -47,7 +45,7 @@ public class ProductionReportServiceImpl implements IProductionReportService { * @return */ @Override - public List> WIPInquiryReportList(Map hashMap) { + public List WIPInquiryReportList(Map hashMap) { return reportMapper.WIPInquiryReportList(hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java index 3c850ff..088ea71 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java @@ -137,4 +137,20 @@ public class QualityReportServiceImpl implements IQualityReportService { return defectsDetailArrayList; } + /** + * 质量返修率报表 + * @param hashMap + * @return + */ + @Override + public List repairRateReportList(Map hashMap) { + if (hashMap.containsKey("stationCodeList")){ + hashMap.put("stationCodeList", String.valueOf(hashMap.get("stationCodeList")).split(",")); + }else { + String[] stationCodeLists = {"null"}; + hashMap.put("stationCodeList", stationCodeLists); + } + return reportMapper.repairRateReportList(hashMap); + } + } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 6cac09a..a19c211 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -36,7 +36,7 @@ ORDER BY ROUND(NVL(boi.COMPLETE_AMOUNT, 0) / boi.ORDER_AMOUNT * 100, 2) - SELECT B2.PRODUCT_LINE_CODE, B2.PRODUCT_LINE_NAME, VMC.ORDER_CODE, @@ -77,7 +77,7 @@ ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE, BP.PRODUCT_LINE_CODE - SELECT B2.PRODUCT_LINE_CODE, B2.PRODUCT_LINE_NAME, SD.ORDER_CODE, @@ -494,5 +494,50 @@ LEFT JOIN BASE_PRODUCTLINE PL ON PL.EXECUTION_SORT = SD.EXECUTION_SORT ORDER BY PL.EXECUTION_SORT +