|
|
|
@ -7,6 +7,8 @@ import com.xujie.sys.common.utils.R; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProjectInfoTrackingData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProjectPartTrackingData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingBatchUpdateData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigBatchData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; |
|
|
|
import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; |
|
|
|
@ -20,9 +22,13 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.LinkedHashSet; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Objects; |
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
/** |
|
|
|
* 产品打样记录跟踪 Service 实现 |
|
|
|
@ -31,6 +37,27 @@ import java.util.Objects; |
|
|
|
@Service |
|
|
|
public class SampleProofTrackingServiceImpl implements SampleProofTrackingService { |
|
|
|
|
|
|
|
/** |
|
|
|
* 工序编码白名单:用于过滤非法工序编码,避免脏数据写入配置表后导致前端渲染异常。 |
|
|
|
*/ |
|
|
|
private static final List<String> PROCESS_CODE_ORDER = Arrays.asList( |
|
|
|
"rawMaterial", |
|
|
|
"cylinderCutter", |
|
|
|
"lamination", |
|
|
|
"printing", |
|
|
|
"etching", |
|
|
|
"slittingPacking", |
|
|
|
"bonding", |
|
|
|
"cl60Cl822", |
|
|
|
"spotting", |
|
|
|
"encoding", |
|
|
|
"dieCut", |
|
|
|
"inspection", |
|
|
|
"deliveryPackage" |
|
|
|
); |
|
|
|
|
|
|
|
private static final Set<String> PROCESS_CODE_SET = new LinkedHashSet<>(PROCESS_CODE_ORDER); |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SampleProofTrackingMapper sampleProofTrackingMapper; |
|
|
|
|
|
|
|
@ -432,6 +459,78 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic |
|
|
|
return sampleProofTrackingMapper.getProcessHistory(data.getTrackingId(), data.getProcessCode()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<ProofTrackingBuProcessConfigData> queryBuProcessConfig(ProofTrackingData data) { |
|
|
|
if (data == null || isBlank(data.getSite())) { |
|
|
|
throw new RuntimeException("工厂不能为空"); |
|
|
|
} |
|
|
|
List<ProofTrackingBuProcessConfigData> rows = sampleProofTrackingMapper.selectBuProcessConfigBySite(data.getSite().trim()); |
|
|
|
if (rows == null || rows.isEmpty()) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
rows.forEach(row -> { |
|
|
|
List<String> validCodes = normalizeProcessCodes(splitProcessCodes(row.getProcessCodesCsv())); |
|
|
|
boolean showAll = !"N".equalsIgnoreCase(row.getShowAllFlag()) || validCodes.isEmpty(); |
|
|
|
row.setShowAll(showAll); |
|
|
|
row.setProcessCodes(showAll ? new ArrayList<>(PROCESS_CODE_ORDER) : validCodes); |
|
|
|
}); |
|
|
|
return rows; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void saveBuProcessConfig(ProofTrackingBuProcessConfigBatchData data) { |
|
|
|
if (data == null || isBlank(data.getSite())) { |
|
|
|
throw new RuntimeException("工厂不能为空"); |
|
|
|
} |
|
|
|
String site = data.getSite().trim(); |
|
|
|
String updateBy = resolveOperateUser(data.getUpdateBy(), null); |
|
|
|
if (data.getRows() == null || data.getRows().isEmpty()) { |
|
|
|
throw new RuntimeException("请至少提供一条事业部配置"); |
|
|
|
} |
|
|
|
for (ProofTrackingBuProcessConfigData row : data.getRows()) { |
|
|
|
if (row == null || isBlank(row.getBuNo())) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
String buNo = normalizeBuNo(row.getBuNo(), site); |
|
|
|
if (isBlank(buNo)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
List<String> validCodes = normalizeProcessCodes(row.getProcessCodes()); |
|
|
|
boolean showAll = Boolean.TRUE.equals(row.getShowAll()) |
|
|
|
|| validCodes.isEmpty() |
|
|
|
|| validCodes.size() >= PROCESS_CODE_ORDER.size(); |
|
|
|
if (showAll) { |
|
|
|
// 默认行为是“展示全部工序”,因此展示全部时直接删配置,避免后续工序扩展时还要同步补历史配置。 |
|
|
|
sampleProofTrackingMapper.deleteBuProcessConfig(site, buNo); |
|
|
|
continue; |
|
|
|
} |
|
|
|
ProofTrackingBuProcessConfigData saveData = new ProofTrackingBuProcessConfigData(); |
|
|
|
saveData.setSite(site); |
|
|
|
saveData.setBuNo(buNo); |
|
|
|
saveData.setProcessCodesCsv(String.join(",", validCodes)); |
|
|
|
saveData.setShowAllFlag("N"); |
|
|
|
saveData.setCreateBy(updateBy); |
|
|
|
saveData.setUpdateBy(updateBy); |
|
|
|
// 受 Druid WallFilter 限制,Mapper 中不使用 IF/BEGIN 多语句块,改为服务层 delete+insert 组合保证幂等。 |
|
|
|
sampleProofTrackingMapper.deleteBuProcessConfig(site, buNo); |
|
|
|
sampleProofTrackingMapper.insertBuProcessConfig(saveData); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private String normalizeBuNo(String buNo, String site) { |
|
|
|
if (isBlank(buNo)) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
String rawBuNo = buNo.trim(); |
|
|
|
int splitIdx = rawBuNo.indexOf('_'); |
|
|
|
if (splitIdx < 1 || splitIdx >= rawBuNo.length() - 1) { |
|
|
|
return rawBuNo; |
|
|
|
} |
|
|
|
// 配置表中的BU统一存“去掉site前缀”的编码,避免跨site前缀导致同一BU配置不一致。 |
|
|
|
return rawBuNo.substring(splitIdx + 1); |
|
|
|
} |
|
|
|
|
|
|
|
private void validateOneKeyData(ProofTrackingData data) { |
|
|
|
if (isBlank(data.getSite())) { |
|
|
|
throw new RuntimeException("工厂不能为空"); |
|
|
|
@ -641,6 +740,41 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic |
|
|
|
return projectNo + "-" + partNo + "-" + suffix; |
|
|
|
} |
|
|
|
|
|
|
|
private List<String> splitProcessCodes(String processCodesCsv) { |
|
|
|
List<String> rows = new ArrayList<>(); |
|
|
|
if (isBlank(processCodesCsv)) { |
|
|
|
return rows; |
|
|
|
} |
|
|
|
String[] splitRows = processCodesCsv.split(","); |
|
|
|
for (String item : splitRows) { |
|
|
|
if (isBlank(item)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
rows.add(item.trim()); |
|
|
|
} |
|
|
|
return rows; |
|
|
|
} |
|
|
|
|
|
|
|
private List<String> normalizeProcessCodes(List<String> processCodes) { |
|
|
|
List<String> rows = new ArrayList<>(); |
|
|
|
if (processCodes == null || processCodes.isEmpty()) { |
|
|
|
return rows; |
|
|
|
} |
|
|
|
for (String code : processCodes) { |
|
|
|
if (isBlank(code)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
String normalizedCode = code.trim(); |
|
|
|
if (!PROCESS_CODE_SET.contains(normalizedCode)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
if (!rows.contains(normalizedCode)) { |
|
|
|
rows.add(normalizedCode); |
|
|
|
} |
|
|
|
} |
|
|
|
return rows; |
|
|
|
} |
|
|
|
|
|
|
|
private String resolveOperateUser(String first, String second) { |
|
|
|
if (!isBlank(first)) { |
|
|
|
return first; |
|
|
|
|