diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java index 7056f3691..ba46bec97 100644 --- a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java +++ b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java @@ -127,4 +127,12 @@ public class RelCodeBatch implements Serializable { @ApiModelProperty(value = "") private String parentCode; + + /** + * erpId + */ + + @TableField(value = "erpId") + @ApiModelProperty(value = "") + private String erpId; } diff --git a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java index 4cc2daf73..848b08a8f 100644 --- a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java +++ b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java @@ -77,8 +77,11 @@ public class RelCodeBatchResponse { * 包装单位 */ private String packUnit; + /** * 包装级别 */ private Integer packLayer; + + private String erpId; } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 641b1c370..e85ed264c 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -131,6 +131,8 @@ public class RelCodeBatchService extends ServiceImpl relCodeDetails = new ArrayList<>(); for(RelCodeDetailRequest request : detailList){ diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml index c399c288c..63bd3eb07 100644 --- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml @@ -16,11 +16,12 @@ + id, productCode, subTypeNo, `cascadeRatio`, packageSpec, `comment`, batchNo, madeDate, - validateDate, workShop, lineName, lineManager + validateDate, workShop, lineName, lineManager, erpId