Merge pull request 'demand: tms-运输管理-货物组批次-分批逻辑修复' (#262) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/262
This commit is contained in:
heyu 2025-12-10 17:30:29 +08:00
commit 924bfb69f2

View File

@ -246,10 +246,10 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
boolean isBatchParcelQtyEqual = Objects.equals(matchingBatch.getTotalParcelQty(), boolean isBatchParcelQtyEqual = Objects.equals(matchingBatch.getTotalParcelQty(),
itemDtl.getBatchParcelQty()); itemDtl.getBatchParcelQty());
if (!isBatchWeightEqual || !isBatchVolumeEqual || !isBatchParcelQtyEqual) { // if (!isBatchWeightEqual || !isBatchVolumeEqual || !isBatchParcelQtyEqual) {
throw new EmisBizError(EmisBizErrorType.FAIL, // throw new EmisBizError(EmisBizErrorType.FAIL,
itemDtl.getBillCode() + "的批次重量、体积、件数与批次" + matchingBatch.getBatchNo() + "不一致,请检查后重新录入"); // itemDtl.getBillCode() + "的批次重量、体积、件数与批次" + matchingBatch.getBatchNo() + "不一致,请检查后重新录入");
} // }
} }
} }