From 220b20a46d3dc95e5f0f9448c237621733392190 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 5 Jun 2024 14:32:44 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E6=96=B0=E5=A2=9E=E9=94=80?=
 =?UTF-8?q?=E5=94=AE-=E5=87=BA=E5=BA=93=20=E6=8C=89=E9=92=AE=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?salesOutWarehouse.html=20=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0=E5=A2=9E=20=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=20prepareMaterial.html=E9=A1=B5=E9=9D=A2=20=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=BA=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AfterSalesShippingDeviceMapper.java       |   5 +
 .../WarehouseOutOrderController.java          |  39 +++
 .../mapper/WarehouseOutOrderDetailMapper.java |   5 +
 .../IWarehouseOutOrderDetailService.java      |   6 +
 .../service/IWarehouseOutOrderService.java    |   6 +
 .../WarehouseOutOrderDetailServiceImpl.java   |  15 +
 .../impl/WarehouseOutOrderServiceImpl.java    |  21 ++
 .../AfterSalesShippingDeviceMapper.xml        |   8 +
 .../WarehouseOutOrderDetailMapper.xml         |   6 +
 .../warehouseOutOrder/prepareMaterial.html    |  20 +-
 .../warehouseOutOrder/salesOutWarehouse.html  | 304 ++++++++++++++++++
 .../warehouseOutOrder/warehouseOutOrder.html  |  11 +
 12 files changed, 436 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java
index 6250e26a..e324a2c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java
@@ -92,4 +92,9 @@ public interface AfterSalesShippingDeviceMapper
      * @return 结果
      */
     public int restoreAfterSalesShippingDeviceById(Long shippingDeviceCode);
+
+    /**
+     * 销售单-出库 物料信息关联设备信息
+     */
+    List<AfterSalesShippingDevice> selectShippingDeviceList(AfterSalesShippingDevice afterSalesShippingDevice);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
index 35de1cf3..c22fb2a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java
@@ -2,6 +2,7 @@ package com.ruoyi.warehouse.controller;
 
 import java.util.List;
 
+import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
 import com.ruoyi.warehouse.service.IWarehouseOutOrderDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -150,5 +151,43 @@ public class WarehouseOutOrderController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 销售单-出库
+     */
+    @GetMapping("/salesOutWarehouse/{outOrderId}")
+    public String salesOutWarehouse(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap)
+    {
+        WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId);
+        mmap.put("warehouseOutOrder", warehouseOutOrder);
+        return prefix + "/salesOutWarehouse";
+    }
+
+    /**
+     * 修改保存销售单-出库
+     */
+    @RequiresPermissions("warehouse:warehouseOutOrder:salesOutWarehouse")
+    @Log(title = "仓库出库单", businessType = BusinessType.UPDATE)
+    @PostMapping("/salesOutWarehouse")
+    @ResponseBody
+    public AjaxResult salesOutWarehouseSave(@RequestBody WarehouseOutOrder warehouseOutOrder)
+    {
+        return toAjax(warehouseOutOrderService.updateSalesOutWarehouse(warehouseOutOrder));
+    }
+
+    /**
+     * 销售单-出库 物料信息关联设备信息
+     */
+    @PostMapping("/getShippingDeviceList")
+    @ResponseBody
+    public TableDataInfo getShippingDeviceList( @RequestParam("salesOrderCode") String salesOrderCode,
+                                                @RequestParam("materialNo") String materialNo)
+    {
+        startPage();
+        AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+        afterSalesShippingDevice.setSalesOrderCode(salesOrderCode);
+        afterSalesShippingDevice.setMaterialNo(materialNo);
+        List<AfterSalesShippingDevice> list = outOrderDetailService.selectShippingDeviceList(afterSalesShippingDevice);
+        return getDataTable(list);
+    }
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderDetailMapper.java
index 22396f9c..4914ed52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderDetailMapper.java
@@ -81,4 +81,9 @@ public interface WarehouseOutOrderDetailMapper
      * 销售单-准备物料  物料相关信息
      */
     List<WarehouseOutOrderDetail> selectOutOrderDetailListByCode(String outOrderCode);
