代码备份

scpwxyy
yewj 7 months ago
parent 668437ca03
commit 8eb19bd8c1

@ -1526,7 +1526,7 @@ public class CtqyyClient extends CommonHttpClient {
public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) {
String[] buyType_3501 = {"24"};
String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"};
String[] buyType_3505 = {"QXCF001","YPCF002"};
String[] buyType_3505 = {"QXCF001", "YPCF002"};
String[] buyType_3506 = {"YPTH001"};
List<IoCollectOrder> collectOrderList = postCollectOrderRequest.getCollectOrderList();
@ -1541,10 +1541,10 @@ public class CtqyyClient extends CommonHttpClient {
optionUploadCollectOrder3502(ioCollectOrder);
} else if (matchBusType(busType, buyType_3505)) {
optionUploadCollectOrder3505(ioCollectOrder);
}else if (matchBusType(busType, buyType_3506)) {
} else if (matchBusType(busType, buyType_3506)) {
optionUploadCollectOrder3506(ioCollectOrder);
} else {
return ResultVOUtils.error(500,"业务类型未找到对应上传接口");
return ResultVOUtils.error(500, "业务类型未找到对应上传接口");
}
}
}
@ -1601,14 +1601,17 @@ public class CtqyyClient extends CommonHttpClient {
}
VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfoMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
if (vYpzsPresInfo != null) {
collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
}
collectOrderBiz.setCount(entity.getSEL_RETN_CNT());
collectOrderBiz.setThrCode(entity.getFIXMEDINS_HILIST_ID());
collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME());
collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
// collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setYbbm(entity.getMED_LIST_CODG());
collectOrderBiz.setCount(Integer.parseInt(vYpzsPresInfo.getLAY_PHYSIC_QUANTITY()));
collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz);
@ -1692,7 +1695,7 @@ public class CtqyyClient extends CommonHttpClient {
}
public void optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder){
public void optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) {
//摆药流水号
String stoout_no = ioCollectOrder.getBackupOrderRemark1();
List<VInsurNationGoodsPhysic> vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsPhysic>().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no));
@ -1763,7 +1766,7 @@ public class CtqyyClient extends CommonHttpClient {
}
public void optionUploadCollectOrder3501(IoCollectOrder ioCollectOrder){
public void optionUploadCollectOrder3501(IoCollectOrder ioCollectOrder) {
List<IoCollectOrderBiz> bizList = ioCollectOrder.getBizList();
if (CollUtil.isNotEmpty(bizList)) {
List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
@ -1808,8 +1811,7 @@ public class CtqyyClient extends CommonHttpClient {
}
public void optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder){
public void optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) {
List<IoCollectOrderBiz> bizList = ioCollectOrder.getBizList();
if (CollUtil.isNotEmpty(bizList)) {
List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
@ -1840,7 +1842,7 @@ public class CtqyyClient extends CommonHttpClient {
.inv_chg_time(item.getUpdateTime())
.inv_chg_opter_name(ioCollectOrder.getCreateUser())
.memo(item.getRemark())
.trdn_flag(ioCollectOrder.getSplitStatus() == 0?"0":"1")
.trdn_flag(ioCollectOrder.getSplitStatus() == 0 ? "0" : "1")
.drug_trac_codg(item.getReplaceCode())
.drugtracinfo(drugTraceList).build();
kcbg3502Requests.add(kcbg3502Request);
@ -1855,11 +1857,17 @@ public class CtqyyClient extends CommonHttpClient {
}
}
public void optionUploadCollectOrder3506(IoCollectOrder ioCollectOrder){
public void optionUploadCollectOrder3506(IoCollectOrder ioCollectOrder) {
List<IoCollectOrderBiz> bizList = ioCollectOrder.getBizList();
if (CollUtil.isNotEmpty(bizList)) {
List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
List<Xsth3506Request> xsth3506Requests = new ArrayList<>();
List<VInsurNationGoodsReturn> vInsurNationGoodsReturns = vInsurNationGoodsReturnMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsReturn>().eq(VInsurNationGoodsReturn::getAPPLY_NO, ioCollectOrder.getBillNo()));
if (CollUtil.isEmpty(vInsurNationGoodsReturns)) {
log.error("申请单号{}不存在", ioCollectOrder.getBillNo());
return;
}
for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
String itemCode = basicUdirelEntity.getMainId();
@ -1888,7 +1896,7 @@ public class CtqyyClient extends CommonHttpClient {
.manu_date(item.getProductDate())
.expy_end(item.getExpireDate())
.rx_flag(null)
.trdn_flag(ioCollectOrder.getSplitStatus() == 0?"0":"1")
.trdn_flag(ioCollectOrder.getSplitStatus() == 0 ? "0" : "1")
.finl_trns_pric(null)
.sel_retn_cnt(BigDecimal.valueOf(item.getActCount()))
.sel_retn_time(ioCollectOrder.getUpdateTime())

Loading…
Cancel
Save