feat(delivery): 添加发货数量字段并优化订单发货列表查询
- 在 OrderDelivery 模型中添加 total 字段，用于记录发货数量 - 更新 delivery.html 以显示发货数量 - 修改 OrderDeliveryMapper.xml，加入对发货数量的统计查询 - 在 product.html 中添加上架编码字段master
parent
4a3c292d14
commit
53cbc19d15
|
|
@ -101,6 +101,17 @@
|
|||
field: 'deliveryCode',
|
||||
title: '发货单号'
|
||||
},
|
||||
{
|
||||
field: 'total',
|
||||
title: '发货数量',
|
||||
formatter: function(value, row, index) {
|
||||
if (value){
|
||||
return value
|
||||
}else{
|
||||
return 0
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'deliveryDate',
|
||||
title: '发货日期'
|
||||
|
|
|
|||
|
|
@ -75,6 +75,10 @@
|
|||
{
|
||||
field: 'productCode',
|
||||
title: 'BOM编码'
|
||||
},
|
||||
{
|
||||
field: 'hzCode',
|
||||
title: '上架编码'
|
||||
},
|
||||
{
|
||||
field: 'productName',
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ package com.ruoyi.sip.domain;
|
|||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
|
|
@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
|||
* @author mula
|
||||
* @date 2025-04-11
|
||||
*/
|
||||
@Data
|
||||
@ToString
|
||||
public class OrderDelivery extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
@ -70,192 +74,6 @@ public class OrderDelivery extends BaseEntity
|
|||
|
||||
/** 删除时间 */
|
||||
private Date deletedAt;
|
||||
private String total;
|
||||
|
||||
public String getOrderCode() {
|
||||
return orderCode;
|
||||
}
|
||||
|
||||
public void setOrderCode(String orderCode) {
|
||||
this.orderCode = orderCode;
|
||||
}
|
||||
|
||||
public String getOrderName() {
|
||||
return orderName;
|
||||
}
|
||||
|
||||
public void setOrderName(String orderName) {
|
||||
this.orderName = orderName;
|
||||
}
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId)
|
||||
{
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public Long getOrderId()
|
||||
{
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setDeliveryCode(String deliveryCode)
|
||||
{
|
||||
this.deliveryCode = deliveryCode;
|
||||
}
|
||||
|
||||
public String getDeliveryCode()
|
||||
{
|
||||
return deliveryCode;
|
||||
}
|
||||
|
||||
public void setDeliveryDate(Date deliveryDate)
|
||||
{
|
||||
this.deliveryDate = deliveryDate;
|
||||
}
|
||||
|
||||
public Date getDeliveryDate()
|
||||
{
|
||||
return deliveryDate;
|
||||
}
|
||||
|
||||
public void setDeliveryType(String deliveryType)
|
||||
{
|
||||
this.deliveryType = deliveryType;
|
||||
}
|
||||
|
||||
public String getDeliveryType()
|
||||
{
|
||||
return deliveryType;
|
||||
}
|
||||
|
||||
public void setLogisticsCompany(String logisticsCompany)
|
||||
{
|
||||
this.logisticsCompany = logisticsCompany;
|
||||
}
|
||||
|
||||
public String getLogisticsCompany()
|
||||
{
|
||||
return logisticsCompany;
|
||||
}
|
||||
|
||||
public void setLogisticsCode(String logisticsCode)
|
||||
{
|
||||
this.logisticsCode = logisticsCode;
|
||||
}
|
||||
|
||||
public String getLogisticsCode()
|
||||
{
|
||||
return logisticsCode;
|
||||
}
|
||||
|
||||
public void setReceiverName(String receiverName)
|
||||
{
|
||||
this.receiverName = receiverName;
|
||||
}
|
||||
|
||||
public String getReceiverName()
|
||||
{
|
||||
return receiverName;
|
||||
}
|
||||
|
||||
public void setReceiverPhone(String receiverPhone)
|
||||
{
|
||||
this.receiverPhone = receiverPhone;
|
||||
}
|
||||
|
||||
public String getReceiverPhone()
|
||||
{
|
||||
return receiverPhone;
|
||||
}
|
||||
|
||||
public void setReceiverAddress(String receiverAddress)
|
||||
{
|
||||
this.receiverAddress = receiverAddress;
|
||||
}
|
||||
|
||||
public String getReceiverAddress()
|
||||
{
|
||||
return receiverAddress;
|
||||
}
|
||||
|
||||
public void setDeliveryStatus(String deliveryStatus)
|
||||
{
|
||||
this.deliveryStatus = deliveryStatus;
|
||||
}
|
||||
|
||||
public String getDeliveryStatus()
|
||||
{
|
||||
return deliveryStatus;
|
||||
}
|
||||
|
||||
public void setSignTime(Date signTime)
|
||||
{
|
||||
this.signTime = signTime;
|
||||
}
|
||||
|
||||
public Date getSignTime()
|
||||
{
|
||||
return signTime;
|
||||
}
|
||||
|
||||
public void setCreatedAt(Date createdAt)
|
||||
{
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public Date getCreatedAt()
|
||||
{
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(Date updatedAt)
|
||||
{
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
|
||||
public Date getUpdatedAt()
|
||||
{
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setDeletedAt(Date deletedAt)
|
||||
{
|
||||
this.deletedAt = deletedAt;
|
||||
}
|
||||
|
||||
public Date getDeletedAt()
|
||||
{
|
||||
return deletedAt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("orderId", getOrderId())
|
||||
.append("deliveryCode", getDeliveryCode())
|
||||
.append("deliveryDate", getDeliveryDate())
|
||||
.append("deliveryType", getDeliveryType())
|
||||
.append("logisticsCompany", getLogisticsCompany())
|
||||
.append("logisticsCode", getLogisticsCode())
|
||||
.append("receiverName", getReceiverName())
|
||||
.append("receiverPhone", getReceiverPhone())
|
||||
.append("receiverAddress", getReceiverAddress())
|
||||
.append("deliveryStatus", getDeliveryStatus())
|
||||
.append("signTime", getSignTime())
|
||||
.append("remark", getRemark())
|
||||
.append("createdAt", getCreatedAt())
|
||||
.append("updatedAt", getUpdatedAt())
|
||||
.append("deletedAt", getDeletedAt())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<select id="selectOrderDeliveryList" parameterType="OrderDelivery" resultMap="OrderDeliveryResult">
|
||||
select t1.id, t1.order_id, t1.delivery_code, t1.delivery_date, t1.delivery_type, t1.logistics_company, t1.logistics_code, t1.receiver_name, t1.receiver_phone, t1.receiver_address, t1.delivery_status, t1.sign_time, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
|
||||
t2.order_code,t2.order_name
|
||||
t2.order_code,t2.order_name,t3.total
|
||||
|
||||
from order_delivery t1
|
||||
left join order_info t2 on t1.order_id = t2.id
|
||||
left join (select count(1) as total,delivery_id from delivery_list group by delivery_id) t3 on t1.id = t3.delivery_id
|
||||
<where>
|
||||
t1.status=0
|
||||
<if test="orderId != null "> and t1.order_id = #{orderId}</if>
|
||||
|
|
@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="logisticsCompany != null and logisticsCompany != ''"> and t1.logistics_company = #{logisticsCompany}</if>
|
||||
<if test="deliveryStatus != null and deliveryStatus != ''"> and t1.delivery_status = #{deliveryStatus}</if>
|
||||
</where>
|
||||
order by t1.order_id,t1.delivery_date
|
||||
</select>
|
||||
|
||||
<select id="selectOrderDeliveryById" parameterType="Long" resultMap="OrderDeliveryResult">
|
||||
|
|
|
|||
Loading…
Reference in New Issue