diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesShippingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesShippingInformation.java
index 707a3686..b0260a32 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesShippingInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesShippingInformation.java
@@ -27,6 +27,11 @@ public class SalesShippingInformation extends BaseEntity
     @Excel(name = "出货资料单号")
     private String shippingInformationCode;
 
+
+    /** 关联单号 */
+    @Excel(name = "关联单号")
+    private String correlationCode;
+
     /** 关联销售订单号 */
     @Excel(name = "关联销售订单号")
     private String salesOrderCode;
@@ -76,28 +81,28 @@ public class SalesShippingInformation extends BaseEntity
     @Excel(name = "单据日期(手动填写)")
     private String orderDate;
 
-    /** 收货联系人(Ship to) */
-    @Excel(name = "收货联系人(Ship to)")
+    /** 收货联系人(Ship To) */
+    @Excel(name = "收货联系人(Ship To)")
     private String customerContact;
 
-    /** 联系电话(Ship to) */
-    @Excel(name = "联系电话(Ship to)")
+    /** 联系电话(Ship To) */
+    @Excel(name = "联系电话(Ship To)")
     private String contactNumber;
 
-    /** 收货地址(Ship to) */
-    @Excel(name = "收货地址(Ship to)")
+    /** 收货地址(Ship To) */
+    @Excel(name = "收货地址(Ship To)")
     private String customerContactAddress;
 
-    /** 收货联系人(Bill to) */
-    @Excel(name = "收货联系人(Bill to)")
+    /** 收货联系人(Bill To) */
+    @Excel(name = "收货联系人(Bill To)")
     private String customerContactBillto;
 
-    /** 联系电话(Bill to) */
-    @Excel(name = "联系电话(Bill to)")
+    /** 联系电话(Bill To) */
+    @Excel(name = "联系电话(Bill To)")
     private String contactNumberBillto;
 
-    /** 收货地址(Bill to) */
-    @Excel(name = "收货地址(Bill to)")
+    /** 收货地址(Bill To) */
+    @Excel(name = "收货地址(Bill To)")
     private String contactAddressBillto;
 
     /** 不含税总价（RMB） */
@@ -140,7 +145,16 @@ public class SalesShippingInformation extends BaseEntity
     {
         return shippingInformationCode;
     }
-    public void setSalesOrderCode(String salesOrderCode) 
+
+    public String getCorrelationCode() {
+        return correlationCode;
+    }
+
+    public void setCorrelationCode(String correlationCode) {
+        this.correlationCode = correlationCode;
+    }
+
+    public void setSalesOrderCode(String salesOrderCode)
     {
         this.salesOrderCode = salesOrderCode;
     }
@@ -361,6 +375,7 @@ public class SalesShippingInformation extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("shippingInformationId", getShippingInformationId())
             .append("shippingInformationCode", getShippingInformationCode())
+            .append("correlationCode",getCorrelationCode())
             .append("salesOrderCode", getSalesOrderCode())
             .append("makeNo", getMakeNo())
             .append("invoiceCode", getInvoiceCode())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
