From 53cbc19d153f1bcd62ec22cc1bbb5ac8673f6910 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Tue, 20 May 2025 18:00:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(delivery):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=E5=B9=B6?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 OrderDelivery 模型中添加 total 字段，用于记录发货数量
- 更新 delivery.html 以显示发货数量
- 修改 OrderDeliveryMapper.xml，加入对发货数量的统计查询
- 在 product.html 中添加上架编码字段
---
.../templates/manage/delivery/delivery.html | 11 +
.../templates/system/product/product.html | 4 +
.../com/ruoyi/sip/domain/OrderDelivery.java | 192 +-----------------
.../mapper/manage/OrderDeliveryMapper.xml | 4 +-
4 files changed, 23 insertions(+), 188 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index 8fa17e78..d78e185a 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -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: '发货日期'
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html
index d2c72a17..45e40110 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/product.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html
@@ -75,6 +75,10 @@
{
field: 'productCode',
title: 'BOM编码'
+ },
+ {
+ field: 'hzCode',
+ title: '上架编码'
},
{
field: 'productName',
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
index 21c6700d..cbb0ecbb 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
@@ -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();
- }
}
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
index fe1bd48d..d496c791 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
@@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"