From a8674e772af90b4a325c8904e3b9fb3fc2c19abd Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 4 Nov 2024 13:30:57 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E8=AF=A6=E6=83=85=E5=AE=9E?=
=?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=95=B0=E3=80=81=E5=B7=B2=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=95=B0=E3=80=81=E5=B7=B2=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5=20=E5=87=BA=E8=B4=A7=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E8=AF=A6=E6=83=85mapper.xml=E5=B1=82=E6=89=80?=
=?UTF-8?q?=E6=9C=89=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=EF=BC=8ChasShippi?=
=?UTF-8?q?ngNum=E3=80=81hasShippingNum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/SysSalesShippingInformDetail.java | 32 +++++++++++++++++--
.../SysSalesShippingInformDetailMapper.xml | 12 ++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java
index 035e6f1e..389a561b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java
@@ -72,8 +72,8 @@ public class SysSalesShippingInformDetail extends BaseEntity
@Excel(name = "订单数",isStatistics = true)
private Integer makeNum;
- /** 本次出货数 */
- @Excel(name = "本次出货数",isStatistics = true)
+ /** 申请出货数 */
+ @Excel(name = "申请出货数",isStatistics = true)
private Integer thisShippingNum;
/** 已出库数 */
@@ -88,6 +88,15 @@ public class SysSalesShippingInformDetail extends BaseEntity
@Excel(name = "已验收数",isStatistics = true)
private Integer hasCheckNum;
+ /** 已申请出货数 */
+ @Excel(name = "已申请出货数",isStatistics = true)
+ private Integer hasShippingNum;
+
+ /** 已完成数 */
+ @Excel(name = "已完成数",isStatistics = true)
+ private Integer hasCompleteNum;
+
+
public void setShippingInformDetailId(Long shippingInformDetailId)
{
this.shippingInformDetailId = shippingInformDetailId;
@@ -260,6 +269,23 @@ public class SysSalesShippingInformDetail extends BaseEntity
return hasCheckNum;
}
+
+ public Integer getHasShippingNum() {
+ return hasShippingNum;
+ }
+
+ public void setHasShippingNum(Integer hasShippingNum) {
+ this.hasShippingNum = hasShippingNum;
+ }
+
+ public Integer getHasCompleteNum() {
+ return hasCompleteNum;
+ }
+
+ public void setHasCompleteNum(Integer hasCompleteNum) {
+ this.hasCompleteNum = hasCompleteNum;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -282,6 +308,8 @@ public class SysSalesShippingInformDetail extends BaseEntity
.append("hasOutOrderNum", getHasOutOrderNum())
.append("thisCheckNum", getThisCheckNum())
.append("hasCheckNum", getHasCheckNum())
+ .append("hasShippingNum", getHasShippingNum())
+ .append("hasCompleteNum", getHasCompleteNum())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
index 74b4ab53..8ced8570 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail
+ select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, has_shipping_num, has_complete_num ,create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail