From 9f81b224b74b719672789ce85e0e1b4931763403 Mon Sep 17 00:00:00 2001 From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com> Date: Thu, 27 Oct 2022 23:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/controller/WmRtVendorController.java | 2 +- .../com/ktg/mes/wm/domain/WmProductRecpt.java | 119 +++++++++++++----- .../mapper/wm/WmProductRecptMapper.xml | 27 +++- 3 files changed, 117 insertions(+), 31 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtVendorController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtVendorController.java index ad20da5..f6acd88 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtVendorController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtVendorController.java @@ -140,7 +140,7 @@ public class WmRtVendorController extends BaseController public AjaxResult execute(@PathVariable Long rtId){ //判断单据状态 WmRtVendor wmRtVendor = wmRtVendorService.selectWmRtVendorByRtId(rtId); - + //构造事务Bean List beans = wmRtVendorService.getTxBeans(rtId); diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java index d694ff1..6d1bbf6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java @@ -40,6 +40,26 @@ public class WmProductRecpt extends BaseEntity @Excel(name = "生产工单名称") private String workorderName; + /** 产品物料ID */ + @Excel(name = "产品物料ID") + private Long itemId; + + /** 产品物料编码 */ + @Excel(name = "产品物料编码") + private String itemCode; + + /** 产品物料名称 */ + @Excel(name = "产品物料名称") + private String itemName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String specification; + + /** 单位 */ + @Excel(name = "单位") + private String unitOfMeasure; + /** 仓库ID */ @Excel(name = "仓库ID") private Long warehouseId; @@ -151,7 +171,48 @@ public class WmProductRecpt extends BaseEntity { return workorderName; } - public void setWarehouseId(Long warehouseId) + + public Long getItemId() { + return itemId; + } + + public void setItemId(Long itemId) { + this.itemId = itemId; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getSpecification() { + return specification; + } + + public void setSpecification(String specification) { + this.specification = specification; + } + + public String getUnitOfMeasure() { + return unitOfMeasure; + } + + public void setUnitOfMeasure(String unitOfMeasure) { + this.unitOfMeasure = unitOfMeasure; + } + + public void setWarehouseId(Long warehouseId) { this.warehouseId = warehouseId; } @@ -289,33 +350,33 @@ public class WmProductRecpt extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("recptId", getRecptId()) - .append("recptCode", getRecptCode()) - .append("recptName", getRecptName()) - .append("workorderId", getWorkorderId()) - .append("workorderCode", getWorkorderCode()) - .append("workorderName", getWorkorderName()) - .append("warehouseId", getWarehouseId()) - .append("warehouseCode", getWarehouseCode()) - .append("warehouseName", getWarehouseName()) - .append("locationId", getLocationId()) - .append("locationCode", getLocationCode()) - .append("locationName", getLocationName()) - .append("areaId", getAreaId()) - .append("areaCode", getAreaCode()) - .append("areaName", getAreaName()) - .append("recptDate", getRecptDate()) - .append("status", getStatus()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "WmProductRecpt{" + + "recptId=" + recptId + + ", recptCode='" + recptCode + '\'' + + ", recptName='" + recptName + '\'' + + ", workorderId=" + workorderId + + ", workorderCode='" + workorderCode + '\'' + + ", workorderName='" + workorderName + '\'' + + ", itemId=" + itemId + + ", itemCode='" + itemCode + '\'' + + ", itemName='" + itemName + '\'' + + ", specification='" + specification + '\'' + + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", warehouseId=" + warehouseId + + ", warehouseCode='" + warehouseCode + '\'' + + ", warehouseName='" + warehouseName + '\'' + + ", locationId=" + locationId + + ", locationCode='" + locationCode + '\'' + + ", locationName='" + locationName + '\'' + + ", areaId=" + areaId + + ", areaCode='" + areaCode + '\'' + + ", areaName='" + areaName + '\'' + + ", recptDate=" + recptDate + + ", status='" + status + '\'' + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3=" + attr3 + + ", attr4=" + attr4 + + '}'; } } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml index 37a67a1..1c8130e 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml @@ -11,6 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -34,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select recpt_id, recpt_code, recpt_name, workorder_id, workorder_code, workorder_name, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt + select recpt_id, recpt_code, recpt_name, workorder_id, workorder_code, workorder_name,item_id, item_code, item_name, specification, unit_of_measure, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt