diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 4ef6f73..2229a4d 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1499,6 +1499,13 @@ public class CtqyyClient extends CommonHttpClient { collectOrderBiz.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT()); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); + collectOrderBiz.setRemark1(entity.getRETAIL_PRICE().toString()); + collectOrderBiz.setRemark2(entity.getRETAIL_MONEY().toString()); + collectOrderBiz.setRemark3(entity.getIMPORT_PRICE().toString()); + collectOrderBiz.setRemark4(entity.getIMPORT_MONEY().toString()); + collectOrderBiz.setRemark5(entity.getFIXMEDINS_BCHNO()); + collectOrderBiz.setRemark6(entity.getRX_FLAG()); + collectOrderBiz.setRemark7(entity.getINV_CHG_TYPE()); bizList.add(collectOrderBiz); }); if (StrUtil.isNotBlank(errorMsg)) { @@ -1608,9 +1615,9 @@ public class CtqyyClient extends CommonHttpClient { collectOrderBiz.setCount(entity.getSEL_RETN_CNT()); collectOrderBiz.setThrCode(entity.getFIXMEDINS_HILIST_ID()); collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME()); -// collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setYbbm(entity.getMED_LIST_CODG()); + collectOrderBiz.setRemark1(entity.getFINL_TRNS_PRIC() + ""); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); @@ -1789,8 +1796,8 @@ public class CtqyyClient extends CommonHttpClient { .med_list_codg(item.getYbbm()) .fixmedins_hilist_id(item.getThrCode()) .fixmedins_hilist_name(item.getCpmctymc()) - .fixmedins_bchno("") - .rx_flag("") + .fixmedins_bchno(item.getRemark5()) + .rx_flag(item.getRemark6()) .invdate(item.getUpdateTime()) .inv_cnt(item.getActCount()) .manu_lotnum(item.getBatchNo()) @@ -1832,18 +1839,17 @@ public class CtqyyClient extends CommonHttpClient { // TODO: 2024/9/10 字段未完全正确对应 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() .med_list_codg(item.getYbbm()) - .inv_chg_type("") + .inv_chg_type(item.getRemark7()) .fixmedins_hilist_id(item.getThrCode()) .fixmedins_hilist_name(item.getCpmctymc()) - .fixmedins_bchno("") - .pric(null) + .fixmedins_bchno(item.getRemark5()) + .pric(item.getRemark1()) .cnt(item.getActCount()) - .rx_flag("") + .rx_flag(item.getRemark6()) .inv_chg_time(item.getUpdateTime()) .inv_chg_opter_name(ioCollectOrder.getCreateUser()) .memo(item.getRemark()) - .trdn_flag(ioCollectOrder.getSplitStatus() == 0 ? "0" : "1") - .drug_trac_codg(item.getReplaceCode()) + .trdn_flag("0") .drugtracinfo(drugTraceList).build(); kcbg3502Requests.add(kcbg3502Request); } @@ -1902,7 +1908,7 @@ public class CtqyyClient extends CommonHttpClient { .sel_retn_opter_name(vInsurNationGoodsPhysic.getSEL_RETN_OPTER_NAME()) .memo(item.getRemark()) .medins_prod_sel_no(vInsurNationGoodsPhysic.getMEDINS_PROL_SEL_NO()) -// .mdtrt_sn(vInsurNationGoodsPhysic.get) + .mdtrt_sn(vInsurNationGoodsPhysic.getMDTRT_SN()) .drugtracinfo(drugTraceList).build(); xsth3506Requests.add(xsth3506Request); diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsReturn.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsReturn.java index 0a4dfde..d891874 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsReturn.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VInsurNationGoodsReturn.java @@ -84,4 +84,7 @@ public class VInsurNationGoodsReturn { @TableField(value = "SICK_ID") private String SICK_ID; + + @TableField(value = "MDTRT_SN") + private String MDTRT_SN; } diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java index 9bf6dde..fe574b3 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsIoInfo.java @@ -83,6 +83,13 @@ public class VYpzsIoInfo implements Serializable { @TableField(value = "COUNTRY_CODE") private String COUNTRY_CODE; + @TableField(value = "FIXMEDINS_BCHNO") + private String FIXMEDINS_BCHNO; + @TableField(value = "RX_FLAG") + private String RX_FLAG; + @TableField(value = "INV_CHG_TYPE") + private String INV_CHG_TYPE; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java index f8a65bc..5bb2a37 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java @@ -176,6 +176,27 @@ public class IoCollectOrderBiz implements Serializable { @TableField(value = "autoTagStatus") private Integer autoTagStatus; + @TableField(value = "remark1") + private String remark1; + @TableField(value = "remark2") + private String remark2; + @TableField(value = "remark3") + private String remark3; + @TableField(value = "remark4") + private String remark4; + @TableField(value = "remark5") + private String remark5; + @TableField(value = "remark6") + private String remark6; + @TableField(value = "remark7") + private String remark7; + @TableField(value = "remark8") + private String remark8; + @TableField(value = "remark9") + private String remark9; + @TableField(value = "remark10") + private String remark10; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/mipsdl/req/yb/Kcbg3502Request.java b/src/main/java/com/glxp/mipsdl/req/yb/Kcbg3502Request.java index 0683e8d..2531293 100644 --- a/src/main/java/com/glxp/mipsdl/req/yb/Kcbg3502Request.java +++ b/src/main/java/com/glxp/mipsdl/req/yb/Kcbg3502Request.java @@ -41,7 +41,7 @@ public class Kcbg3502Request { /** * 单价 */ - private BigDecimal pric; + private String pric; /** * 数量 */