|
|
@@ -807,13 +807,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ot.setSplitStatus(cd.getSplitStatus());
|
|
|
if (cd.getSplitStatus()==2){
|
|
|
Integer tid;
|
|
|
- if (cd.getTid()!=null){
|
|
|
- tid=cd.getTid();
|
|
|
- }else{
|
|
|
- tid=input.get(cd.getChangeSplitSuper());
|
|
|
+ if (cd.getSplitSuper()!=null){
|
|
|
+ ot.setSplitSuper(cd.getSplitSuper());
|
|
|
+ }else {
|
|
|
+ if (cd.getTid()!=null){
|
|
|
+ tid=cd.getTid();
|
|
|
+ }else{
|
|
|
+ tid=input.get(cd.getChangeSplitSuper());
|
|
|
+ }
|
|
|
+ if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
|
|
|
+ ot.setSplitSuper(tid);
|
|
|
}
|
|
|
- if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
|
|
|
- ot.setSplitSuper(tid);
|
|
|
}
|
|
|
if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
|
|
|
if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
|