From 6d3e982ec8be49d2a5575fce118fdb28d21c8164 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Mar 2024 22:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E6=B7=BB=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8UDI=E7=A0=81=EF=BC=8C=E8=AE=A1=E9=87=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9B=BF=E6=8D=A2=E6=88=90=E7=AC=AC=E4=B8=89=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 5 +++-- .../java/com/glxp/mipsdl/entity/inout/IoCodeEntity.java | 3 +++ .../java/com/glxp/mipsdl/entity/inout/IoCodeTempEntity.java | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) 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 f3ba16f..6623acb 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1069,7 +1069,7 @@ public class CtqyyClient extends CommonHttpClient { item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号 item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号 item.setManufactory(basicProducts.getManufactory()); //生产厂家 - item.setMeasname(basicProducts.getMeasname()); //计量单位 + item.setMeasname(thrProductsEntity.getMeasname()); //计量单位 item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号 if (StrUtil.isNotEmpty(item.getManufactory())) { ThrCorpEntity thrCorpEntity = thrCorpService.getThrCorpByName(item.getManufactory()); @@ -1204,7 +1204,8 @@ public class CtqyyClient extends CommonHttpClient { } String code = codeDetaiEntity.getCode(); if (code.contains("\u001D")) { - code = code.replace("\u001D", "zysoft"); +// code = code.replace("\u001D", "zysoft"); + code = code.replace("\u001D", ""); } itemDTO.setCode(code); itemDTO.setCount(codeDetaiEntity.getCount()); diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeEntity.java index df7bf15..778b7f9 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeEntity.java @@ -24,6 +24,9 @@ public class IoCodeEntity { @TableField(value = "code") private String code; + @TableField(value = "errUdiCode") + private String errUdiCode; + /** * 主单据类型（入库，出库） */ diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeTempEntity.java index 571fb5c..01e7bf7 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCodeTempEntity.java @@ -24,6 +24,10 @@ public class IoCodeTempEntity { @TableField(value = "code") private String code; + @TableField(value = "errUdiCode") + private String errUdiCode; + + /** * 主单据类型（入库，出库） */ @@ -138,4 +142,4 @@ public class IoCodeTempEntity { @TableField(value = "createTime") private Date createTime; -} \ No newline at end of file +}