|
@@ -849,10 +849,14 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
|
849
|
849
|
createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
|
850
|
850
|
}
|
851
|
851
|
|
852
|
|
- // 原始合同id.
|
|
852
|
+ // 原始合同id.
|
853
|
853
|
if (deliveryStorageNotice.getRootContractBid() != null) {
|
854
|
854
|
createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
|
855
|
855
|
}
|
|
856
|
+ //合同编号.
|
|
857
|
+ if (StringUtils.isNotBlank(deliveryStorageNotice.getContract())) {
|
|
858
|
+ createCriteria.andContractEqualTo(deliveryStorageNotice.getContract());
|
|
859
|
+ }
|
856
|
860
|
//库ID
|
857
|
861
|
if (deliveryStorageNotice.getOrgId() != null) {
|
858
|
862
|
createCriteria.andOrgIdEqualTo(deliveryStorageNotice.getOrgId());
|