+
+    /**
+     * 销售单-出库 物料信息关联设备信息
+     */
+    List<WarehouseOutOrderDetail> selectShippingDeviceList(WarehouseOutOrderDetail warehouseOutOrderDetail);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderDetailService.java
index d22b4a00..058faca5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderDetailService.java
@@ -2,6 +2,7 @@ package com.ruoyi.warehouse.service;
 
 import java.util.List;
 
+import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
 import com.ruoyi.warehouse.domain.WarehouseOutOrder;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
 
@@ -79,4 +80,9 @@ public interface IWarehouseOutOrderDetailService
      * 销售单-准备物料  物料相关信息
      */
     List<WarehouseOutOrderDetail> selectOutOrderDetailListByCode(WarehouseOutOrder warehouseOutOrder);
+
+    /**
+     * 销售单-出库 物料信息关联设备信息
+     */
+    List<AfterSalesShippingDevice> selectShippingDeviceList(AfterSalesShippingDevice afterSalesShippingDevice);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderService.java
index 99c54b75..d4eaaea8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderService.java
@@ -77,4 +77,10 @@ public interface IWarehouseOutOrderService
      *  修改保存销售单-准备物料
      */
     int updatePrepareMaterial(WarehouseOutOrder warehouseOutOrder);
+
+    /**
+     * 修改保存销售单-出库
+     */
+    int updateSalesOutWarehouse(WarehouseOutOrder warehouseOutOrder);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderDetailServiceImpl.java
index 051fcf33..0ea5f5c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderDetailServiceImpl.java
@@ -1,6 +1,9 @@
 package com.ruoyi.warehouse.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
+import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -26,6 +29,9 @@ public class WarehouseOutOrderDetailServiceImpl implements IWarehouseOutOrderDet
     @Autowired
     private WarehouseOutOrderDetailMapper warehouseOutOrderDetailMapper;
 
+    @Autowired
+    private AfterSalesShippingDeviceMapper afterSalesShippingDeviceMapper;
+
     /**
      * 查询出库单详情
      * 
@@ -140,4 +146,13 @@ public class WarehouseOutOrderDetailServiceImpl implements IWarehouseOutOrderDet
         }
         return warehouseOutOrderDetailMapper.selectOutOrderDetailListByCode(outOrderCode);
     }
+
+    /**
+     * 销售单-出库 物料信息关联设备信息
+     */
+    @Override
+    public List<AfterSalesShippingDevice> selectShippingDeviceList(AfterSalesShippingDevice afterSalesShippingDevice) {
+
+       return afterSalesShippingDeviceMapper.selectShippingDeviceList(afterSalesShippingDevice);
+    }
 }
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 99caf11a..b3a1805f 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
@@ -144,7 +144,28 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         }
         int updateRows = 0;
         for (WarehouseOutOrderDetail warehouseOutOrderDetail : warehouseOutOrderDetailList) {
+            warehouseOutOrderDetail.setRemark(warehouseOutOrder.getRemark());
+            //更新数据库记录
+            updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail);
+        }
+        return updateRows;
+    }
+
 
+    /**
+     * 修改保存销售单-出库
+     */
+    @Override
+    public int updateSalesOutWarehouse(WarehouseOutOrder warehouseOutOrder) {
+
+        List<WarehouseOutOrderDetail> warehouseOutOrderDetailList = warehouseOutOrder.getWarehouseOutOrderDetailList();
+        if (StringUtils.isEmpty(warehouseOutOrderDetailList)){
+            log.warn("保存销售单-出库,物料列表信息为空：{}",warehouseOutOrder);
+        }
+        int updateRows = 0;
+        for (WarehouseOutOrderDetail warehouseOutOrderDetail : warehouseOutOrderDetailList) {
+            warehouseOutOrderDetail.setRemark(warehouseOutOrder.getRemark());
+            warehouseOutOrderDetail.setDeliveryDate(warehouseOutOrder.getDeliveryDate());
             //更新数据库记录
             updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail);
         }
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 4044b363..bea7cb80 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -87,6 +87,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where sales_order_code = #{salesOrderCode}
     </select>
 