index 5b85645c..574dc64e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
@@ -214,11 +214,11 @@ public class SysSalesOrder extends BaseEntity {
 
 
 
-    /*交货地点(Bill to)*/
+    /*交货地点(Bill To)*/
     private String deliveryAddressBillto;
-    /*客户收货人(Bill to)*/
+    /*客户收货人(Bill To)*/
     private String customerDeliveryBillto;
-    /*客户收货人电话(Bill to)*/
+    /*客户收货人电话(Bill To)*/
     private String deliveryPhoneBillto;
 
     public String getBusinessMembersName() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
index e464d730..a702cb6a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java
@@ -135,4 +135,5 @@ public interface SysMakeOrderMapper
      * 根据销售单号集合查询生产订单集合
      * */
     List<SysMakeOrder> selectMakeOrderListBySalesOrderCodes(List<String> salesOrderCode);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index 1f9a7712..7ddf0579 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -25,7 +25,10 @@ import com.ruoyi.common.utils.NumberChineseFormatterUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileDownloadUtils;
+import com.ruoyi.sales.domain.SalesShippingInformation;
 import com.ruoyi.sales.domain.SalesShippingInformationDetail;
+import com.ruoyi.sales.mapper.SalesShippingInformationDetailMapper;
+import com.ruoyi.sales.mapper.SalesShippingInformationMapper;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.Vo.ConfirmReceivingDetailVo;
 import com.ruoyi.system.domain.Vo.ExportSalesShippingInformDetailVo;
@@ -94,6 +97,17 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     @Autowired
     private ISysRemindService remindService;
 
+
+    @Autowired
+    private SysSalesOrderChildMapper sysSalesOrderChildMapper;
+
+    @Autowired
+    private SalesShippingInformationMapper salesShippingInformationMapper;
+
+    @Autowired
+    private SalesShippingInformationDetailMapper salesShippingInformationDetailMapper;
+
+
     /**
      * 查询销售出货通知
      * 
@@ -420,6 +434,10 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 //             throw new BusinessException("更新销售订单数据失败");
 //         }
 
+        //生成送货单信息
+        buildSalesShippingInformationShipping(sysSalesShippingInform);
+
+
         int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
         if (updateWarehouseOutOrderResult <= 0){
             throw new BusinessException("更新出库单数据失败");
@@ -427,6 +445,71 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         return sysSalesShippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform);
     }
 
+    //生成送货单信息
+    private void buildSalesShippingInformationShipping(SysSalesShippingInform sysSalesShippingInform) {
+        SalesShippingInformation salesShippingInformation = new SalesShippingInformation();
+        Long shippingInformId = sysSalesShippingInform.getShippingInformId();
+
+        SysSalesShippingInform oldSysSalesShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformById(shippingInformId);
+        String loginName = ShiroUtils.getLoginName();
+        String salesOrderCode = oldSysSalesShippingInform.getSalesOrderCode();
+        List<String> salesOrderCodes = new ArrayList<>();
+        if (StringUtils.isNotEmpty(salesOrderCode)){
+            String[] splitSalesOrderCode = salesOrderCode.split(",");
+            salesOrderCodes = Arrays.asList(splitSalesOrderCode);
+        }
+        List<SysSalesOrder> sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes);
+
+
+        List<SysMakeOrder> sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes);
+
+        String makeNosString = sysMakeOrders.stream().map(SysMakeOrder::getMakeNo).collect(Collectors.joining(","));
+
+
+        String shippingInformationCode = redisCache.generateBillNo("CHZL");
+        String shippingCode = redisCache.generateBillNo("SHD");
+
+        List<SysSalesOrderChild> sysSalesOrderChildren = sysSalesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+
+        List<SalesShippingInformationDetail> salesShippingInformationDetails = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(sysSalesOrderChildren)){
+
+            for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+                SalesShippingInformationDetail salesShippingInformationDetail = new SalesShippingInformationDetail();
+                salesShippingInformationDetail.setShippingInformationCode(shippingInformationCode);
+                salesShippingInformationDetail.setMaterialNo(sysSalesOrderChild.getMaterialCode());
+                salesShippingInformationDetail.setMaterialName(sysSalesOrderChild.getMaterialName());
+                salesShippingInformationDetail.setMaterialDescribe(sysSalesOrderChild.getDescribe());
+                salesShippingInformationDetail.setMaterialModel(sysSalesOrderChild.getMaterialModel());
+                salesShippingInformationDetail.setMaterialNum(sysSalesOrderChild.getMaterialNum());
+                salesShippingInformationDetail.setMaterialUnit(sysSalesOrderChild.getUnit());
+                salesShippingInformationDetails.add(salesShippingInformationDetail);
+            }
+            int insertDetailResult = salesShippingInformationDetailMapper.insertBatchSalesShippingInformationDetail(salesShippingInformationDetails);
+            if (insertDetailResult <= 0){
+                throw new BusinessException("新增销售出货单明细失败！");
+            }
+        }
+        salesShippingInformation.setShippingInformationCode(shippingInformationCode);
+        salesShippingInformation.setShippingCode(shippingCode);
+        salesShippingInformation.setMakeNo(makeNosString);
+        salesShippingInformation.setBusinessMembers(loginName);
+        salesShippingInformation.setShippingInformationType("2");//出货单
+        salesShippingInformation.setShippingDate(new Date());
+        salesShippingInformation.setCustomerContactBillto(sysSalesShippingInform.getCustomerContactBillto());
+        salesShippingInformation.setCustomerContactAddress(sysSalesShippingInform.getCustomerContactAddress());
+        salesShippingInformation.setCustomerContact(sysSalesShippingInform.getCustomerContact());
+        salesShippingInformation.setContactAddressBillto(sysSalesShippingInform.getContactAddressBillto());
+        salesShippingInformation.setCustomerId(sysSalesShippingInform.getCustomerId());
+        salesShippingInformation.setCustomerName(sysSalesShippingInform.getCustomerName());
+        salesShippingInformation.setSalesOrderNumber(sysSalesShippingInform.getSalesOrderNumber());
+        salesShippingInformation.setCorrelationCode(sysSalesShippingInform.getOutOrderCode());
+        salesShippingInformation.setCreateTime(new Date());
+        salesShippingInformation.setCreateBy(loginName);
+        salesShippingInformationMapper.insertSalesShippingInformation(salesShippingInformation);
+    }
+
     /**
      * 修改保存取消发货
      */
@@ -438,7 +521,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         String outOrderCode = sysSalesShippingInform.getOutOrderCode();
         List<SysSalesShippingInformDetail> sysSalesShippingInformDetails = shippingInformDetailMapper.selectSysSalesShippingInformDetailByCode(outOrderCode);
 
-
+        SysSalesShippingInform oldSysSalesShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
         for (SysSalesShippingInformDetail sysSalesShippingInformDetail : sysSalesShippingInformDetails) {
             String materialNo = sysSalesShippingInformDetail.getMaterialNo();
             Integer thisShippingNum = sysSalesShippingInformDetail.getThisShippingNum();
@@ -512,6 +595,30 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         if (updateAftersalesOutOrderResult <= 0){
             throw new BusinessException("更新售后出库单数据失败");
         }
+
+        //去掉销售订单子表的申请出货数数据
+        String salesOrderCode = oldSysSalesShippingInform.getSalesOrderCode();
+        List<String> salesOrderCodes = new ArrayList<>();
+        if (StringUtils.isNotEmpty(salesOrderCode)){
+            String[] splitSalesOrderCode = salesOrderCode.split(",");
+            salesOrderCodes = Arrays.asList(splitSalesOrderCode);
+        }
+        List<SysSalesOrderChild> sysSalesOrderChildren = sysSalesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes);
+        sysSalesOrderChildren.forEach(item->{
+            item.setApplyShippingNum(0);
+            item.setHasApplyShippingNum(0);
+            item.setUpdateTime(new Date());
+            item.setUpdateBy(loginName);
+        });
+
+        for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) {
+            int updateSysSalesOrderChildResult = sysSalesOrderChildMapper.updateSysSalesOrderChild(sysSalesOrderChild);
+            if (updateSysSalesOrderChildResult <= 0){
+                throw new BusinessException("更新销售订单子表数据失败");
+            }
+
+        }
+
         //取消销售出货通知单
         sysSalesShippingInform.setOutOrderCode(outOrderCode);
         sysSalesShippingInform.setWarehouseOutStatus("8");
diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
index ad8f2017..fd75df4d 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SalesShippingInformation" id="SalesShippingInformationResult">
         <result property="shippingInformationId"    column="shipping_information_id"    />
         <result property="shippingInformationCode"    column="shipping_information_code"    />
+        <result property="correlationCode" column="correlation_code"/>
         <result property="salesOrderCode"    column="sales_order_code"    />
         <result property="makeNo"    column="make_no"    />
         <result property="invoiceCode"    column="invoice_code"    />
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSalesShippingInformationVo">
-        select shipping_information_id, shipping_information_code, sales_order_code, make_no, invoice_code, shipping_code, packing_code, shipping_information_type, business_members, customer_id, customer_name, sales_order_number, shipping_date, order_date, customer_contact, contact_number, customer_contact_address, customer_contact_billto, contact_number_billto, contact_address_billto, all_no_tax_rmb, all_no_tax_dollar, origin_country, trade_terms, remarks, create_time, create_by, update_by, update_time from sales_shipping_information
+        select shipping_information_id, shipping_information_code, correlation_code,sales_order_code, make_no, invoice_code, shipping_code, packing_code, shipping_information_type, business_members, customer_id, customer_name, sales_order_number, shipping_date, order_date, customer_contact, contact_number, customer_contact_address, customer_contact_billto, contact_number_billto, contact_address_billto, all_no_tax_rmb, all_no_tax_dollar, origin_country, trade_terms, remarks, create_time, create_by, update_by, update_time from sales_shipping_information
     </sql>
 
     <select id="selectSalesShippingInformationList" parameterType="SalesShippingInformation" resultMap="SalesShippingInformationResult">
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingCode != null  and shippingCode != ''"> and shipping_code like concat('%', #{shippingCode}, '%')</if>
             <if test="packingCode != null  and packingCode != ''"> and packing_code like concat('%', #{packingCode}, '%')</if>
             <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
@@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingCode != null  and shippingCode != ''"> and shipping_code like concat('%', #{shippingCode}, '%')</if>
             <if test="packingCode != null  and packingCode != ''"> and packing_code like concat('%', #{packingCode}, '%')</if>
             <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
              and shipping_information_type = '1'
@@ -96,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingCode != null  and shippingCode != ''"> and shipping_code like concat('%', #{shippingCode}, '%')</if>
             <if test="packingCode != null  and packingCode != ''"> and packing_code like concat('%', #{packingCode}, '%')</if>
             <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             and shipping_information_type = '0'
@@ -115,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingCode != null  and shippingCode != ''"> and shipping_code like concat('%', #{shippingCode}, '%')</if>
             <if test="packingCode != null  and packingCode != ''"> and packing_code like concat('%', #{packingCode}, '%')</if>
             <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             and shipping_information_type = '2'
@@ -129,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into sales_shipping_information
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="shippingInformationCode != null">shipping_information_code,</if>
+            <if test="correlationCode != null">correlation_code,</if>
             <if test="salesOrderCode != null">sales_order_code,</if>
             <if test="makeNo != null">make_no,</if>
             <if test="invoiceCode != null">invoice_code,</if>
@@ -159,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="shippingInformationCode != null">#{shippingInformationCode},</if>
+            <if test="correlationCode != null">#{correlationCode},</if>
             <if test="salesOrderCode != null">#{salesOrderCode},</if>
             <if test="makeNo != null">#{makeNo},</if>
             <if test="invoiceCode != null">#{invoiceCode},</if>
@@ -193,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sales_shipping_information
         <trim prefix="SET" suffixOverrides=",">
             <if test="shippingInformationCode != null">shipping_information_code = #{shippingInformationCode},</if>
+            <if test="correlationCode != null">correlation_code = #{correlationCode},</if>
             <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
             <if test="makeNo != null">make_no = #{makeNo},</if>
             <if test="invoiceCode != null">invoice_code = #{invoiceCode},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/add.html
index d3b9fb8f..ead2f1d0 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/add.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/add.html
@@ -41,38 +41,38 @@
                     <input name="orderDate" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Ship to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContact" class="form-control" type="text" required>
+                    <input name="customerContact" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Ship to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactAddress" class="form-control" type="text" required>
+                    <input name="customerContactAddress" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Bill to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactBillto" class="form-control" type="text" required>
+                    <input name="customerContactBillto" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Bill to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="contactAddressBillto" class="form-control" type="text" required>
+                    <input name="contactAddressBillto" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">原产国：</label>
+                <label class="col-sm-3 control-label">原产国：</label>
                 <div class="col-sm-8">
                     <input name="originCountry" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">贸易条款：</label>
+                <label class="col-sm-3 control-label">贸易条款：</label>
                 <div class="col-sm-8">
                     <input name="tradeTerms" class="form-control" type="text" required>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/edit.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/edit.html
index f4445556..99ef39bd 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/edit.html
@@ -57,25 +57,25 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+                <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
                 <div class="col-sm-8">
                     <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+                <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
                 <div class="col-sm-8">
                     <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+                <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
                 <div class="col-sm-8">
                     <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+                <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
                 <div class="col-sm-8">
                     <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/invoiceDetail.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/invoiceDetail.html
index 670fdc4d..615db3e3 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/invoiceDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationInvoice/invoiceDetail.html
@@ -57,25 +57,25 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+            <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+            <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+            <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
             <div class="col-sm-8">
                 <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+            <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
             <div class="col-sm-8">
                 <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/add.html
index b2906392..164e1d06 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/add.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/add.html
@@ -41,28 +41,28 @@
                     <input name="orderDate" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Ship to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContact" class="form-control" type="text" required>
+                    <input name="customerContact" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Ship to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactAddress" class="form-control" type="text" required>
+                    <input name="customerContactAddress" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Bill to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactBillto" class="form-control" type="text" required>
+                    <input name="customerContactBillto" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Bill to)：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="contactAddressBillto" class="form-control" type="text" required>
+                    <input name="contactAddressBillto" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/packingDetail.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/packingDetail.html
index df2af58a..432b5cb7 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/packingDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/packingDetail.html
@@ -57,25 +57,25 @@
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
       <div class="col-sm-8">
         <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
       <div class="col-sm-8">
         <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
       </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/supplementDocument.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/supplementDocument.html
index 735b83f8..4335c042 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/supplementDocument.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationPacking/supplementDocument.html
@@ -58,25 +58,25 @@
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
       <div class="col-sm-8">
         <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
       <div class="col-sm-8">
         <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
       </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/add.html
index 2ee783ae..506caf41 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/add.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/add.html
@@ -30,39 +30,27 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Ship to)：</label>
+                <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContact" class="form-control" type="text" required>
+                    <input name="customerContact" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Ship to)：</label>
+                <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactAddress" class="form-control" type="text" required>
+                    <input name="customerContactAddress" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货联系人(Bill to)：</label>
+                <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="customerContactBillto" class="form-control" type="text" required>
+                    <input name="customerContactBillto" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">收货地址(Bill to)：</label>
+                <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
                 <div class="col-sm-8">
-                    <input name="contactAddressBillto" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">原产国：</label>
-                <div class="col-sm-8">
-                    <input name="originCountry" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">贸易条款：</label>
-                <div class="col-sm-8">
-                    <input name="tradeTerms" class="form-control" type="text" required>
+                    <input name="contactAddressBillto" class="form-control" type="text">
                 </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/shippingDetail.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/shippingDetail.html
index e7113cdc..9ee88bd1 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/shippingDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/shippingDetail.html
@@ -60,25 +60,25 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+            <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+            <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+            <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
             <div class="col-sm-8">
                 <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+            <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
             <div class="col-sm-8">
                 <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/supplementDocument.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/supplementDocument.html
index 02c51321..ace087b4 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/supplementDocument.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/supplementDocument.html
@@ -61,42 +61,29 @@
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
       <div class="col-sm-8">
         <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
       <div class="col-sm-8">
         <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
-      <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+      <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
       <div class="col-sm-8">
         <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
       </div>
     </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">原产国：</label>
-      <div class="col-sm-8">
-        <input name="originCountry" th:field="*{originCountry}" class="form-control" type="text" readonly>
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">贸易条款：</label>
-      <div class="col-sm-8">
-        <input name="tradeTerms" th:field="*{tradeTerms}" class="form-control" type="text" readonly>
-      </div>
-    </div>
-
     <div class="col-sm-12 select-table table-striped ">
       <table id="bootstrap-table"></table>
     </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html
index 47233d79..35d9cff7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html
@@ -6,15 +6,55 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal" id="form-confirmShipping-add" th:object="${sysSalesShippingInform}">
-        <input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
+    <form class="form-horizontal m" id="form-confirmShipping-add" th:object="${sysSalesShippingInform}">
+        <input name="shippingInformId" th:field="*{shippingInformId}" type="hidden">
         <div class="form-group">
-            <label class="col-sm-3 control-label">送货日期：</label>
+            <label class="col-sm-3 control-label">出货单号：</label>
             <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="deliverTime" th:value="${#dates.format(sysSalesShippingInform.deliverTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
+                <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">客户ID：</label>
+            <div class="col-sm-8">
+                <input name="customerId" th:field="*{customerId}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">客户名称：</label>
+            <div class="col-sm-8">
+                <input name="customerName" th:field="*{customerName}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">客户订单号：</label>
+            <div class="col-sm-8">
+                <input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
+            <div class="col-sm-8">
+                <input name="customerContact"  th:field="*{customerContact}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
+            <div class="col-sm-8">
+                <input name="customerContactAddress" th:field="*{customerContactAddress}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">收货联系人(Bill To)：</label>
+            <div class="col-sm-8">
+                <input name="customerContactBillto" th:field="*{customerContactBillto}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">收货地址(Bill To)：</label>
+            <div class="col-sm-8">
+                <input name="contactAddressBillto" th:field="*{contactAddressBillto}" class="form-control" type="text" readonly>
             </div>
         </div>
 
@@ -39,11 +79,6 @@
             $.operate.save(prefix + "/confirmShipping", $('#form-confirmShipping-add').serialize());
         }
     }
-    $("input[name='deliverTime']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
 </script>
 </body>
 </html>
\ No newline at end of file