Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r41625 -r41630 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 41625) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 41630) @@ -4211,7 +4211,7 @@ if(CollectionUtils.isNotEmpty(diposableGoodsItemList)){ for (DiposableGoodsItem diposableGoodsItem : diposableGoodsItemList) { if(StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_FAIL) - || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH)){ + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH)){ if(StringUtils.isBlank(chasDisposableGoodsDto.getBatchNumber()) && StringUtils.isBlank(diposableGoodsItem.getBatch())){ invoiceDiposableGoodsItemList.add(diposableGoodsItem); }else if(StringUtils.equals(chasDisposableGoodsDto.getBatchNumber(), diposableGoodsItem.getBatch())){ @@ -4253,7 +4253,7 @@ if(CollectionUtils.isNotEmpty(diposableGoodsItemList)){ for (DiposableGoodsItem diposableGoodsItem : diposableGoodsItemList) { if(StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_FAIL) - || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH)){ + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH)){ if(StringUtils.isBlank(chasDisposableGoodsDto.getBatchNumber()) && StringUtils.isBlank(diposableGoodsItem.getBatch())){ invoiceDiposableGoodsItemList.add(diposableGoodsItem); }else if(StringUtils.equals(chasDisposableGoodsDto.getBatchNumber(), diposableGoodsItem.getBatch())){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java =================================================================== diff -u -r41625 -r41630 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java (.../DiposableGoodsItem.java) (revision 41625) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java (.../DiposableGoodsItem.java) (revision 41630) @@ -215,7 +215,7 @@ */ private String chasPushResult; - public static final String CHAS_PUSH_RESULT_WAITE_NPUSH = "未推送"; + public static final String CHAS_PUSH_RESULT_WAITE_PUSH = "未推送"; public static final String CHAS_PUSH_RESULT_PUSH_SUCCESS = "成功"; Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java =================================================================== diff -u -r41625 -r41630 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 41625) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 41630) @@ -6390,7 +6390,7 @@ ps.setString(21, (String)map.get("chasOrgControlTag")); ps.setString(22, (String)map.get("chasDeptCode")); ps.setString(23, (String)map.get("chasDeptName")); - ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH); + ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH); } @Override @@ -8730,7 +8730,7 @@ ps.setString(21, (String)map.get("chasOrgControlTag")); ps.setString(22, (String)map.get("chasDeptCode")); ps.setString(23, (String)map.get("chasDeptName")); - ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH); + ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH); } @Override Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/ChasDisposableGoodsPushDaoImpl.java =================================================================== diff -u -r41625 -r41630 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/ChasDisposableGoodsPushDaoImpl.java (.../ChasDisposableGoodsPushDaoImpl.java) (revision 41625) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/ChasDisposableGoodsPushDaoImpl.java (.../ChasDisposableGoodsPushDaoImpl.java) (revision 41630) @@ -60,10 +60,11 @@ Map idDisposableGoodsMap = getDiposableGoodsItemDisposableGoodsMap(diposableGoodsItems); for (DiposableGoodsItem diposableGoodsItem : diposableGoodsItems) { if(!StringUtils.equals(diposableGoodsItem.getChasItemControlTag(), Constants.STR_YES) - || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES)){ + || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES) + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_SUCCESS)){ continue; } - String chasPushResult = DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH; + String chasPushResult = diposableGoodsItem.getChasPushResult(); try { String request = buildInvoiceDiposableGoodsItemResuest(invoice, diposableGoodsItem, idDisposableGoodsMap); logger.debug(String.format("CHAS发货信息推送接口入参:%s", request)); @@ -94,10 +95,11 @@ Map idDisposableGoodsMap = getDiposableGoodsItemDisposableGoodsMap(diposableGoodsItems); for (DiposableGoodsItem diposableGoodsItem : diposableGoodsItems) { if(!StringUtils.equals(diposableGoodsItem.getChasItemControlTag(), Constants.STR_YES) - || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES)){ + || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES) + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_SUCCESS)){ continue; } - String chasPushResult = DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH; + String chasPushResult = diposableGoodsItem.getChasPushResult(); try { String request = buildInvoiceDiposableGoodsItemResuest(diposableGoodsItem.getInvoice(), diposableGoodsItem, idDisposableGoodsMap); logger.debug(String.format("CHAS发货信息推送接口入参:%s", request)); @@ -126,10 +128,11 @@ } for (DiposableGoodsItem diposableGoodsItem : returnDiposableGoodsItems) { if(!StringUtils.equals(diposableGoodsItem.getChasItemControlTag(), Constants.STR_YES) - || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES)){ + || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES) + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_SUCCESS)){ continue; } - String chasPushResult = DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH; + String chasPushResult = diposableGoodsItem.getChasPushResult(); try { pushReturnGooodsInfo_interanl(returnGoodsRecord, returnDiposableGoodsItems); } catch (Exception e) { @@ -148,10 +151,11 @@ Map idDisposableGoodsMap = getDiposableGoodsItemDisposableGoodsMap(returnDiposableGoodsItems); for (DiposableGoodsItem diposableGoodsItem : returnDiposableGoodsItems) { if(!StringUtils.equals(diposableGoodsItem.getChasItemControlTag(), Constants.STR_YES) - || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES)){ + || !StringUtils.equals(diposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES) + || StringUtils.equals(diposableGoodsItem.getChasPushResult(), DiposableGoodsItem.CHAS_PUSH_RESULT_PUSH_SUCCESS)){ continue; } - String chasPushResult = DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH; + String chasPushResult = diposableGoodsItem.getChasPushResult(); try { String request = buildReturnGoodsRecordDiposableGoodsItemResuest(returnGoodsRecord, diposableGoodsItem, idDisposableGoodsMap); logger.debug(String.format("CHAS退货信息推送接口入参:%s", request)); Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java =================================================================== diff -u -r41625 -r41630 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 41625) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 41630) @@ -499,7 +499,7 @@ returnDiposableGoodsItem.setChasDeptName(sendOutDiposableGoodsItem.getChasDeptName()); if(StringUtils.equals(sendOutDiposableGoodsItem.getChasItemControlTag(), Constants.STR_YES) && StringUtils.equals(sendOutDiposableGoodsItem.getChasOrgControlTag(), Constants.STR_YES)){ - returnDiposableGoodsItem.setChasPushResult(DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH); + returnDiposableGoodsItem.setChasPushResult(DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH); } objectDao.update(sendOutDiposableGoodsItem); returnDiposableGoodsItems.add(returnDiposableGoodsItem); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r41625 -r41630 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 41625) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 41630) @@ -5651,7 +5651,7 @@ ps.setString(21, (String)map.get("chasOrgControlTag")); ps.setString(22, (String)map.get("chasDeptCode")); ps.setString(23, (String)map.get("chasDeptName")); - ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_NPUSH); + ps.setString(24, DiposableGoodsItem.CHAS_PUSH_RESULT_WAITE_PUSH); } @Override