|
@@ -362,9 +362,11 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
if (releaseProductByBatch.compareSameProductTagInfo(byBatch)) {
|
|
if (releaseProductByBatch.compareSameProductTagInfo(byBatch)) {
|
|
|
releaseProductByBatch.setTag("");
|
|
releaseProductByBatch.setTag("");
|
|
|
releaseProductByBatch.setTagstr("");
|
|
releaseProductByBatch.setTagstr("");
|
|
|
- releaseProductByBatch.addErrmsg(ErrorInfoConstant.REPEAT_IN_EXCEL.getInfo());
|
|
|
|
|
- releaseProductByBatch.setReleaseStatus(ReleaseStatus.had_exists.getPhrase());
|
|
|
|
|
- releaseProductByBatch.setReleaseCode(ReleaseStatus.had_exists.value());
|
|
|
|
|
|
|
+ if (!releaseProductByBatch.getErrmsg().contains(ErrorInfoConstant.REPEAT_IN_EXCEL.getInfo())) {
|
|
|
|
|
+ releaseProductByBatch.addErrmsg(ErrorInfoConstant.REPEAT_IN_EXCEL.getInfo());
|
|
|
|
|
+ releaseProductByBatch.setReleaseStatus(ReleaseStatus.had_exists.getPhrase());
|
|
|
|
|
+ releaseProductByBatch.setReleaseCode(ReleaseStatus.had_exists.value());
|
|
|
|
|
+ }
|
|
|
if (releaseProductByBatch.getErrmsg().substring(0, 1).equals(",")) {
|
|
if (releaseProductByBatch.getErrmsg().substring(0, 1).equals(",")) {
|
|
|
releaseProductByBatch.setErrmsg(releaseProductByBatch.getErrmsg().substring(1));
|
|
releaseProductByBatch.setErrmsg(releaseProductByBatch.getErrmsg().substring(1));
|
|
|
}
|
|
}
|