|
@@ -13,6 +13,7 @@ import java.util.UUID;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
@@ -45,18 +46,6 @@ import com.goafanti.common.dao.TTaskMidMapper;
|
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
-import com.goafanti.common.model.OrderChangeLog;
|
|
|
|
|
-import com.goafanti.common.model.OrderExamine;
|
|
|
|
|
-import com.goafanti.common.model.OrderRefundInvoice;
|
|
|
|
|
-import com.goafanti.common.model.TChangeDun;
|
|
|
|
|
-import com.goafanti.common.model.TChangeTask;
|
|
|
|
|
-import com.goafanti.common.model.TOrderBillNew;
|
|
|
|
|
-import com.goafanti.common.model.TOrderNew;
|
|
|
|
|
-import com.goafanti.common.model.TOrderTask;
|
|
|
|
|
-import com.goafanti.common.model.TTaskMid;
|
|
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
|
|
-import com.goafanti.common.model.NewOrderChange;
|
|
|
|
|
-import com.goafanti.common.model.NewOrderDun;
|
|
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
import com.goafanti.common.utils.StringUtils;
|
|
@@ -97,7 +86,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private TOrderLogMapper tOrderLogMapper;
|
|
|
|
|
|
|
+ private TOrderLogMapper tOrderLogMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TOrderTaskMapper tOrderTaskMapper;
|
|
private TOrderTaskMapper tOrderTaskMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -134,9 +123,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PushOrderService pushOrderService;
|
|
private PushOrderService pushOrderService;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Logger logger = LoggerFactory.getLogger(OrderChangeServiceImpl.class);
|
|
Logger logger = LoggerFactory.getLogger(OrderChangeServiceImpl.class);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
|
|
public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
|
|
|
TOrderNew ton=new TOrderNew();
|
|
TOrderNew ton=new TOrderNew();
|
|
@@ -212,7 +201,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/*
|
|
/*
|
|
|
* 新增审核流程中的
|
|
* 新增审核流程中的
|
|
|
*/
|
|
*/
|
|
@@ -238,8 +227,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
orderExamineMapper.insertSelective(o);
|
|
orderExamineMapper.insertSelective(o);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -327,7 +316,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
if(nb.getStatus()==3) {
|
|
if(nb.getStatus()==3) {
|
|
|
nb.setStatus(1);//如果驳回数据则改为正常数据
|
|
nb.setStatus(1);//如果驳回数据则改为正常数据
|
|
@@ -350,14 +339,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (rejectState==3) {
|
|
if (rejectState==3) {
|
|
|
if (orderExamineMapper.checkCountStatus(orderNo,1,null)<1) nb.setProcessState(nb.getProcessState()+1);
|
|
if (orderExamineMapper.checkCountStatus(orderNo,1,null)<1) nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//如果驳回到技术经理之前则将审核表中状态跳回
|
|
//如果驳回到技术经理之前则将审核表中状态跳回
|
|
|
if(nb.getProcessState()==3) {
|
|
if(nb.getProcessState()==3) {
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,1);
|
|
orderExamineMapper.updateByOrderNo(orderNo,1);
|
|
|
}else if (nb.getProcessState()<3) {
|
|
}else if (nb.getProcessState()<3) {
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
|
ocl.setAuditor(TokenManager.getAdminId());
|
|
ocl.setAuditor(TokenManager.getAdminId());
|
|
@@ -370,7 +359,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
private void sendNotice(Integer status,NewOrderChangeBo nb) {
|
|
private void sendNotice(Integer status,NewOrderChangeBo nb) {
|
|
|
//0发起2通过 3驳回
|
|
//0发起2通过 3驳回
|
|
|
Integer type=0;
|
|
Integer type=0;
|
|
@@ -379,10 +368,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if(status==3)type=NoticeStatus.ORDER_CHANGE_NO.getCode();
|
|
if(status==3)type=NoticeStatus.ORDER_CHANGE_NO.getCode();
|
|
|
//获取发起人与发起人部门
|
|
//获取发起人与发起人部门
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
|
|
+ //获取客户信息
|
|
|
|
|
+ TOrderNewBo o=tOrderNewMapper.getSaleIdByOno(nb.getOrderNo());
|
|
|
//获取接收者
|
|
//获取接收者
|
|
|
- //流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
|
|
|
|
|
|
|
+ //流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长
|
|
|
List<String> alist = new ArrayList<>();
|
|
List<String> alist = new ArrayList<>();
|
|
|
- TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
|
|
|
|
+ //获取部门负责财务人员
|
|
|
switch (nb.getProcessState()) {
|
|
switch (nb.getProcessState()) {
|
|
|
case 0:
|
|
case 0:
|
|
|
alist.add(o.getSalesmanId());
|
|
alist.add(o.getSalesmanId());
|
|
@@ -402,8 +393,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 5:
|
|
case 5:
|
|
|
- alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
|
|
|
|
|
- break;
|
|
|
|
|
|
|
+ alist.add(o.getFinanceId());
|
|
|
|
|
+ break;
|
|
|
case 6:
|
|
case 6:
|
|
|
for (Admin admin : adminMapper.getAdminRoleList("财务管理员")) {
|
|
for (Admin admin : adminMapper.getAdminRoleList("财务管理员")) {
|
|
|
alist.add(admin.getId());
|
|
alist.add(admin.getId());
|
|
@@ -411,7 +402,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
break;
|
|
break;
|
|
|
case 7:
|
|
case 7:
|
|
|
if(nb.getStatus()==2) {
|
|
if(nb.getStatus()==2) {
|
|
|
- alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
|
|
|
|
|
|
|
+ alist.add(o.getFinanceId());
|
|
|
}else {
|
|
}else {
|
|
|
for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
|
|
for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
|
|
|
alist.add(admin.getId());
|
|
alist.add(admin.getId());
|
|
@@ -420,22 +411,18 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
break;
|
|
break;
|
|
|
case 8:
|
|
case 8:
|
|
|
if(nb.getStatus()==2) {
|
|
if(nb.getStatus()==2) {
|
|
|
- alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
|
|
|
|
|
|
|
+ alist.add(o.getFinanceId());
|
|
|
}else {
|
|
}else {
|
|
|
for (Admin admin : adminMapper.getAdminRoleList("运营决策者")) {
|
|
for (Admin admin : adminMapper.getAdminRoleList("运营决策者")) {
|
|
|
alist.add(admin.getId());
|
|
alist.add(admin.getId());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
- case 9:
|
|
|
|
|
- alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
|
|
|
|
|
- break;
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
//发送站内信息与邮件
|
|
//发送站内信息与邮件
|
|
|
- orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), TokenManager.getAdminId(),0);
|
|
|
|
|
|
|
+ orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o, TokenManager.getAdminId(),0);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 变更完成复制出原订单镜像
|
|
* 变更完成复制出原订单镜像
|
|
|
*/
|
|
*/
|
|
@@ -443,7 +430,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
|
|
List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
|
|
|
List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
|
|
List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
|
|
|
- List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
|
|
|
|
|
|
|
+ List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
|
|
|
String newOrderNo=idGenerator.generateId().toString();
|
|
String newOrderNo=idGenerator.generateId().toString();
|
|
|
t1.setOrderNo(newOrderNo);
|
|
t1.setOrderNo(newOrderNo);
|
|
|
nb.setUsedOrder(newOrderNo);
|
|
nb.setUsedOrder(newOrderNo);
|
|
@@ -491,7 +478,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
orderNew.setPrimaryOrder(newOrderNo);
|
|
orderNew.setPrimaryOrder(newOrderNo);
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
|
|
tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public boolean checkOderNo(String orderNo) {
|
|
public boolean checkOderNo(String orderNo) {
|
|
|
int i=newOrderChangeMapper.checkOderNo(orderNo);
|
|
int i=newOrderChangeMapper.checkOderNo(orderNo);
|
|
@@ -567,9 +554,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
}
|
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
|
- return 1;
|
|
|
|
|
|
|
+ return 1;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
private void chekeAmout(NewOrderChangeBo t) {
|
|
private void chekeAmout(NewOrderChangeBo t) {
|
|
|
BigDecimal amout=t.getTotalAmount();
|
|
BigDecimal amout=t.getTotalAmount();
|
|
|
List<TChangeTaskOut> list = selectChangeTask(t.getId());
|
|
List<TChangeTaskOut> list = selectChangeTask(t.getId());
|
|
@@ -589,7 +576,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
throw new BusinessException("收款节点金额总和不等于合同总金额。");
|
|
throw new BusinessException("收款节点金额总和不等于合同总金额。");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 判断变更项目是否拆分父子数量是否一直
|
|
* 判断变更项目是否拆分父子数量是否一直
|
|
@@ -600,7 +587,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
//x记录父值y记录子值
|
|
//x记录父值y记录子值
|
|
|
int x=0;
|
|
int x=0;
|
|
|
int y=0;
|
|
int y=0;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
for (TChangeTaskOut tcto : list) {
|
|
for (TChangeTaskOut tcto : list) {
|
|
|
if (tcto.getSplitStatus()==1&&tcto.getType()!=3) {
|
|
if (tcto.getSplitStatus()==1&&tcto.getType()!=3) {
|
|
|
x+=tcto.getCommodityQuantity();
|
|
x+=tcto.getCommodityQuantity();
|
|
@@ -634,19 +621,42 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
changeAdopt(nb);
|
|
changeAdopt(nb);
|
|
|
TOrderNew o=pushChange(nb);
|
|
TOrderNew o=pushChange(nb);
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
|
|
+ TOrderNewBo order=tOrderNewMapper.getSaleIdByOno(nb.getOrderNo());
|
|
|
|
|
+ List<String> alist = getAllAid(nb.getId());
|
|
|
|
|
+ orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 获取除发起者意外所有审核者
|
|
|
|
|
+ * @param id
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ private List<String> getAllAid(Integer id) {
|
|
|
|
|
+ List<String> alist = new ArrayList<>();
|
|
|
|
|
+ List<String>newl=new ArrayList<>();
|
|
|
|
|
+ List<OrderChangeLogBo> list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
|
|
|
|
|
+ for (OrderChangeLogBo log : list) {
|
|
|
|
|
+ if (!log.getStatus().equals(0)){
|
|
|
|
|
+ if (!newl.contains(log.getAuditor())){
|
|
|
|
|
+ newl.add(log.getAuditor());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ alist.addAll(newl);
|
|
|
|
|
+ return alist;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public int pushCompleteRefund(NewOrderChangeBo nb) {
|
|
public int pushCompleteRefund(NewOrderChangeBo nb) {
|
|
|
nb.setStatus(6);
|
|
nb.setStatus(6);
|
|
|
NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
|
|
NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
|
|
|
- TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nob.getOrderNo());
|
|
|
|
|
|
|
+ TOrderNewBo o=tOrderNewMapper.getSaleIdByOno(nob.getOrderNo());
|
|
|
List<String> alist = new ArrayList<>();
|
|
List<String> alist = new ArrayList<>();
|
|
|
alist.add(o.getSalesmanId());
|
|
alist.add(o.getSalesmanId());
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
- orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_YES.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
|
|
|
|
|
|
|
+ orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_YES.getCode(), o, TokenManager.getAdminId(),0);
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -687,7 +697,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
|
|
if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
|
|
|
i++;
|
|
i++;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
if (i==taskBos.size()) {
|
|
if (i==taskBos.size()) {
|
|
|
o.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
|
|
o.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
|
|
@@ -698,7 +708,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
o.setDeleteSign(0);
|
|
o.setDeleteSign(0);
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
|
- return o;
|
|
|
|
|
|
|
+ return o;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void pushTaskAndDun(Integer id,String orderNo) {
|
|
private void pushTaskAndDun(Integer id,String orderNo) {
|
|
@@ -724,7 +734,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ot.setCommodityPrice(cd.getCommodityPrice());
|
|
ot.setCommodityPrice(cd.getCommodityPrice());
|
|
|
ot.setCommodityQuantity(cd.getCommodityQuantity());
|
|
ot.setCommodityQuantity(cd.getCommodityQuantity());
|
|
|
tOrderTaskMapper.updateByPrimaryKeySelective(ot);
|
|
tOrderTaskMapper.updateByPrimaryKeySelective(ot);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}else if(cd.getType()==3) {
|
|
}else if(cd.getType()==3) {
|
|
|
tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
|
|
tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
|
|
|
}
|
|
}
|
|
@@ -760,8 +770,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public Map<String, Object> listOrderInvoiceAndBill(String orderNo) {
|
|
public Map<String, Object> listOrderInvoiceAndBill(String orderNo) {
|
|
|
Map<String, Object> map=new HashMap<>();
|
|
Map<String, Object> map=new HashMap<>();
|
|
@@ -817,21 +827,21 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
//返回名称及参数
|
|
//返回名称及参数
|
|
|
- response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes(),"iso-8859-1"));
|
|
|
|
|
|
|
+ response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes(),"iso-8859-1"));
|
|
|
response.setContentType("application/octet-stream;charset=utf-8");
|
|
response.setContentType("application/octet-stream;charset=utf-8");
|
|
|
// 返回数据流
|
|
// 返回数据流
|
|
|
- wb.write(out);
|
|
|
|
|
|
|
+ wb.write(out);
|
|
|
out.flush();
|
|
out.flush();
|
|
|
out.close();
|
|
out.close();
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
throw new BusinessException(new Error("表格生成错误。"));
|
|
throw new BusinessException(new Error("表格生成错误。"));
|
|
|
}finally {
|
|
}finally {
|
|
|
- out.flush();
|
|
|
|
|
- out.close();
|
|
|
|
|
|
|
+ out.flush();
|
|
|
|
|
+ out.close();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
public static String getProcessState(Integer processState,Integer status) {
|
|
public static String getProcessState(Integer processState,Integer status) {
|
|
|
String str="";
|
|
String str="";
|
|
|
if (processState == 0) {
|
|
if (processState == 0) {
|
|
@@ -929,7 +939,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (tt.getSplitStatus()==0) {
|
|
if (tt.getSplitStatus()==0) {
|
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
|
}else if (tt.getSplitStatus()==1) {
|
|
}else if (tt.getSplitStatus()==1) {
|
|
|
- //删除父类下所有的子类
|
|
|
|
|
|
|
+ //删除父类下所有的子类
|
|
|
tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
|
|
tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
|
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
|
}else if(tt.getSplitStatus()==2) {
|
|
}else if(tt.getSplitStatus()==2) {
|
|
@@ -971,15 +981,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return tChangeDunMapper.updateByPrimaryKeySelective(t);
|
|
return tChangeDunMapper.updateByPrimaryKeySelective(t);
|
|
|
}else if(t.getType()==3){
|
|
}else if(t.getType()==3){
|
|
|
if (t.getDid()!=null) {
|
|
if (t.getDid()!=null) {
|
|
|
- return tChangeDunMapper.updateByPrimaryKeySelective(t);
|
|
|
|
|
|
|
+ return tChangeDunMapper.updateByPrimaryKeySelective(t);
|
|
|
}else {
|
|
}else {
|
|
|
return tChangeDunMapper.deleteByPrimaryKey(t.getId());
|
|
return tChangeDunMapper.deleteByPrimaryKey(t.getId());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}else {
|
|
}else {
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1065,7 +1075,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return false;
|
|
return false;
|
|
|
}else {
|
|
}else {
|
|
|
return true;
|
|
return true;
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|