转移单添加收货人字段
This commit is contained in:
parent
5d81c76516
commit
8a0b323a69
@ -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
|
||||
|
@ -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 +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="destination" column="destination" />
|
||||
<result property="carrier" column="carrier" />
|
||||
<result property="bookingNote" column="booking_note" />
|
||||
<result property="receiver" column="receiver" />
|
||||
<result property="receiverNick" column="receiver_nick" />
|
||||
<result property="fromWarehouseId" column="from_warehouse_id" />
|
||||
<result property="fromWarehouseCode" column="from_warehouse_code" />
|
||||
<result property="fromWarehouseName" column="from_warehouse_name" />
|
||||
@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectWmTransferVo">
|
||||
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
|
||||
</sql>
|
||||
|
||||
<select id="selectWmTransferList" parameterType="WmTransfer" resultMap="WmTransferResult">
|
||||
@ -44,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="destination != null and destination != ''"> and destination = #{destination}</if>
|
||||
<if test="carrier != null and carrier != ''"> and carrier = #{carrier}</if>
|
||||
<if test="bookingNote != null and bookingNote != ''"> and booking_note = #{bookingNote}</if>
|
||||
<if test="receiver != null and receiver != ''">and receiver = #{receiver}</if>
|
||||
<if test="receiverNick != null and receiverNick !=''">and receiver_nick like concat('%',#{receiverNick},'%') </if>
|
||||
<if test="fromWarehouseId != null "> and from_warehouse_id = #{fromWarehouseId}</if>
|
||||
<if test="fromWarehouseCode != null and fromWarehouseCode != ''"> and from_warehouse_code = #{fromWarehouseCode}</if>
|
||||
<if test="fromWarehouseName != null and fromWarehouseName != ''"> and from_warehouse_name like concat('%', #{fromWarehouseName}, '%')</if>
|
||||
@ -74,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="destination != null">destination,</if>
|
||||
<if test="carrier != null">carrier,</if>
|
||||
<if test="bookingNote != null">booking_note,</if>
|
||||
<if test="receiver != null">receiver,</if>
|
||||
<if test="receiverNick != null">receiver_nick,</if>
|
||||
<if test="fromWarehouseId != null">from_warehouse_id,</if>
|
||||
<if test="fromWarehouseCode != null">from_warehouse_code,</if>
|
||||
<if test="fromWarehouseName != null">from_warehouse_name,</if>
|
||||
@ -99,6 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="destination != null">#{destination},</if>
|
||||
<if test="carrier != null">#{carrier},</if>
|
||||
<if test="bookingNote != null">#{bookingNote},</if>
|
||||
<if test="receiver != null">#{receiver},</if>
|
||||
<if test="receiverNick != null">#{receiverNick},</if>
|
||||
<if test="fromWarehouseId != null">#{fromWarehouseId},</if>
|
||||
<if test="fromWarehouseCode != null">#{fromWarehouseCode},</if>
|
||||
<if test="fromWarehouseName != null">#{fromWarehouseName},</if>
|
||||
@ -128,6 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="destination != null">destination = #{destination},</if>
|
||||
<if test="carrier != null">carrier = #{carrier},</if>
|
||||
<if test="bookingNote != null">booking_note = #{bookingNote},</if>
|
||||
<if test="receiver != null">receiver = #{receiver},</if>
|
||||
<if test="receiverNick != null">receiver_nick = #{receiverNick},</if>
|
||||
<if test="fromWarehouseId != null">from_warehouse_id = #{fromWarehouseId},</if>
|
||||
<if test="fromWarehouseCode != null">from_warehouse_code = #{fromWarehouseCode},</if>
|
||||
<if test="fromWarehouseName != null">from_warehouse_name = #{fromWarehouseName},</if>
|
||||
|
Loading…
Reference in New Issue
Block a user