|
@ -72,27 +72,28 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai |
|
|
boolean isMatched = true; |
|
|
boolean isMatched = true; |
|
|
//去向部门
|
|
|
//去向部门
|
|
|
if (bill.getZzbm() != null && !bill.getZzbm().isEmpty()) { |
|
|
if (bill.getZzbm() != null && !bill.getZzbm().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getZzbm(), bill.getZzbm()); |
|
|
isMatched = Objects.equals(inventory.getZzbm(), bill.getZzbm()); |
|
|
} |
|
|
} |
|
|
//仓库编码
|
|
|
//仓库编码
|
|
|
if (bill.getCkbm() != null && !bill.getCkbm().isEmpty()) { |
|
|
if (bill.getCkbm() != null && !bill.getCkbm().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getCkbm(), bill.getCkbm()); |
|
|
isMatched = Objects.equals(inventory.getCkbm(), bill.getCkbm()); |
|
|
} |
|
|
} |
|
|
//库位编码
|
|
|
//库位编码
|
|
|
if (bill.getTjkwbm() != null && !bill.getTjkwbm().isEmpty()) { |
|
|
if (bill.getTjkwbm() != null && !bill.getTjkwbm().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getTjkwbm(), bill.getTjkwbm()); |
|
|
isMatched = Objects.equals(inventory.getTjkwbm(), bill.getTjkwbm()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//物料编码
|
|
|
//物料编码
|
|
|
if (bill.getWlbm() != null && !bill.getWlbm().isEmpty()) { |
|
|
if (bill.getWlbm() != null && !bill.getWlbm().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getWlbm(), bill.getWlbm()); |
|
|
isMatched = Objects.equals(inventory.getWlbm(), bill.getWlbm()); |
|
|
} |
|
|
} |
|
|
// 批次
|
|
|
// 批次
|
|
|
if (bill.getPc() != null && !bill.getPc().isEmpty()) { |
|
|
if (bill.getPc() != null && !bill.getPc().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getPc(), bill.getPc()); |
|
|
isMatched = Objects.equals(inventory.getPc(), bill.getPc()); |
|
|
} |
|
|
} |
|
|
// 跟踪号
|
|
|
// 跟踪号
|
|
|
if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) { |
|
|
if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) { |
|
|
isMatched &= Objects.equals(inventory.getTrackno(), bill.getTrackno()); |
|
|
isMatched = Objects.equals(inventory.getTrackno(), bill.getTrackno()); |
|
|
} |
|
|
} |
|
|
return isMatched; |
|
|
return isMatched; |
|
|
}) |
|
|
}) |
|
|