|
|
@ -80,7 +80,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
|
|
|
|
for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
|
|
|
|
for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
|
|
|
|
boolean notScan;
|
|
|
|
boolean notScan;
|
|
|
|
if (Objects.equals(model.getSecondShipping(), true)) {
|
|
|
|
if (Objects.equals(model.getSecondShipping(), true)) {
|
|
|
|
notScan = Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.FALSE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn());
|
|
|
|
notScan = !Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.TRUE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
notScan = StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER);
|
|
|
|
notScan = StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|