|
|
@@ -310,7 +310,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (nb.getType()==OrderChangeType.ZS.getCode()){
|
|
|
boolean flag=pushApproval(nb, dep,remarks);
|
|
|
if (flag) return 1;
|
|
|
- }if (nb.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
+ }else if (nb.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
completeChange(remarks, nb);
|
|
|
return 1;
|
|
|
}else {
|
|
|
@@ -392,13 +392,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
|
|
|
private boolean pushApproval(NewOrderChangeBo nb, Department dep,String remarks) {
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
+ Date date = new Date();
|
|
|
+ date.setTime(date.getTime()+500);
|
|
|
if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
|
|
|
nb.setProcessState(OrderChangeProcess.DSZ.getCode());
|
|
|
}else {
|
|
|
if (dep.getApproval()==1){
|
|
|
nb.setProcessState(OrderChangeProcess.TPSH.getCode());
|
|
|
}else {
|
|
|
- addOrderChangeLog("部门特批审核人未设置,跳过特批审核", 2, nb.getOrderNo(), nb.getId());
|
|
|
+ addOrderChangeLog("部门特批审核人未设置,跳过特批审核", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
|
|
|
completeChange(remarks,nb);
|
|
|
return true;
|
|
|
}
|
|
|
@@ -460,13 +462,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
|
|
|
private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {
|
|
|
- addOrderChangeLog(remarks,status,orderNo,id,null);
|
|
|
+ addOrderChangeLog(remarks,status,orderNo,id,null,null);
|
|
|
}
|
|
|
-
|
|
|
private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id,Date date) {
|
|
|
+ addOrderChangeLog(remarks,status,orderNo,id,date,null);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id,Date date,String aid) {
|
|
|
if (date ==null)date=new Date();
|
|
|
+ if (aid ==null)aid=TokenManager.getAdminId();
|
|
|
OrderChangeLog ocl = new OrderChangeLog();
|
|
|
- ocl.setAuditor(TokenManager.getAdminId());
|
|
|
+ ocl.setAuditor(aid);
|
|
|
ocl.setOrderNo(orderNo);
|
|
|
ocl.setRemarks(remarks);
|
|
|
ocl.setChangeId(id);
|