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 index dd7277d..1f5f8dd 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/WIPInquiryReport.java @@ -65,6 +65,20 @@ public class WIPInquiryReport extends BaseEntity { @JsonProperty("PRODUCT_NAME") private String PRODUCT_NAME; + /** + * 订单数量 + */ + @Excel(name = "订单数量") + @JsonProperty("ORDER_AMOUNT") + private Long ORDER_AMOUNT; + + /** + * 完成数量 + */ + @Excel(name = "完成数量") + @JsonProperty("COMPLETE_AMOUNT") + private Long COMPLETE_AMOUNT; + /** * 在制数量 */ @@ -72,6 +86,22 @@ public class WIPInquiryReport extends BaseEntity { @JsonProperty("COMP_AMOUNT") private Long COMP_AMOUNT; + public Long getORDER_AMOUNT() { + return ORDER_AMOUNT; + } + + public void setORDER_AMOUNT(Long ORDER_AMOUNT) { + this.ORDER_AMOUNT = ORDER_AMOUNT; + } + + public Long getCOMPLETE_AMOUNT() { + return COMPLETE_AMOUNT; + } + + public void setCOMPLETE_AMOUNT(Long COMPLETE_AMOUNT) { + this.COMPLETE_AMOUNT = COMPLETE_AMOUNT; + } + public String getPRODUCT_LINE_CODE() { return PRODUCT_LINE_CODE; } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 886d463..22791d4 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -85,6 +85,8 @@ SD.MATERIAL_NAME, BO.MATERIAL_CODE PRODUCT_CODE, BO.MATERIAL_NAME PRODUCT_NAME, + MAX(BO.ORDER_AMOUNT) ORDER_AMOUNT, + MAX(BO.COMPLETE_AMOUNT) COMPLETE_AMOUNT, COUNT(*) COMP_AMOUNT FROM ( SELECT PB.ORDER_CODE, @@ -113,7 +115,7 @@ ) SD LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = SD.ORDER_CODE LEFT JOIN BASE_PRODUCTLINE B2 ON B2.WORK_CENTER_CODE = BO.WORK_CENTER_CODE - + WHERE BO.ORDER_AMOUNT != BO.COMPLETE_AMOUNT AND B2.PRODUCT_LINE_CODE = #{productLineCode} @@ -126,7 +128,6 @@ and BO.MATERIAL_NAME like concat(concat('%', #{PRODUCT_NAME}), '%') - GROUP BY B2.PRODUCT_LINE_CODE, B2.PRODUCT_LINE_NAME, SD.ORDER_CODE, SD.MATERIAL_CODE, SD.MATERIAL_NAME, BO.MATERIAL_CODE, BO.MATERIAL_NAME ORDER BY COMP_AMOUNT DESC @@ -654,7 +655,7 @@ LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = SD.ORDER_CODE LEFT JOIN BASE_PRODUCTLINE B2 ON B2.WORK_CENTER_CODE = BO.WORK_CENTER_CODE LEFT JOIN BASE_PRODUCTLINE ST ON ST.EXECUTION_SORT = SD.EXECUTION_SORT - + WHERE BO.ORDER_AMOUNT != BO.COMPLETE_AMOUNT AND B2.PRODUCT_LINE_CODE = #{productLineCode} @@ -667,7 +668,6 @@ and BO.MATERIAL_NAME like concat(concat('%', #{PRODUCT_NAME}), '%') - ORDER BY SD.COMPLETE_DATE