|
@@ -2432,6 +2432,32 @@ public class MesProductRecordController extends BaseController {
|
|
|
}
|
|
}
|
|
|
mesProductRecord.getSqlMap().getOrder().setOrderBy("a.update_date desc");
|
|
mesProductRecord.getSqlMap().getOrder().setOrderBy("a.update_date desc");
|
|
|
Page<MesProductRecord> page = mesProductRecordService.findPage(mesProductRecord);
|
|
Page<MesProductRecord> page = mesProductRecordService.findPage(mesProductRecord);
|
|
|
|
|
+ List<MesProductRecord> recordList = page.getList();
|
|
|
|
|
+ if (!ListUtils.isEmpty(recordList)) {
|
|
|
|
|
+ Set<String> shortSnSet = new HashSet<>();
|
|
|
|
|
+ for (MesProductRecord record : recordList) {
|
|
|
|
|
+ String sn = record.getSn();
|
|
|
|
|
+ if (StringUtils.isNotBlank(sn) && sn.length() <= 19) {
|
|
|
|
|
+ shortSnSet.add(sn);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!shortSnSet.isEmpty()) {
|
|
|
|
|
+ MesProductHmb queryHmb = new MesProductHmb();
|
|
|
|
|
+ queryHmb.getSqlMap().getWhere().and("qsn", QueryType.IN, shortSnSet.toArray(new String[0]));
|
|
|
|
|
+ Map<String, String> longSnMap = new HashMap<>();
|
|
|
|
|
+ for (MesProductHmb hmb : mesProductHmbService.findList(queryHmb)) {
|
|
|
|
|
+ if (StringUtils.isNotBlank(hmb.getQsn()) && StringUtils.isNotBlank(hmb.getSn())) {
|
|
|
|
|
+ longSnMap.putIfAbsent(hmb.getQsn(), hmb.getSn());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ for (MesProductRecord record : recordList) {
|
|
|
|
|
+ String longSn = longSnMap.get(record.getSn());
|
|
|
|
|
+ if (StringUtils.isNotBlank(longSn)) {
|
|
|
|
|
+ record.setSn(longSn);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
for (int i=0;i<page.getList().size();i++){
|
|
for (int i=0;i<page.getList().size();i++){
|
|
|
MesTemplateItems mesTemplateItems = new MesTemplateItems();
|
|
MesTemplateItems mesTemplateItems = new MesTemplateItems();
|
|
|
mesTemplateItems.setId(page.getList().get(i).getTid());
|
|
mesTemplateItems.setId(page.getList().get(i).getTid());
|