fanxw 3 months ago
parent
commit
4693f93196

+ 5 - 1
src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

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