合并到主分支 #12

Merged
bgy merged 54 commits from bgy into master 2024-08-28 10:59:12 +00:00
3 changed files with 15 additions and 1 deletions
Showing only changes of commit 38b75df08a - Show all commits
@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -42,6 +43,12 @@ public class CostStandardDetail implements Serializable {
@ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段") @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
private String materialNumber; private String materialNumber;
/**
* 物料名称
*/
@TableField("material_name")
private String materialName;
/** /**
* 父类物料号 * 父类物料号
*/ */
@@ -70,7 +77,7 @@ public class CostStandardDetail implements Serializable {
* 用量 * 用量
*/ */
@TableField("dosage") @TableField("dosage")
private String dosage; private Double dosage;
/** /**
* 单位 * 单位
@@ -6,6 +6,7 @@
<resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO"> <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="material_number" property="materialNumber" /> <result column="material_number" property="materialNumber" />
<result column="material_name" property="materialName" />
<result column="parent_material_number" property="parentMaterialNumber" /> <result column="parent_material_number" property="parentMaterialNumber" />
<result column="version_number_id" property="versionNumberId" /> <result column="version_number_id" property="versionNumberId" />
<result column="version_number" property="versionNumber" /> <result column="version_number" property="versionNumber" />
@@ -2,7 +2,10 @@ package com.zzsmart.qomo.kn.cost.manage.vo;
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
@@ -15,6 +18,9 @@ import java.io.Serializable;
* @since 2024-06-19 * @since 2024-06-19
*/ */
@Data @Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CostStandardDetailVO extends CostStandardDetail implements Serializable { public class CostStandardDetailVO extends CostStandardDetail implements Serializable {
/** /**
* 版本号 * 版本号