diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java index 51033c2..734ab95 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java @@ -45,6 +45,9 @@ public class WmIssueLine extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 领料数量 */ @Excel(name = "领料数量") private BigDecimal quantityIssued; @@ -101,7 +104,15 @@ public class WmIssueLine 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; } @@ -318,6 +329,7 @@ public class WmIssueLine extends BaseEntity .append("itemName", getItemName()) .append("specification", getSpecification()) .append("unitOfMeasure", getUnitOfMeasure()) + .append("unitName", getUnitName()) .append("quantityIssued", getQuantityIssued()) .append("batchCode", getBatchCode()) .append("warehouseId", getWarehouseId()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java index cb70247..7276c00 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java @@ -50,6 +50,9 @@ public class WmItemRecptLine extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 入库数量 */ @Excel(name = "入库数量") private BigDecimal quantityRecived; @@ -126,7 +129,15 @@ public class WmItemRecptLine 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; } @@ -369,6 +380,7 @@ public class WmItemRecptLine extends BaseEntity ", itemName='" + itemName + '\'' + ", specification='" + specification + '\'' + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", unitName='" + unitName + '\'' + ", quantityRecived=" + quantityRecived + ", batchCode='" + batchCode + '\'' + ", warehouseId=" + warehouseId + diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java index 5c6907e..53f77bd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java @@ -50,6 +50,9 @@ public class WmProductRecptLine extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 入库数量 */ @Excel(name = "入库数量") private BigDecimal quantityRecived; @@ -111,7 +114,15 @@ public class WmProductRecptLine 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; } @@ -339,6 +350,7 @@ public class WmProductRecptLine extends BaseEntity ", itemName='" + itemName + '\'' + ", specification='" + specification + '\'' + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", unitName='" + unitName + '\'' + ", quantityRecived=" + quantityRecived + ", batchCode='" + batchCode + '\'' + ", warehouseId=" + warehouseId + diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java index ce59a50..486719f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java @@ -47,6 +47,9 @@ public class WmRtIssueLine extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 退料数量 */ @Excel(name = "退料数量") private BigDecimal quantityRt; @@ -103,7 +106,15 @@ public class WmRtIssueLine 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; } @@ -322,6 +333,7 @@ public class WmRtIssueLine extends BaseEntity .append("itemName", getItemName()) .append("specification", getSpecification()) .append("unitOfMeasure", getUnitOfMeasure()) + .append("unitName", getUnitName()) .append("quantityRt", getQuantityRt()) .append("batchCode", getBatchCode()) .append("warehouseId", getWarehouseId()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java index a6efc76..c05fad3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java @@ -45,6 +45,9 @@ public class WmRtVendorLine extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 退货数量 */ @Excel(name = "退货数量") private BigDecimal quantityRted; @@ -101,7 +104,15 @@ public class WmRtVendorLine 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; } @@ -320,6 +331,7 @@ public class WmRtVendorLine extends BaseEntity ", itemName='" + itemName + '\'' + ", specification='" + specification + '\'' + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", unitName='" + unitName + '\'' + ", quantityRted=" + quantityRted + ", batchCode='" + batchCode + '\'' + ", warehouseId=" + warehouseId + diff --git a/ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml index 9c5462f..4132ec0 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line + select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line @@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_recived = #{quantityRecived} and batch_code = #{batchCode} and warehouse_id = #{warehouseId} @@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_recived, batch_code, warehouse_id, @@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityRecived}, #{batchCode}, #{warehouseId}, @@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_recived = #{quantityRecived}, batch_code = #{batchCode}, warehouse_id = #{warehouseId}, diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml index 766f4f1..8560adb 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line + select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line @@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_rt = #{quantityRt} and batch_code = #{batchCode} and warehouse_id = #{warehouseId} @@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_rt, batch_code, warehouse_id, @@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityRt}, #{batchCode}, #{warehouseId}, @@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_rt = #{quantityRt}, batch_code = #{batchCode}, warehouse_id = #{warehouseId}, diff --git a/ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml index 7366bad..c85b9b6 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line + select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line