|
|
|
|
@ -9,6 +9,7 @@ import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper; |
|
|
|
|
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper; |
|
|
|
|
import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper; |
|
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; |
|
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsTypeService; |
|
|
|
|
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; |
|
|
|
|
import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; |
|
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
|
@ -21,6 +22,7 @@ import java.util.ArrayList; |
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.regex.Pattern; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @Description: zy_cloths_component |
|
|
|
|
@ -33,6 +35,8 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private IZyProcessComponentService zyProcessComponentService; |
|
|
|
|
@Autowired |
|
|
|
|
private IZyClothsTypeService zyClothsTypeService; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private ZyClothsComponentMapper zyClothsComponentMapper; |
|
|
|
|
@ -57,15 +61,15 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM |
|
|
|
|
/** |
|
|
|
|
* 编码规则：服装类型（10）+序号（8） |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public String generateNumber(ZyClothsComponent zyClothsComponent) { |
|
|
|
|
String nums = zyClothsComponent.getClothsTypeId(); |
|
|
|
|
ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums); |
|
|
|
|
String nums1 = zyClothsType.getNums(); |
|
|
|
|
//String substring = nums.substring(nums.length() - 10);
|
|
|
|
|
String format = String.format("%08d", orderNumber()); |
|
|
|
|
return nums1 + format; |
|
|
|
|
} |
|
|
|
|
// @Override
|
|
|
|
|
// public String generateNumber(ZyClothsComponent zyClothsComponent) {
|
|
|
|
|
// String nums = zyClothsComponent.getClothsTypeId();
|
|
|
|
|
// ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
|
|
|
|
|
// String nums1 = zyClothsType.getNums();
|
|
|
|
|
// //String substring = nums.substring(nums.length() - 10);
|
|
|
|
|
// String format = String.format("%08d", orderNumber());
|
|
|
|
|
// return nums1 + format;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public ZyClothsComponentDetail queryDetail(String id) { |
|
|
|
|
@ -81,10 +85,15 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM |
|
|
|
|
return detail; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 编码规则：服装类型（10）+序号（8） |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public String sort(String id) { |
|
|
|
|
String nums = zyClothsTypeMapper.selectNumOne(id); |
|
|
|
|
String format = String.format("%08d", orderNumber()); |
|
|
|
|
List<ZyClothsComponent> components = this.list(); |
|
|
|
|
List<String> collect = components.stream().map(ZyClothsComponent::getNums).collect(Collectors.toList()); |
|
|
|
|
String format = String.format("%08d", zyClothsTypeService.getListMax(collect, 8)); |
|
|
|
|
return nums + format; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -125,24 +134,24 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Long orderNumber() { |
|
|
|
|
List<String> listString = zyClothsComponentMapper.selectNumsList2(); |
|
|
|
|
//System.err.println(listString);
|
|
|
|
|
List<Long> listLong = new ArrayList<>(); |
|
|
|
|
for (String nums : listString) { |
|
|
|
|
String REGEX = "[^0-9]"; |
|
|
|
|
String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim(); |
|
|
|
|
if (!StringUtils.hasText(newNums)) { |
|
|
|
|
newNums = "0"; |
|
|
|
|
} |
|
|
|
|
if (newNums.length() > 8) { |
|
|
|
|
String substring = nums.substring(nums.length() - 8); |
|
|
|
|
listLong.add(Long.valueOf(substring)); |
|
|
|
|
} else { |
|
|
|
|
listLong.add(Long.valueOf(newNums)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//System.out.println(listLong);
|
|
|
|
|
return Collections.max(listLong) + 1; |
|
|
|
|
} |
|
|
|
|
// public Long orderNumber() {
|
|
|
|
|
// List<String> listString = zyClothsComponentMapper.selectNumsList2();
|
|
|
|
|
// //System.err.println(listString);
|
|
|
|
|
// List<Long> listLong = new ArrayList<>();
|
|
|
|
|
// for (String nums : listString) {
|
|
|
|
|
// String REGEX = "[^0-9]";
|
|
|
|
|
// String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
|
|
|
|
|
// if (!StringUtils.hasText(newNums)) {
|
|
|
|
|
// newNums = "0";
|
|
|
|
|
// }
|
|
|
|
|
// if (newNums.length() > 8) {
|
|
|
|
|
// String substring = nums.substring(nums.length() - 8);
|
|
|
|
|
// listLong.add(Long.valueOf(substring));
|
|
|
|
|
// } else {
|
|
|
|
|
// listLong.add(Long.valueOf(newNums));
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// //System.out.println(listLong);
|
|
|
|
|
// return Collections.max(listLong) + 1;
|
|
|
|
|
// }
|
|
|
|
|
} |
|
|
|
|
|
