|
|
@@ -67,6 +67,8 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
public int updateServiceOrder(TOrderInvoice o) {
|
|
|
sendNoticeAndEmail(o);
|
|
|
addInvoiceLog(o.getId(),5);
|
|
|
+ o.setApproval(1);
|
|
|
+ o.setStatus(1);
|
|
|
return tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
|
|
|
}
|
|
|
/**
|
|
|
@@ -183,7 +185,6 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
TOrderNew o=tOrderNewMapper.selectByPrimaryKey(t2.getOrderNo());
|
|
|
Integer type=null;
|
|
|
if(examine==3){
|
|
|
- if(t2.getApproval()==2)t.setApproval(1);
|
|
|
type=NoticeStatus.ORDER_INVPICE_NO.getCode();
|
|
|
aids.add(o.getSalesmanId());
|
|
|
addInvoiceLog(id,2);
|