Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.74_4.9.75.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.74_4.9.75.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.74_4.9.75.sql (revision 31284) @@ -0,0 +1,2 @@ +update ForeignTousseApplication set isInterfacePush = '是' where id in (select id from InvoicePlan where serialNumber like 'SYNC_%'); +update ForeignTousseApplication set isInterfacePush = '否' where isInterfacePush is null; \ No newline at end of file Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java =================================================================== diff -u -r30964 -r31284 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 30964) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 31284) @@ -362,6 +362,7 @@ //如果根据单号能找到外来器械申请单,那就进行干预修改的操作 if(orginalForeignTousseApplication == null){ foreignTousseApplication = new ForeignTousseApplication(); + foreignTousseApplication.setIsInterfacePush(Constants.STR_YES); foreignTousseApplication.setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSerialNumber(serialNumber); foreignTousseApplication.setApplicant(applicant); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java =================================================================== diff -u -r30964 -r31284 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 30964) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 31284) @@ -22,6 +22,7 @@ import org.dom4j.XPath; import org.springframework.beans.factory.annotation.Autowired; +import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; @@ -313,6 +314,7 @@ //如果根据单号能找到外来器械申请单,那就进行干预修改的操作 if(orginalForeignTousseApplication == null){ foreignTousseApplication = new ForeignTousseApplication(); + foreignTousseApplication.setIsInterfacePush(Constants.STR_YES); foreignTousseApplication.setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSerialNumber(serialNumber); foreignTousseApplication.setApplicant(applicant); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java =================================================================== diff -u -r29783 -r31284 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 29783) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 31284) @@ -184,6 +184,11 @@ public static final String INVOICE_STATUS_ALL_SIGNED = "已签收"; /** + * 申请单是否接口推送过来的(GDSZYY-92) + */ + private String isInterfacePush = Constants.STR_NO; + + /** * 使用记录转申请单时,关联使用记录 */ @JsonIgnore @@ -572,6 +577,14 @@ this.explain = explain; } + public String getIsInterfacePush() { + return isInterfacePush; + } + + public void setIsInterfacePush(String isInterfacePush) { + this.isInterfacePush = isInterfacePush; + } + @ManyToOne(cascade=CascadeType.REFRESH,fetch=FetchType.LAZY) @JoinColumn(name="userecord_id") public UseRecord getUseRecord() { Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointForeignTousseApplicationAction.java =================================================================== diff -u -r30964 -r31284 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointForeignTousseApplicationAction.java (.../ButtJointForeignTousseApplicationAction.java) (revision 30964) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointForeignTousseApplicationAction.java (.../ButtJointForeignTousseApplicationAction.java) (revision 31284) @@ -326,6 +326,7 @@ //如果根据单号能找到外来器械申请单,那就进行干预修改的操作 if(orginalForeignTousseApplication == null){ foreignTousseApplication = new ForeignTousseApplication(); + foreignTousseApplication.setIsInterfacePush(Constants.STR_YES); foreignTousseApplication.setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSerialNumber(serialNumber); foreignTousseApplication.setApplicant(applicant);