1、销售出库 医保删除逻辑

dev_2.5_ocean
qiuyt 4 months ago
parent 1f8e7d1b21
commit 068337b76e

@ -201,7 +201,7 @@ public class CollectOrderBizResponse {
private String measname; private String measname;
private String invDataType; private String trdnFlag;

@ -177,8 +177,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void generateOrder(String billNo, AuthAdmin authAdmin) { public void generateOrder(String billNo, AuthAdmin authAdmin) {
log.error("单据返回=========1111" );
IoCollectOrderBackup collectOrder = getByBillNo(billNo); IoCollectOrderBackup collectOrder = getByBillNo(billNo);
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
@ -187,8 +185,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.filterListExhibitGoods(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.filterListExhibitGoods(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
} }
log.error("单据返回=========2222-1"+sysWorkplaceDocumentEntity +collectOrder.getWorkPlaceCode()+ collectOrder.getBusType());
log.error("单据返回=========2222-2"+collectOrder.getWorkPlaceCode()+ "==="+collectOrder.getBusType());
//1.内部系统,且单据为扫码生成业务单则创建系统单据 //1.内部系统,且单据为扫码生成业务单则创建系统单据
if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) { if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) {
@ -217,12 +213,10 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
updateReview(authAdmin, orderEntity); updateReview(authAdmin, orderEntity);
} }
} }
log.error("单据返回=========2222"+collectOrder );
if (sysWorkplaceDocumentEntity != null) { if (sysWorkplaceDocumentEntity != null) {
Integer uploadYb = sysWorkplaceDocumentEntity.getUploadYb(); Integer uploadYb = sysWorkplaceDocumentEntity.getUploadYb();
if (uploadYb == 1) { if (uploadYb == 1) {
log.error("单据返回=========3333" );
uploadThrid(collectOrder); uploadThrid(collectOrder);
} }
@ -438,9 +432,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
.last("limit 1") .last("limit 1")
); );
if(count >0){ if(count >0){
collectOrderBizResponse.setInvDataType("1"); collectOrderBizResponse.setTrdnFlag("1");
}else { }else {
collectOrderBizResponse.setInvDataType("0"); collectOrderBizResponse.setTrdnFlag("0");
} }
} }
@ -474,7 +468,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} }
// 医保上传 // 医保上传
BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest);
log.error("单据返回=========" + baseResponse);
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
// 触发上传 转发至中继服务 到外网 再到国家同步库 // 触发上传 转发至中继服务 到外网 再到国家同步库
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
@ -551,7 +544,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
IoCollectOrderBackup updateOrder = new IoCollectOrderBackup(); IoCollectOrderBackup updateOrder = new IoCollectOrderBackup();
updateOrder.setBillNo(billNo); updateOrder.setBillNo(billNo);
try { try {
log.error("单据返回=========0000"+billNo );
this.generateOrder(billNo, authAdmin); this.generateOrder(billNo, authAdmin);
updateOrder.setUploadStatus(2); updateOrder.setUploadStatus(2);

Loading…
Cancel
Save