+    <select id="selectShippingDeviceList" parameterType="AfterSalesShippingDevice" resultMap="AfterSalesShippingDeviceResult">
+        <include refid="selectAfterSalesShippingDeviceVo"/>
+        where material_no = #{materialNo}
+        and  sales_order_code = #{salesOrderCode}
+    </select>
+
+
+
     <insert id="insertAfterSalesShippingDevice" parameterType="AfterSalesShippingDevice" useGeneratedKeys="true" keyProperty="shippingDeviceCode">
         insert into aftersales_shipping_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml
index 2b4b0fcf..e102a679 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml
@@ -77,6 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where out_order_code = #{outOrderCode}
     </select>
 
+    <select id="selectShippingDeviceList" parameterType="WarehouseOutOrderDetail" resultMap="WarehouseOutOrderDetailResult">
+        <include refid="selectWarehouseOutOrderDetailVo"/>
+        where sales_order_code = #{salesOrderCode}
+        and material_no = #{materialNo}
+    </select>
+
 
     <insert id="insertWarehouseOutOrderDetail" parameterType="WarehouseOutOrderDetail" useGeneratedKeys="true" keyProperty="outOrderDetailId">
         insert into warehouse_out_order_detail
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 b863d282..8316ba23 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
@@ -11,13 +11,13 @@
         <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">
+                <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">订单类型：</label>
             <div class="col-sm-8">
-                <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}">
+                <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}" disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option>
                 </select>
             </div>
@@ -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">
+                <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text" disabled>
             </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">
+                <input name="applyName" th:field="*{applyName}" class="form-control" type="text" disabled>
             </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">
+                <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text" disabled>
             </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">
+                <input name="customerId" th:field="*{customerId}" class="form-control" type="text" disabled>
             </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">
+                <input name="customerName" th:field="*{customerName}" class="form-control" type="text" disabled>
             </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">
+                <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" disabled>
             </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">
+                <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" disabled>
             </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">
