|
|
@@ -681,7 +681,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setApplicant(t.getApplicant());
|
|
|
noc.setStatus(1);//订单置为正常
|
|
|
noc.setDepName(t.getDepName());
|
|
|
- addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId());
|
|
|
+ Date date =new Date();
|
|
|
+ addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId(),date);
|
|
|
if(t.getType()!=0)chekeAmout(t);
|
|
|
TOrderNew ton=new TOrderNew();
|
|
|
ton.setOrderNo(noc.getOrderNo());
|
|
|
@@ -689,7 +690,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(ton);
|
|
|
TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (t.getType()!=OrderChangeType.JBGGT.getCode()){
|
|
|
- Date date =new Date();
|
|
|
if (tOrderNew.getManagerName()!=null){
|
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
}else {
|