From 1fe2da5ceaa54a3395b7fbbcd0c0a04ad21ab781 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Fri, 7 Feb 2025 10:53:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=89=A9=E6=96=99=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=EF=BC=88BOM=E7=BB=84=E6=88=90?=
=?UTF-8?q?=EF=BC=89=E3=80=81=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
=?UTF-8?q?=EF=BC=88=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=EF=BC=89=E7=9A=84?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ktg/mes/md/domain/MdProductBom.java | 14 +++++++++++++-
.../com/ktg/mes/wm/domain/WmArrivalNoticeLine.java | 13 ++++++++++++-
.../resources/mapper/md/MdProductBomMapper.xml | 7 ++++++-
.../mapper/wm/WmArrivalNoticeLineMapper.xml | 7 ++++++-
4 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java
index e42098e..bf9221f 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java
@@ -43,6 +43,9 @@ public class MdProductBom extends BaseEntity
@Excel(name = "BOM物料单位")
private String unitOfMeasure;
+ /** BOM物料单位名称 */
+ private String unitName;
+
/** 产品物料标识 */
@Excel(name = "产品物料标识")
private String itemOrProduct;
@@ -67,7 +70,15 @@ public class MdProductBom extends BaseEntity
/** 预留字段4 */
private Long attr4;
- public void setBomId(Long bomId)
+ public String getUnitName() {
+ return unitName;
+ }
+
+ public void setUnitName(String unitName) {
+ this.unitName = unitName;
+ }
+
+ public void setBomId(Long bomId)
{
this.bomId = bomId;
}
@@ -204,6 +215,7 @@ public class MdProductBom extends BaseEntity
.append("bomItemName", getBomItemName())
.append("bomItemSpec", getBomItemSpec())
.append("unitOfMeasure", getUnitOfMeasure())
+ .append("unitName", getUnitName())
.append("itemOrProduct", getItemOrProduct())
.append("quantity", getQuantity())
.append("enableFlag", getEnableFlag())
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java
index 5fb0458..65f9f4e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java
@@ -43,6 +43,9 @@ public class WmArrivalNoticeLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
+ /** 单位名称 */
+ private String unitName;
+
/** 到货数量 */
@Excel(name = "到货数量")
private BigDecimal quantityArrival;
@@ -75,7 +78,15 @@ public class WmArrivalNoticeLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
- public void setLineId(Long lineId)
+ public String getUnitName() {
+ return unitName;
+ }
+
+ public void setUnitName(String unitName) {
+ this.unitName = unitName;
+ }
+
+ public void setLineId(Long lineId)
{
this.lineId = lineId;
}
diff --git a/ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml
index 470af2d..1f48911 100644
--- a/ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
+ select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, unit_name, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom