From ec9c9855cac982e8d59182361b9f70960ce91f79 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Tue, 24 May 2022 22:55:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/mes/wm/domain/WmMaterialStock.java | 70 ++++++++++ .../com/ktg/mes/wm/domain/WmTransaction.java | 130 ++++++++++++++++++ .../mes/wm/mapper/WmMaterialStockMapper.java | 3 +- .../wm/service/IWmMaterialStockService.java | 3 +- .../mapper/wm/WmMaterialStockMapper.xml | 27 +++- .../mapper/wm/WmTransactionMapper.xml | 51 ++++++- 6 files changed, 280 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmMaterialStock.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmMaterialStock.java index c91f00f..39332d4 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmMaterialStock.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmMaterialStock.java @@ -21,6 +21,10 @@ public class WmMaterialStock extends BaseEntity /** 事务ID */ private Long materialStockId; + /** 物料类型ID */ + @Excel(name = "物料类型ID") + private Long itemTypeId; + /** 产品物料ID */ @Excel(name = "产品物料ID") private Long itemId; @@ -81,6 +85,22 @@ public class WmMaterialStock extends BaseEntity @Excel(name = "库位名称") private String areaName; + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long vendorId; + + /** 供应商编号 */ + @Excel(name = "供应商编号") + private String vendorCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String vendorName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String vendorNick; + /** 在库数量 */ @Excel(name = "在库数量") private BigDecimal quantityOnhand; @@ -115,6 +135,15 @@ public class WmMaterialStock extends BaseEntity { return materialStockId; } + public void setItemTypeId(Long itemTypeId) + { + this.itemTypeId = itemTypeId; + } + + public Long getItemTypeId() + { + return itemTypeId; + } public void setItemId(Long itemId) { this.itemId = itemId; @@ -250,6 +279,42 @@ public class WmMaterialStock extends BaseEntity { return areaName; } + public void setVendorId(Long vendorId) + { + this.vendorId = vendorId; + } + + public Long getVendorId() + { + return vendorId; + } + public void setVendorCode(String vendorCode) + { + this.vendorCode = vendorCode; + } + + public String getVendorCode() + { + return vendorCode; + } + public void setVendorName(String vendorName) + { + this.vendorName = vendorName; + } + + public String getVendorName() + { + return vendorName; + } + public void setVendorNick(String vendorNick) + { + this.vendorNick = vendorNick; + } + + public String getVendorNick() + { + return vendorNick; + } public void setQuantityOnhand(BigDecimal quantityOnhand) { this.quantityOnhand = quantityOnhand; @@ -309,6 +374,7 @@ public class WmMaterialStock extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("materialStockId", getMaterialStockId()) + .append("itemTypeId", getItemTypeId()) .append("itemId", getItemId()) .append("itemCode", getItemCode()) .append("itemName", getItemName()) @@ -324,6 +390,10 @@ public class WmMaterialStock extends BaseEntity .append("areaId", getAreaId()) .append("areaCode", getAreaCode()) .append("areaName", getAreaName()) + .append("vendorId", getVendorId()) + .append("vendorCode", getVendorCode()) + .append("vendorName", getVendorName()) + .append("vendorNick", getVendorNick()) .append("quantityOnhand", getQuantityOnhand()) .append("expireDate", getExpireDate()) .append("attr1", getAttr1()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransaction.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransaction.java index 4b149a6..13d4d6b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransaction.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransaction.java @@ -85,6 +85,38 @@ public class WmTransaction extends BaseEntity @Excel(name = "库位名称") private String areaName; + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long vendorId; + + /** 供应商编号 */ + @Excel(name = "供应商编号") + private String vendorCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String vendorName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String vendorNick; + + /** 单据类型 */ + @Excel(name = "单据类型") + private String sourceDocType; + + /** 单据ID */ + @Excel(name = "单据ID") + private Long sourceDocId; + + /** 单据编号 */ + @Excel(name = "单据编号") + private String sourceDocCode; + + /** 单据行ID */ + @Excel(name = "单据行ID") + private Long sourceDocLineId; + /** 库存记录ID */ @Excel(name = "库存记录ID") private Long materialStockId; @@ -102,6 +134,10 @@ public class WmTransaction extends BaseEntity @Excel(name = "事务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date transactionDate; + /** 关联的事务ID */ + @Excel(name = "关联的事务ID") + private Long relatedTransactionId; + /** ERP账期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "ERP账期", width = 30, dateFormat = "yyyy-MM-dd") @@ -113,15 +149,19 @@ public class WmTransaction extends BaseEntity private Date expireDate; /** 预留字段1 */ + @Excel(name = "预留字段1") private String attr1; /** 预留字段2 */ + @Excel(name = "预留字段2") private String attr2; /** 预留字段3 */ + @Excel(name = "预留字段3") private Long attr3; /** 预留字段4 */ + @Excel(name = "预留字段4") private Long attr4; public void setTransactionId(Long transactionId) @@ -277,6 +317,78 @@ public class WmTransaction extends BaseEntity { return areaName; } + public void setVendorId(Long vendorId) + { + this.vendorId = vendorId; + } + + public Long getVendorId() + { + return vendorId; + } + public void setVendorCode(String vendorCode) + { + this.vendorCode = vendorCode; + } + + public String getVendorCode() + { + return vendorCode; + } + public void setVendorName(String vendorName) + { + this.vendorName = vendorName; + } + + public String getVendorName() + { + return vendorName; + } + public void setVendorNick(String vendorNick) + { + this.vendorNick = vendorNick; + } + + public String getVendorNick() + { + return vendorNick; + } + public void setSourceDocType(String sourceDocType) + { + this.sourceDocType = sourceDocType; + } + + public String getSourceDocType() + { + return sourceDocType; + } + public void setSourceDocId(Long sourceDocId) + { + this.sourceDocId = sourceDocId; + } + + public Long getSourceDocId() + { + return sourceDocId; + } + public void setSourceDocCode(String sourceDocCode) + { + this.sourceDocCode = sourceDocCode; + } + + public String getSourceDocCode() + { + return sourceDocCode; + } + public void setSourceDocLineId(Long sourceDocLineId) + { + this.sourceDocLineId = sourceDocLineId; + } + + public Long getSourceDocLineId() + { + return sourceDocLineId; + } public void setMaterialStockId(Long materialStockId) { this.materialStockId = materialStockId; @@ -313,6 +425,15 @@ public class WmTransaction extends BaseEntity { return transactionDate; } + public void setRelatedTransactionId(Long relatedTransactionId) + { + this.relatedTransactionId = relatedTransactionId; + } + + public Long getRelatedTransactionId() + { + return relatedTransactionId; + } public void setErpDate(Date erpDate) { this.erpDate = erpDate; @@ -388,10 +509,19 @@ public class WmTransaction extends BaseEntity .append("areaId", getAreaId()) .append("areaCode", getAreaCode()) .append("areaName", getAreaName()) + .append("vendorId", getVendorId()) + .append("vendorCode", getVendorCode()) + .append("vendorName", getVendorName()) + .append("vendorNick", getVendorNick()) + .append("sourceDocType", getSourceDocType()) + .append("sourceDocId", getSourceDocId()) + .append("sourceDocCode", getSourceDocCode()) + .append("sourceDocLineId", getSourceDocLineId()) .append("materialStockId", getMaterialStockId()) .append("transactionFlag", getTransactionFlag()) .append("transactionQuantity", getTransactionQuantity()) .append("transactionDate", getTransactionDate()) + .append("relatedTransactionId", getRelatedTransactionId()) .append("erpDate", getErpDate()) .append("expireDate", getExpireDate()) .append("attr1", getAttr1()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java index eb1b3c8..08290e6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java @@ -1,8 +1,9 @@ package com.ktg.mes.wm.mapper; -import java.util.List; import com.ktg.mes.wm.domain.WmMaterialStock; +import java.util.List; + /** * 库存记录Mapper接口 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java index 7637841..72486d0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java @@ -1,8 +1,9 @@ package com.ktg.mes.wm.service; -import java.util.List; import com.ktg.mes.wm.domain.WmMaterialStock; +import java.util.List; + /** * 库存记录Service接口 * diff --git a/ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml index 715b129..a53e02f 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,6 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -34,12 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, quantity_onhand, expire_date, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_material_stock + select material_stock_id, item_type_id, item_id, item_code, item_name, specification, unit_of_measure, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, vendor_id, vendor_code, vendor_name, vendor_nick, quantity_onhand, expire_date, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_material_stock @@ -61,12 +70,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and area_id = #{areaId} and area_code = #{areaCode} and area_name like concat('%', #{areaName}, '%') + and vendor_id = #{vendorId} + and vendor_code = #{vendorCode} + and vendor_name like concat('%', #{vendorName}, '%') + and vendor_nick = #{vendorNick} + and source_doc_type = #{sourceDocType} + and source_doc_id = #{sourceDocId} + and source_doc_code = #{sourceDocCode} + and source_doc_line_id = #{sourceDocLineId} and material_stock_id = #{materialStockId} and transaction_flag = #{transactionFlag} and transaction_quantity = #{transactionQuantity} and transaction_date = #{transactionDate} + and related_transaction_id = #{relatedTransactionId} and erp_date = #{erpDate} and expire_date = #{expireDate} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and attr4 = #{attr4} @@ -94,10 +116,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_id, area_code, area_name, + vendor_id, + vendor_code, + vendor_name, + vendor_nick, + source_doc_type, + source_doc_id, + source_doc_code, + source_doc_line_id, material_stock_id, transaction_flag, transaction_quantity, transaction_date, + related_transaction_id, erp_date, expire_date, attr1, @@ -126,10 +157,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{areaId}, #{areaCode}, #{areaName}, + #{vendorId}, + #{vendorCode}, + #{vendorName}, + #{vendorNick}, + #{sourceDocType}, + #{sourceDocId}, + #{sourceDocCode}, + #{sourceDocLineId}, #{materialStockId}, #{transactionFlag}, #{transactionQuantity}, #{transactionDate}, + #{relatedTransactionId}, #{erpDate}, #{expireDate}, #{attr1}, @@ -162,10 +202,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_id = #{areaId}, area_code = #{areaCode}, area_name = #{areaName}, + vendor_id = #{vendorId}, + vendor_code = #{vendorCode}, + vendor_name = #{vendorName}, + vendor_nick = #{vendorNick}, + source_doc_type = #{sourceDocType}, + source_doc_id = #{sourceDocId}, + source_doc_code = #{sourceDocCode}, + source_doc_line_id = #{sourceDocLineId}, material_stock_id = #{materialStockId}, transaction_flag = #{transactionFlag}, transaction_quantity = #{transactionQuantity}, transaction_date = #{transactionDate}, + related_transaction_id = #{relatedTransactionId}, erp_date = #{erpDate}, expire_date = #{expireDate}, attr1 = #{attr1},