|
|
@@ -260,7 +260,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
String sno=null;
|
|
|
if (StringUtils.isBlank(s)||s.length()<13) {
|
|
|
- t.setContractNo(""+mp.get("abbreviation")+"-"+y+"0001");
|
|
|
+ String cn=""+mp.get("abbreviation")+"-"+y+"0001";
|
|
|
+ cn=iterationNo(cn,mp.get("abbreviation"),y,1);
|
|
|
+ t.setContractNo(cn);
|
|
|
}else {
|
|
|
int ty=Integer.parseInt(s.substring(s.indexOf("-")+1, s.length()-4));
|
|
|
int no=Integer.parseInt(s.substring(s.length()-4, s.length()));
|