diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml index edf4ae46..51c91685 100644 --- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml +++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml @@ -12,12 +12,11 @@ WHERE h.cgeneralhid in ( SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code} - and csourcetype = #{type} + and csourcetype = #{type} and dr = '0' ) and h.cbilltypecode = #{cbilltypecode} group by h.vbillcode,a.unitcode - diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java index 7efbce26..9ba924c7 100644 --- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java +++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java @@ -9,7 +9,6 @@ import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.u8c.Encapsulation.dao.IEncapsulationDao; import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity; -import com.hzya.frame.u8c.Encapsulation.service.IEncapsulationService; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse;