From 8a0b323a69f3b0f98158d8bc90394bbb44cf0bb2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 29 Nov 2022 19:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8D=95=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wm/controller/WmTransferController.java | 2 +-
.../com/ktg/mes/wm/domain/WmTransfer.java | 74 ++++++++++++-------
.../resources/mapper/wm/WmTransferMapper.xml | 12 ++-
3 files changed, 59 insertions(+), 29 deletions(-)
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
index 9d9f21b..ecd76ae 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
@@ -33,7 +33,7 @@ import com.ktg.common.core.page.TableDataInfo;
* @date 2022-11-28
*/
@RestController
-@RequestMapping("/wm/transfer")
+@RequestMapping("/mes/wm/transfer")
public class WmTransferController extends BaseController
{
@Autowired
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransfer.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransfer.java
index 1438543..5b0bae7 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransfer.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransfer.java
@@ -44,6 +44,12 @@ public class WmTransfer extends BaseEntity
@Excel(name = "托运单号")
private String bookingNote;
+ @Excel(name = "收货人")
+ private String receiver;
+
+ @Excel(name = "收货人名称")
+ private String receiverNick;
+
/** 移出仓库ID */
@Excel(name = "移出仓库ID")
private Long fromWarehouseId;
@@ -152,7 +158,24 @@ public class WmTransfer extends BaseEntity
{
return bookingNote;
}
- public void setFromWarehouseId(Long fromWarehouseId)
+
+ public String getReceiver() {
+ return receiver;
+ }
+
+ public void setReceiver(String receiver) {
+ this.receiver = receiver;
+ }
+
+ public String getReceiverNick() {
+ return receiverNick;
+ }
+
+ public void setReceiverNick(String receiverNick) {
+ this.receiverNick = receiverNick;
+ }
+
+ public void setFromWarehouseId(Long fromWarehouseId)
{
this.fromWarehouseId = fromWarehouseId;
}
@@ -263,31 +286,28 @@ public class WmTransfer extends BaseEntity
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("transferId", getTransferId())
- .append("transferCode", getTransferCode())
- .append("transferName", getTransferName())
- .append("transferType", getTransferType())
- .append("destination", getDestination())
- .append("carrier", getCarrier())
- .append("bookingNote", getBookingNote())
- .append("fromWarehouseId", getFromWarehouseId())
- .append("fromWarehouseCode", getFromWarehouseCode())
- .append("fromWarehouseName", getFromWarehouseName())
- .append("toWarehouseId", getToWarehouseId())
- .append("toWarehouseCode", getToWarehouseCode())
- .append("toWarehouseName", getToWarehouseName())
- .append("transferDate", getTransferDate())
- .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 "WmTransfer{" +
+ "transferId=" + transferId +
+ ", transferCode='" + transferCode + '\'' +
+ ", transferName='" + transferName + '\'' +
+ ", transferType='" + transferType + '\'' +
+ ", destination='" + destination + '\'' +
+ ", carrier='" + carrier + '\'' +
+ ", bookingNote='" + bookingNote + '\'' +
+ ", receiver='" + receiver + '\'' +
+ ", receiverNick='" + receiverNick + '\'' +
+ ", fromWarehouseId=" + fromWarehouseId +
+ ", fromWarehouseCode='" + fromWarehouseCode + '\'' +
+ ", fromWarehouseName='" + fromWarehouseName + '\'' +
+ ", toWarehouseId=" + toWarehouseId +
+ ", toWarehouseCode='" + toWarehouseCode + '\'' +
+ ", toWarehouseName='" + toWarehouseName + '\'' +
+ ", transferDate=" + transferDate +
+ ", status='" + status + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmTransferMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmTransferMapper.xml
index cb4ac2a..7d924a0 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmTransferMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmTransferMapper.xml
@@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select transfer_id, transfer_code, transfer_name, transfer_type, destination, carrier, booking_note, from_warehouse_id, from_warehouse_code, from_warehouse_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, transfer_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer
+ select transfer_id, transfer_code, transfer_name, transfer_type, destination, carrier, booking_note,receiver,receiver_nick, from_warehouse_id, from_warehouse_code, from_warehouse_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, transfer_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer