UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
hlfyyy
qiuyt 3 months ago
parent b8ab2699de
commit f5f42a3bf3
1 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File

95
src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
Unescape Escape View File

@ -94,10 +94,12 @@ public class HlfyyyClient extends CommonHttpClient {
private final String[] buyType_3501 = {}; private final String[] buyType_3501 = {};
private final String[] buyType_3502 = {"SC73650724355678"}; private final String[] buyType_3502 = {"SC73650724355678"};
private final String[] buyType_3504 = {};
// private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; // private final String[] buyType_3505 = {"QXCF001", "YPCF002"};
private final String[] buyType_3505 = {}; private final String[] buyType_3505 = {"YPCF002","YPCF003"};
private final String[] buyType_3506 = {}; private final String[] buyType_3506 = {"YPCFTF002","YPCFTF003"};
private final String[] buyType_35051 = {"SC72197936495755"}; private final String[] buyType_35051 = {"SC72197936495755"};
@ -1708,9 +1710,9 @@ public class HlfyyyClient extends CommonHttpClient {
} else if (matchBusType(busType, buyType_3502)) { } else if (matchBusType(busType, buyType_3502)) {
return optionUploadCollectOrder3502(ioCollectOrder); return optionUploadCollectOrder3502(ioCollectOrder);
} else if (matchBusType(busType, buyType_3505)) { } else if (matchBusType(busType, buyType_3505)) {
optionUploadCollectOrder3505(ioCollectOrder); return optionUploadCollectOrder3505(ioCollectOrder);
} else if (matchBusType(busType, buyType_3506)) { } else if (matchBusType(busType, buyType_3506)) {
optionUploadCollectOrder3506(ioCollectOrder); optionUploadCollectOrder3506(ioCollectOrder);
} else if (matchBusType(busType, buyType_35051)) { } else if (matchBusType(busType, buyType_35051)) {
return optionUploadCollectOrder35051(ioCollectOrder); return optionUploadCollectOrder35051(ioCollectOrder);
} else { } else {
@ -1952,16 +1954,16 @@ public class HlfyyyClient extends CommonHttpClient {
public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) {
//摆药流水号 //摆药流水号
// String stoout_no = ioCollectOrder.getBackupOrderRemark1(); // String stoout_no = ioCollectOrder.getBackupOrderRemark1();
String stoout_no = StringUtils.isBlank(ioCollectOrder.getBackupOrderRemark1()) ? ioCollectOrder.getBackupOrderRemark2() : ioCollectOrder.getBackupOrderRemark1(); VA010 va010 = va010Service.getOne(new LambdaQueryWrapper<VA010>().eq(VA010::getCode, ioCollectOrder.getBillNo()));
List<VInsurNationGoodsPhysic> vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsPhysic>().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no)); List<VA010Mx> list = va010MxMapper.selectList(new LambdaQueryWrapper<VA010Mx>().eq(VA010Mx::getCodefk, va010.getCode()));
if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { if (CollUtil.isNotEmpty(list)) {
List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
List<Xsck3505Request> xsck3505Requests = new ArrayList<>(); List<Xsck3505Request> xsck3505Requests = new ArrayList<>();
for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
String itemCode = basicUdirelEntity.getMainId(); String itemCode = basicUdirelEntity.getMainId();
for (VInsurNationGoodsPhysic vInsurNationGoodsPhysic : vInsurNationGoodsPhysics) { for (VA010Mx va010Mx : list) {
if (vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID().equals(itemCode)) { if (va010Mx.getHiltstCode().equals(itemCode)) {
String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
@ -1981,42 +1983,42 @@ public class HlfyyyClient extends CommonHttpClient {
} }
Xsck3505Request xsck3505Request = Xsck3505Request.builder() Xsck3505Request xsck3505Request = Xsck3505Request.builder()
.med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) .med_list_codg(va010Mx.getHiltstCode())
.fixmedins_hilist_id(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID()) .fixmedins_hilist_id(va010Mx.getItemcode())
.fixmedins_hilist_name(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_NAME()) .fixmedins_hilist_name(va010Mx.getItemname())
.fixmedins_bchno(vInsurNationGoodsPhysic.getFIXMEDINS_BCHNO()) .fixmedins_bchno(va010Mx.getCodefk())
.prsc_dr_cert_type(vInsurNationGoodsPhysic.getPRSC_DR_CERT_TYPE()) .prsc_dr_cert_type(null)
.prsc_dr_certno(vInsurNationGoodsPhysic.getPRSC_DR_CERTNO()) .prsc_dr_certno(null)
.prsc_dr_name(vInsurNationGoodsPhysic.getPRSC_DR_NAME()) .prsc_dr_name(va010.getCreatedr())
.phar_cert_type(vInsurNationGoodsPhysic.getPHAR_CERT_TYPE()) .phar_cert_type(null)
.phar_certno(vInsurNationGoodsPhysic.getPHAR_CERTNO()) .phar_certno(null)
.phar_name(vInsurNationGoodsPhysic.getPHAR_NAME()) .phar_name(null)
.phar_prac_cert_no(vInsurNationGoodsPhysic.getPHAR_PRAC_CERT_NO()) .phar_prac_cert_no(null)
.hi_feesetl_type(vInsurNationGoodsPhysic.getHI_FEESETL_TYPE()) .hi_feesetl_type(null)
.setl_id(vInsurNationGoodsPhysic.getSETL_ID()) .setl_id(null)
.mdtrt_sn(vInsurNationGoodsPhysic.getMDTRT_SN()) .mdtrt_sn(null)
.psn_no(vInsurNationGoodsPhysic.getPSN_NO()) .psn_no(va010.getSickcode())
.psn_cert_type(vInsurNationGoodsPhysic.getPSN_CERT_TYPE()) .psn_cert_type(null)
.certno(vInsurNationGoodsPhysic.getCERTNO()) .certno(null)
.psn_name(vInsurNationGoodsPhysic.getPSN_NAME()) .psn_name(va010.getSickname())
.manu_lotnum(vInsurNationGoodsPhysic.getMANU_LOTNUM()) .manu_lotnum(null)
.manu_date(vInsurNationGoodsPhysic.getMANU_DATE()) .manu_date(null)
.expy_end(vInsurNationGoodsPhysic.getEXPY_END()) .expy_end(null)
.rx_flag(vInsurNationGoodsPhysic.getRX_FLAG()) .rx_flag("1")
.trdn_flag(vInsurNationGoodsPhysic.getTRDN_FLAG()) .trdn_flag(null)
.finl_trns_pric(vInsurNationGoodsPhysic.getFINL_TRNS_PRIC()) .finl_trns_pric(new BigDecimal(va010Mx.getAmount()))
.rxno(vInsurNationGoodsPhysic.getRXNO()) .rxno(null)
.rx_circ_flag(vInsurNationGoodsPhysic.getRX_CIRC_FLAG()) .rx_circ_flag(null)
.rtal_docno(vInsurNationGoodsPhysic.getRTAL_DOCNO()) .rtal_docno(null)
.stoout_no(vInsurNationGoodsPhysic.getSTOOUT_NO()) .stoout_no(null)
.bchno(vInsurNationGoodsPhysic.getBCHNO()) .bchno(null)
.drug_prod_barc(vInsurNationGoodsPhysic.getRUG_PROD_BARC()) .drug_prod_barc(null)
.shelf_posi(vInsurNationGoodsPhysic.getSHELF_POSI()) .shelf_posi(null)
.sel_retn_cnt(vInsurNationGoodsPhysic.getSEL_RETN_CNT()) .sel_retn_cnt(Integer.valueOf(va010Mx.getCount()))
.sel_retn_time(vInsurNationGoodsPhysic.getSEL_RETN_TIME()) .sel_retn_time(va010.getPrescribedate())
.sel_retn_opter_name(vInsurNationGoodsPhysic.getSEL_RETN_OPTER_NAME()) .sel_retn_opter_name(null)
.memo(vInsurNationGoodsPhysic.getMEMO()) .memo(null)
.mdtrt_setl_type(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE()) .mdtrt_setl_type(null)
.drugtracinfo(drugTraceList).build(); .drugtracinfo(drugTraceList).build();
xsck3505Requests.add(xsck3505Request); xsck3505Requests.add(xsck3505Request);
} }
@ -2372,10 +2374,11 @@ public class HlfyyyClient extends CommonHttpClient {
@Override @Override
public BaseResponse getBuyType() { public BaseResponse getBuyType() {
Map<String, String[]> buyTypeMap = new HashMap<>(); Map<String, String[]> buyTypeMap = new HashMap<>();
buyTypeMap.put("buyType_3501", buyType_3501);
buyTypeMap.put("buyType_3502", buyType_3502); buyTypeMap.put("buyType_3502", buyType_3502);
buyTypeMap.put("buyType_3504", buyType_3504);
buyTypeMap.put("buyType_3505", buyType_3505); buyTypeMap.put("buyType_3505", buyType_3505);
buyTypeMap.put("buyType_3506", buyType_3506); buyTypeMap.put("buyType_3506", buyType_3506);
buyTypeMap.put("buyType_35051", buyType_35051);
return ResultVOUtils.success(buyTypeMap); return ResultVOUtils.success(buyTypeMap);
} }

Write Preview
Loading…
Cancel
Save