diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-dev.yml
similarity index 95%
rename from ruoyi-admin/src/main/resources/application-druid.yml
rename to ruoyi-admin/src/main/resources/application-dev.yml
index 7f033ab1..a790bbec 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,61 +1,63 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
-                username: root
-                password: unis@db
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置连接超时时间
-            connectTimeout: 30000
-            # 配置网络超时时间
-            socketTimeout: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
+ruoyi:
+    excelTemplate: D:\ruoyi\excelTemplate
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
+                username: root
+                password: unis@db
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
                         multi-statement-allow: true
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
new file mode 100644
index 00000000..3e2ad313
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,66 @@
+ruoyi:
+    excelTemplate: /home/application/excelTemplate
+server:
+    # 服务器的HTTP端口，默认为80
+    port: 28081
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://121.199.168.157:3306/unis_sip_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
+                username: root
+                password: unis@db
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6527226e..2a2f3932 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -12,7 +12,6 @@ ruoyi:
   profile: D:\ruoyi\uploadPath
   # 获取ip地址开关
   addressEnabled: false
-  excelTemplate: D:\ruoyi\excelTemplate
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
@@ -59,7 +58,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: druid
+    active: dev
   # 文件上传
   servlet:
     multipart:
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"
 
     <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">