|
|
@@ -586,7 +586,8 @@ public class PurchaseInquiryItem {
|
|
|
}
|
|
|
|
|
|
public void setErpstatus(Short erpstatus) {
|
|
|
- this.erpstatus = erpstatus;
|
|
|
+
|
|
|
+ this.erpstatus = erpstatus ;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -617,17 +618,20 @@ public class PurchaseInquiryItem {
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean isReplyable() {
|
|
|
+ if(this.erpstatus == null) {
|
|
|
+ this.erpstatus = Constant.YES;
|
|
|
+ }
|
|
|
if (this.inquiry.getEndDate() != null) {
|
|
|
return DateUtils
|
|
|
.compare(this.inquiry.getEndDate(), new Date(),
|
|
|
DateUtils.COMPARE_DAY) >= 0
|
|
|
&& (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
|
|
|
&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
|
|
|
- && this.agreed == null));
|
|
|
+ && this.agreed == null) && this.erpstatus != Constant.NO);
|
|
|
}
|
|
|
return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
|
|
|
&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
|
|
|
- && this.agreed == null) || this.erpstatus != Constant.NO;
|
|
|
+ && this.agreed == null) && this.erpstatus != Constant.NO;
|
|
|
}
|
|
|
|
|
|
public static List<PurchaseInquiry> distinct(List<PurchaseInquiryItem> purcitems) {
|
hejq