Merge branch 'master' of http://101.36.160.140:21044/depot-shanxi/depot-business-shanxi

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

@@ -794,6 +794,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             if (deliveryStorageNotice.getRootContractBid() != null) {
                 createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
             }
+            createCriteria.andChangingEqualTo("0");
         }
         
         // 审批通过时间倒序.
@@ -1099,6 +1100,8 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             	createCriteria1.andChangeRecordFlagEqualTo("0");
             }
         }
+        // 变更状态为没有被变更.
+        createCriteria.andChangingEqualTo("0");
         createCriteria.andBillTypeNotEqualTo("2");
         createCriteria1.andBillTypeNotEqualTo("2");
         example.or(createCriteria1);