Commit 24d85c79 by chongli

销售发票提交重复处理

parent de291c39
......@@ -19,6 +19,12 @@ public class InvoiceOrderInfoDao extends GenericHibernateDao<InvoiceOrderInfo, I
return result;
}
public List<InvoiceOrderInfo> findByOrderNo(String orderNo){
Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
criteria.add(Restrictions.eq("orderNo", orderNo));
List<InvoiceOrderInfo> result = criteria.list();
return result;
}
public int deleteByRequestId(Integer rquestId){
Query query = this.getSession().createQuery("delete InvoiceOrderInfo where requestId=:requestId");
......
......@@ -18,8 +18,8 @@ public class InvoiceRequestDao extends GenericHibernateDao<InvoiceRequest, Integ
InvoiceRequestQuery queryBean = (InvoiceRequestQuery) queryCon;
Criteria criteria = this.getCriteria(InvoiceRequest.class);
if (null != queryBean.getContactName() && !"".equals(queryBean.getContactName())) {
criteria.add(Restrictions.like("contactName", queryBean.getContactName(), MatchMode.ANYWHERE));
if (null != queryBean.getContactTel() && !"".equals(queryBean.getContactTel())) {
criteria.add(Restrictions.like("contactTel", queryBean.getContactTel(), MatchMode.ANYWHERE));
}
if (null != queryBean.getRequestPerson()&& !"".equals(queryBean.getRequestPerson())) {
criteria.add(Restrictions.like("requestPerson", queryBean.getRequestPerson(), MatchMode.ANYWHERE));
......@@ -57,8 +57,8 @@ public class InvoiceRequestDao extends GenericHibernateDao<InvoiceRequest, Integ
InvoiceRequestQuery queryBean = (InvoiceRequestQuery) queryCon;
Criteria criteria = this.getCriteria(InvoiceRequest.class);
if (null != queryBean.getContactName() && !"".equals(queryBean.getContactName())) {
criteria.add(Restrictions.like("contactName", queryBean.getContactName(), MatchMode.ANYWHERE));
if (null != queryBean.getContactTel() && !"".equals(queryBean.getContactTel())) {
criteria.add(Restrictions.like("contactTel", queryBean.getContactTel(), MatchMode.ANYWHERE));
}
if (null != queryBean.getRequestPerson()&& !"".equals(queryBean.getRequestPerson())) {
criteria.add(Restrictions.like("requestPerson", queryBean.getRequestPerson(), MatchMode.ANYWHERE));
......
......@@ -26,20 +26,37 @@ public class InvoiceRequestService extends GenericService<InvoiceRequestDao, Inv
public Integer save(InvoiceRequestBean invoiceRequestBean) {
boolean haveInvoice = false;
List<InvoiceOrderInfoBean> invoiceOrderInfos = invoiceRequestBean.getInvoiceOrderInfoBeans();
if(invoiceOrderInfos!=null){
for(InvoiceOrderInfoBean invoiceOrderInfoBean:invoiceOrderInfos){
List<InvoiceOrderInfo> list = invoiceOrderInfoDao.findByOrderNo(invoiceOrderInfoBean.getOrderNo());
if(list!=null&&list.size()>0){
haveInvoice=true;
break;
}
}
}
if(!haveInvoice){
InvoiceRequest invoiceRequest = new InvoiceRequest();
BeanConverter.copyProperties(invoiceRequest, invoiceRequestBean);
invoiceRequest.setCreateTime(new Date());
invoiceRequest.setStatus(1);
Integer invoiceRequestId = invoiceRequestDao.save(invoiceRequest);
List<InvoiceOrderInfoBean> invoiceOrderInfos = invoiceRequestBean.getInvoiceOrderInfoBeans();
if(invoiceOrderInfos!=null){
for(InvoiceOrderInfoBean invoiceOrderInfoBean:invoiceOrderInfos){
InvoiceOrderInfo invoiceOrderInfo = new InvoiceOrderInfo();
BeanConverter.copyProperties(invoiceOrderInfo, invoiceOrderInfoBean);
invoiceOrderInfo.setRequestId(invoiceRequestId);
List<InvoiceOrderInfo> list = invoiceOrderInfoDao.findByOrderNo(invoiceOrderInfoBean.getOrderNo());
invoiceOrderInfoDao.save(invoiceOrderInfo);
}
}
}
return 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment