diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
index cf8cdac4..139a2ab5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java
@@ -16,6 +16,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysSalesOrder;
 import com.ruoyi.system.domain.SysSalesOrderChild;
 import com.ruoyi.system.domain.SysSalesShippingInform;
+import com.ruoyi.system.domain.SysSalesShippingInformDetail;
 import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.system.mapper.SysSalesShippingInformMapper;
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 c31a1a5f..ac8f7703 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
@@ -119,4 +119,9 @@ public interface SysMakeOrderMapper
     * 根据入库单号查询生产单号
     * */
     String selectMakeByWarehouseStorageCode(String warehouseStorageCode);
+
+    /*
+    * 根据销售单号查询生产订单
+    * */
+    SysMakeOrder selectMakeOrderBySaleNo(String salesOrderCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformDetailMapper.java
index 0bdcba7e..1fafefc5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformDetailMapper.java
@@ -43,6 +43,17 @@ public interface SysSalesShippingInformDetailMapper
      */
     public int updateSysSalesShippingInformDetail(SysSalesShippingInformDetail sysSalesShippingInformDetail);
 
+
+
+    /**
+     * 修改销售出货通知详情
+     *
+     * @param sysSalesShippingInformDetail 销售出货通知详情
+     * @return 结果
+     */
+    public int updateSysSalesShippingInformDetailByCodeAndNo(SysSalesShippingInformDetail sysSalesShippingInformDetail);
+
+
     /**
      * 删除销售出货通知详情
      * 
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 0616334c..ac717d43 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
@@ -189,6 +189,11 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         sysSalesShippingInform.setMaterialSum(Math.toIntExact(sysSalesOrderVo.getMaterialSum()));
         //更新数量合计
         sysSalesShippingInform.setEnterpriseSum(Math.toIntExact(sysSalesOrderVo.getEnterpriseSum()));
+        sysSalesShippingInform.setCustomerContact(sysSalesOrderVo.getCustomerDelivery());
+        sysSalesShippingInform.setContactNumber(sysSalesOrderVo.getDeliveryPhone());
+        sysSalesShippingInform.setCustomerContactAddress(sysSalesOrderVo.getDeliveryAddress());
+
+
 
         //更新销售出库详情数据
         List<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
@@ -204,6 +209,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
             sysSalesShippingInformDetail.setMaterialProcessMethod(sysSalesOrderChild.getProcessMethod());
             sysSalesShippingInformDetail.setMakeNum(sysSalesOrderChild.getMaterialNum());
             sysSalesShippingInformDetail.setHasOutOrderNum(sysSalesOrderChild.getOutBoundQuantity());
+            sysSalesShippingInformDetail.setThisShippingNum(sysSalesOrderChild.getApplyShippingNum());
             sysSalesShippingInformDetail.setCreateBy(loginName);
             sysSalesShippingInformDetail.setCreateTime(new Date());
             shippingInformDetailMapper.insertSysSalesShippingInformDetail(sysSalesShippingInformDetail);
@@ -236,10 +242,11 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         warehouseOutOrder.setUpdateTime(new Date());
 
         //更新销售订单的出货状态
+//        SysSalesShippingInform tempShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
         SysSalesOrder sysSalesOrder = new SysSalesOrder();
         sysSalesOrder.setUpdateBy(loginName);
         sysSalesOrder.setUpdateTime(new Date());
-        sysSalesOrder.setSalesOrderCode(sysSalesShippingInform.getSalesOrderCode());
+        sysSalesOrder.setSalesOrderCode(warehouseOutOrder.getSalesOrderCode());
         //暂收设置为全部出货
         sysSalesOrder.setDeliveryStatus("6");
         int updateSysSalesOrderResult = sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
index b41417da..98b20d90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
@@ -62,6 +62,9 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     private SysSalesShippingInformMapper shippingInformMapper;
 
 
+    @Autowired
+    private SysSalesShippingInformDetailMapper shippingInformDetailMapper;
+
     /**
      * 查询仓库出库单
      * 
@@ -232,8 +235,20 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
             sysSalesOrderChild.setQuoteId(warehouseOutOrder.getSalesOrderCode());
             sysSalesOrderChild.setMaterialCode(warehouseOutOrderDetail.getMaterialNo());
             sysSalesOrderChild.setOutBoundQuantity(warehouseOutOrderDetail.getActualOutOrderSum());
+            sysSalesOrderChild.setUpdateBy(loginName);
+            sysSalesOrderChild.setUpdateTime(new Date());
             int updateSalesOrderChildResult = salesOrderChildMapper.updateSysSalesOrderChildByCodeAndQuoteId(sysSalesOrderChild);
             if (updateSalesOrderChildResult <= 0){
+                throw new BusinessException("更新销售订单子表数据失败");
+            }
+            SysSalesShippingInformDetail sysSalesShippingInformDetail = new SysSalesShippingInformDetail();
+            sysSalesShippingInformDetail.setHasOutOrderNum(warehouseOutOrderDetail.getActualOutOrderSum());
+            sysSalesShippingInformDetail.setUpdateBy(loginName);
+            sysSalesShippingInformDetail.setUpdateTime(new Date());
+            sysSalesShippingInformDetail.setOutOrderCode(warehouseOutOrder.getOutOrderCode());
+            sysSalesShippingInformDetail.setMaterialNo(warehouseOutOrderDetail.getMaterialNo());
+            int updateShippingInformDetailResult = shippingInformDetailMapper.updateSysSalesShippingInformDetailByCodeAndNo(sysSalesShippingInformDetail);
+            if (updateShippingInformDetailResult <= 0){
                 throw new BusinessException("更新销售出库详情数据失败");
             }
             warehouseOutOrderDetail.setUpdateBy(loginName);
@@ -579,6 +594,18 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
 
         WarehouseOutOrder warehouseOutOrder = new WarehouseOutOrder();
         warehouseOutOrder.setOutOrderCode(outOrderCode);
+        //添加生产单号
+        SysMakeOrder makeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);
+        if (makeOrder == null){
+            log.warn("生产订单编号为空:{}",makeOrder.getMakeNo());
+        }
+
+
+        warehouseOutOrder.setDeliveryName(sysSalesOrderVo.getCustomerDelivery());
+        warehouseOutOrder.setDeliveryNumber(sysSalesOrderVo.getDeliveryPhone());
+        warehouseOutOrder.setDeliveryAddress(sysSalesOrderVo.getDeliveryAddress());
+
+        warehouseOutOrder.setMakeNo(makeOrder.getMakeNo());
         //出库状态为 待仓库准备物料
         warehouseOutOrder.setWarehouseOutStatus("0");
         warehouseOutOrder.setRelatedOrderCode(salesOrderCode);
@@ -587,10 +614,17 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         warehouseOutOrder.setWarehouseOrderType("0");
         //出库类型设置为 销售出库
         warehouseOutOrder.setWarehouseOutType("0");
+
+        //物料合计
+        warehouseOutOrder.setMaterialSum(Math.toIntExact(sysSalesOrderVo.getMaterialSum()));
+        //数量合计
+        warehouseOutOrder.setEnterpriseSum(Math.toIntExact(sysSalesOrderVo.getEnterpriseSum()));
+
+
         warehouseOutOrder.setBusinessName(sysSalesOrderVo.getBusinessMembers());
         warehouseOutOrder.setCustomerId(sysSalesOrderVo.getEnterpriseCode());
         warehouseOutOrder.setCustomerName(sysSalesOrderVo.getEnterpriseName());
-        warehouseOutOrder.setApplyName(sysSalesOrderVo.getApplyUserName());
+        warehouseOutOrder.setApplyName(sysSalesOrderVo.getApplyUser());
         warehouseOutOrder.setDeliveryCondition(sysSalesOrderVo.getDeliveryConditions());
         warehouseOutOrder.setCreateTime(new Date());
         warehouseOutOrder.setCreateBy(ShiroUtils.getLoginName());
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
index 3a86a777..e0673d57 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
@@ -270,6 +270,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectMakeOrderBySaleNo" parameterType="String" resultMap="SysMakeOrderResult">
+        <include refid="selectSysMakeOrderVo"/>
+        where a.saleNo = #{saleNo}
+    </select>
+
+
+
     <select id="selectMakeByWarehouseStorageCode" parameterType="String" resultType="String">
         SELECT DISTINCT sm.makeNo
         FROM sys_makeorder sm
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
index 9ed7cdb7..f07c8e75 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml
@@ -136,6 +136,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where shipping_inform_detail_id = #{shippingInformDetailId}
     </update>
 
+
+
+    <update id="updateSysSalesShippingInformDetailByCodeAndNo" parameterType="SysSalesShippingInformDetail">
+        update sys_sales_shipping_inform_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if>
+            <if test="materialBrand != null">material_brand = #{materialBrand},</if>
+            <if test="materialUnit != null">material_unit = #{materialUnit},</if>
+            <if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
+            <if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
+            <if test="materialModel != null">material_model = #{materialModel},</if>
+            <if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
+            <if test="makeNum != null">make_num = #{makeNum},</if>
+            <if test="thisShippingNum != null">this_shipping_num = #{thisShippingNum},</if>
+            <if test="hasOutOrderNum != null">has_out_order_num = #{hasOutOrderNum},</if>
+            <if test="thisCheckNum != null">this_check_num = #{thisCheckNum},</if>
+            <if test="hasCheckNum != null">has_check_num = #{hasCheckNum},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where out_order_code = #{outOrderCode}
+        and   material_no = #{materialNo}
+    </update>
+
+
     <delete id="deleteSysSalesShippingInformDetailById" parameterType="Long">
         delete from sys_sales_shipping_inform_detail where shipping_inform_detail_id = #{shippingInformDetailId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
index 367571f2..e4d267b2 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
@@ -11,7 +11,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">出库单号：</label>
             <div class="col-sm-8">
-                <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
+                <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -25,49 +25,49 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">销售订单号：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text" disabled>
+                <input name="salesOrderCode" th:field="*{salesOrderCode}" 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="applyName" th:field="*{applyName}" class="form-control" type="text" disabled>
+                <input name="applyName" th:field="*{applyName}" 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="makeNo" th:field="*{makeNo}" class="form-control" type="text" disabled>
+                <input name="makeNo" th:field="*{makeNo}" 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" disabled>
+                <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" disabled>
+                <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="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" disabled>
+                <input name="deliveryName" th:field="*{deliveryName}" 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="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" disabled>
+                <input name="deliveryNumber" th:field="*{deliveryNumber}" 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="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
+                <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">