+                <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
new file mode 100644
index 00000000..27bf3549
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
@@ -0,0 +1,304 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改仓库出库单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-prepareMaterial-edit" th:object="${warehouseOutOrder}">
+        <input name="outOrderId" th:field="*{outOrderId}" type="hidden">
+        <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>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">订单类型：</label>
+            <div class="col-sm-8">
+                <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option>
+                </select>
+            </div>
+        </div>
+        <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>
+            </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>
+            </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>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">送货日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="deliveryDate" th:value="${#dates.format(warehouseOutOrder.deliveryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </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>
+            </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>
+            </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>
+            </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>
+            </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>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            </div>
+        </div>
+    </form>
+    <!--物料信息-->
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<!--用于可以修改列表字段的插件-->
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<script th:inline="javascript">
+
+
+    var warehouseOutOrder = [[${warehouseOutOrder}]];
+
+    var prefix = ctx + "warehouse/warehouseOutOrder";
+
+
+    // $("input[name='deliveryDate']").datetimepicker({
+    //     format: "yyyy-mm-dd HH:mm:ss",
+    //     minView: "month",
+    //     autoclose: true
+    // });
+
+    $("#form-prepareMaterial-edit").validate({
+        focusCleanup: true
+    });
+
+
+
+    // 新增提交
+    function submitHandler() {
+        // 获取表单数据
+        const warehouseOutOrderData = $("#form-prepareMaterial-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        var table = $('#bootstrap-table').bootstrapTable('getData');
+
+        // 将表数据转换成与complaintNoticeData格式一致的数组
+        var materialDataList = table.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "outOrderDetailId":item.outOrderDetailId,
+                "outOrderCode":item.outOrderCode,
+                "materialNo": item.materialNo, // 假设id对应materialId
+                "prepareOutOrderSum":item.prepareOutOrderSum,
+                "actualOutOrderSum":item.actualOutOrderSum
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, warehouseOutOrderData, {
+            warehouseOutOrderDetailList: materialDataList,
+        });
+        // 合并表单数据和表格数据
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/prepareMaterial", jsonData);
+    }
+
+    //物料信息展示列表
+    $(function() {
+        var options = {
+            modalName: "选择物料",
+            url: ctx + "warehouse/warehouseOutOrder/getMaterialListByOutOrderCode",
+            queryParams: queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
+            detailView: true,
+            //指定父id列
+            onExpandRow : function(index, row, $detail) {
+                $detail.html('<table class="table-container" id="one_level_table_'+row.outOrderDetailId+'"></table>'
+                ).find('table');
+                // 一阶
+                initOneLevelTable(index,row,$detail);
+            },
+            columns: [{
+                checkbox: true
+            },
+                {
+                    title: '出库单详情ID',
+                    field: 'outOrderDetailId',
+                    visible: false
+                },
+                {
+                    title: '销售单号',
+                    field: 'salesOrderCode',
+                    visible: false
+
+                },
+                {
+                    title: '出库单号',
+                    field: 'outOrderCode',
+                    visible: false
+                },
+
+                {
+                    title: '料号',
+                    field: 'materialNo',
+                },
+                {
+                    title: '图片',
+                    field: 'materialPhotourl',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '品牌',
+                    field: 'materialBrand',
+                },
+                {
+                    title: '单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '加工方式',
+                    field: 'materialProcessMethod',
+                },
+                {
+                    title: '订单数量',
+                    field: 'makeNum',
+                },
+                {
+                    title: '已出库数',
+                    field: 'hasOutOrderSum',
+                },
+                {
+                    title: '申请出库数',
+                    field: 'applyOutOrderSum',
+                },
+                {
+                    title: '准备出库数',
+                    field: 'prepareOutOrderSum',
+                },
+                {
+                    title: '实际出库数',
+                    field: 'actualOutOrderSum',
+                    editable:true
+                }
+            ]
+        };
+        $.table.init(options);
+    });
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            outOrderCode:  warehouseOutOrder.outOrderCode
+        };
+        console.log(curParams);
+        return curParams;
+    }
+
+    initOneLevelTable = function(index, row, $detail) {
+        $("#"+"one_level_table_"+row.outOrderDetailId).bootstrapTable({
+            url: prefix + "/getShippingDeviceList",
+            method: 'post',
+            sidePagination: "server",
+            contentType: "application/x-www-form-urlencoded",
+            queryParams : {
+                salesOrderCode: row.salesOrderCode,
+                materialNo: row.materialNo,
+            },
+            columns: [
+                {
+                    field: 'shippingDeviceId',
+                    title: '设备ID',
+                },
+
+                {
+                    field: 'deviceModelCode',
+                    title: '设备型号',
+                },
+                {
+                    field: 'snCode',
+                    title: '设备SN',
+                },
+                {
+                    field: 'aftersalesPhotoUrl',
+                    title: '售后图片',
+                },
+
+                {
+                    field: 'guaranteePeriod',
+                    title: '保修期',
+                },
+                {
+                    field: 'factoryDate',
+                    title: '出厂日期',
+                }]
+        });
+    };
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html
index f1ffab32..b477a1d0 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html
@@ -69,6 +69,8 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:edit')}]];
         var prepareMaterialFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:prepareMaterial')}]];
+        var salesOutWarehouseFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:salesOutWarehouse')}]];
+
 
         var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
         var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
@@ -175,6 +177,9 @@
                         if (row.warehouseOutStatus == 0 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){
                             actions.push('<a class="btn btn-success btn-xs ' + prepareMaterialFlag + '" href="javascript:void(0)" onclick="prepareMaterial(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>准备物料</a> ');
                         }
+                        if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){
+                            actions.push('<a class="btn btn-success btn-xs ' + salesOutWarehouseFlag + '" href="javascript:void(0)" onclick="salesOutWarehouse(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>出库</a> ');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -187,6 +192,12 @@
             var url = ctx + 'warehouse/warehouseOutOrder/prepareMaterial/' +  outOrderId;
             $.modal.open("准备物料",url);
         }
+
+        /*销售单-出库*/
+        function salesOutWarehouse(outOrderId){
+            var url = ctx + 'warehouse/warehouseOutOrder/salesOutWarehouse/' +  outOrderId;
+            $.modal.open("出库",url);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file