diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java index b8490f0c9c58f16fabba89b7869f2a3fa22c7353..1193587132db18e10149fd23ed4648a9368b8681 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java @@ -237,7 +237,7 @@ public class OrderToKyleBO { } public void setIsTicket(Boolean isTicket) { - isTicket = isTicket; + this.isTicket = isTicket; } public Integer getTransportType() { @@ -253,7 +253,7 @@ public class OrderToKyleBO { } public void setIsPick(Boolean isPick) { - isPick = isPick; + this.isPick = isPick; } public Boolean getIsDeliv() { @@ -261,7 +261,7 @@ public class OrderToKyleBO { } public void setIsDeliv(Boolean isDeliv) { - isDeliv = isDeliv; + this.isDeliv = isDeliv; } public String getDepartAddr() { diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java index e84894bf522a4aa466aae1364ed2fd01125c9d1f..c8e730b7b98b3cd93a2d98f54d68cd0cd3510449 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java @@ -337,7 +337,7 @@ public class OrderViewDAO { } public void setIsTicket(Boolean isTicket) { - isTicket = isTicket; + this.isTicket = isTicket; } public Integer getTransportType() { @@ -353,7 +353,7 @@ public class OrderViewDAO { } public void setIsPick(Boolean isPick) { - isPick = isPick; + this.isPick = isPick; } public Boolean getIsDeliv() { @@ -361,7 +361,7 @@ public class OrderViewDAO { } public void setIsDeliv(Boolean isDeliv) { - isDeliv = isDeliv; + this.isDeliv = isDeliv; } public String getDepartAddr() { @@ -388,30 +388,6 @@ public class OrderViewDAO { this.pickTime = pickTime; } - public Boolean getTicket() { - return isTicket; - } - - public void setTicket(Boolean ticket) { - isTicket = ticket; - } - - public Boolean getPick() { - return isPick; - } - - public void setPick(Boolean pick) { - isPick = pick; - } - - public Boolean getDeliv() { - return isDeliv; - } - - public void setDeliv(Boolean deliv) { - isDeliv = deliv; - } - public Integer getPayStatus() { return payStatus; } diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml index 148d72ecb8772d32c4c53a955a5acc5dffbcd70f..8a91c4de2cddae795e5611c206b1d81965214a51 100644 --- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml @@ -81,10 +81,10 @@ soau.audit_status AS auditStatus, soau.id AS auditId, soau.comment AS auditComment, - so.is_ticket AS isTicket, + so.is_ticket AS is_ticket, so.transport_type AS transportType, - so.is_pick AS isPick, - so.is_deliv AS isDeliv, + so.is_pick AS is_pick, + so.is_deliv AS is_deliv, soa.depart_addr AS departAddr, soa.dest_addr AS destAddr, so.pick_time AS pickTime,