From c852fdcc2c668ee3581701af134535f2261bc0f6 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 10 Jul 2024 08:48:10 +0800
Subject: [PATCH 01/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=96=B0=E5=A2=9E=20=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B4=A7=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=90=8E=E7=AB=AF=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8D=95=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8F=91=E8=B4=A7=E7=9A=84=E5=90=8C=E6=97=B6=20?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7=E7=9A=84=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=20=E7=94=9F=E6=88=90=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=97=B6=E7=94=9F=E6=88=90=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysSalesOrderController.java   |  43 +++-
 .../system/domain/SysSalesOrderChild.java     |  34 +++
 .../mapper/SysSalesOrderChildMapper.java      |  10 +
 .../service/ISysSalesOrderChildService.java   |   4 +
 .../system/service/ISysSalesOrderService.java |   5 +
 .../ISysSalesShippingInformService.java       |   7 +
 .../impl/SysSalesOrderChildServiceImpl.java   |   9 +
 .../impl/SysSalesOrderServiceImpl.java        |  48 ++++
 .../SysSalesShippingInformServiceImpl.java    |  51 ++++
 .../service/IWarehouseOutOrderService.java    |   6 +
 .../impl/WarehouseOutOrderServiceImpl.java    |  69 +++++-
 .../WarehouseStorageOrderServiceImpl.java     |  19 ++
 .../system/SysSalesOrderChildMapper.xml       |  68 ++++++
 .../system/salesOrder/salesDeliverGoods.html  | 231 ++++++++++++++++++
 14 files changed, 597 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
index 3caf45fe..45a0289d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
@@ -28,6 +28,8 @@ import com.ruoyi.system.domain.exportDto.SysSalesFinishDto;
 import com.ruoyi.system.domain.exportDto.SysSalesOrderDto;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.system.service.*;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -88,12 +90,11 @@ public class SysSalesOrderController extends BaseController
     @Autowired
     private ISysMakeOrderService sysMakeOrderService;
 
-    @Autowired
-    private SysSalesOrderMapper sysSalesOrderMapper;
-
     @Autowired
     private IFinancialReceivablesService financialReceivablesService;
 
+    @Autowired
+    private ISysSalesOrderChildService sysSalesOrderChildService;
 
     @RequiresPermissions("system:salesOrder:view")
     @GetMapping()
@@ -522,4 +523,40 @@ public class SysSalesOrderController extends BaseController
         List<SysUser> list = sysUserService.selectRoleToUserList("ywyRole,ywjlRole,ywzgRole,zozjRole,admin");
         return getDataTable(list);
     }
+
+    /**
+    *  发起出货
+    */
+    @GetMapping("/salesDeliverGoods/{salesOrderId}")
+    public String salesDeliverGoods(@PathVariable("salesOrderId") Long salesOrderId, ModelMap mmap)
+    {
+        SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(salesOrderId);
+        mmap.put("sysSalesOrder", sysSalesOrder);
+        return prefix + "/salesDeliverGoods";
+    }
+
+    /**
+     * 修改保存发起出货
+     */
+    @RequiresPermissions("system:salesOrder:salesDeliverGoods")
+    @Log(title = "销售出货通知", businessType = BusinessType.UPDATE)
+    @PostMapping("/salesDeliverGoods")
+    @ResponseBody
+    public AjaxResult salesDeliverGoodsSave(@RequestBody SysSalesOrder sysSalesOrder)
+    {
+        return toAjax(sysSalesOrderService.updateSalesDeliverGoods(sysSalesOrder));
+    }
+
+
+    /**
+     * 发起出货 物料详情列表
+     */
+    @ResponseBody
+    @RequestMapping("/salesDeliverGoodsDetailList")
+    public TableDataInfo storageMakeDetailList(SysSalesOrder sysSalesOrder){
+        startPage();
+        String salesOrderCode = sysSalesOrder.getSalesOrderCode();
+        List<SysSalesOrderChild> list =  sysSalesOrderChildService.selectOrderChildListBySalesOrderCode(salesOrderCode);
+        return getDataTable(list) ;
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
index 67a69414..a21abd31 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
@@ -137,6 +137,15 @@ public class SysSalesOrderChild extends BaseEntity {
     @Excel(name = "未出库数量")
     private Integer unBoundQuantity;
 
+    //已完成数
+    private Integer finishNum;
+
+    //申请出货数
+    private Integer applyShippingNum;
+
+    //已申请出货数
+    private Integer hasApplyShippingNum;
+
     private String bomId;
 
     public Long getId() {
@@ -436,7 +445,29 @@ public class SysSalesOrderChild extends BaseEntity {
         this.bomId = bomId;
     }
 
+    public Integer getFinishNum() {
+        return finishNum;
+    }
 
+    public void setFinishNum(Integer finishNum) {
+        this.finishNum = finishNum;
+    }
+
+    public Integer getApplyShippingNum() {
+        return applyShippingNum;
+    }
+
+    public void setApplyShippingNum(Integer applyShippingNum) {
+        this.applyShippingNum = applyShippingNum;
+    }
+
+    public Integer getHasApplyShippingNum() {
+        return hasApplyShippingNum;
+    }
+
+    public void setHasApplyShippingNum(Integer hasApplyShippingNum) {
+        this.hasApplyShippingNum = hasApplyShippingNum;
+    }
 
     @Override
     public String toString() {
@@ -477,6 +508,9 @@ public class SysSalesOrderChild extends BaseEntity {
                 .add("taxRate", taxRate)
                 .add("outBoundQuantity", outBoundQuantity)
                 .add("unBoundQuantity", unBoundQuantity)
+                .add("finishNum", finishNum)
+                .add("applyShippingNum", applyShippingNum)
+                .add("hasApplyShippingNum", hasApplyShippingNum)
                 .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java
index 8cdb9959..b1db1139 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java
@@ -27,4 +27,14 @@ public interface SysSalesOrderChildMapper {
         * 根据物料号和销售订单号查询销售订单子表数据
         * */
         SysSalesOrderChild selectSalesOrderChildByCodeAndNo(SysSalesOrderChild sysSalesOrderChild);
+
+        /*
+         *  通过销售订单号查询销售订单子表
+         * */
+        List<SysSalesOrderChild> selectOrderChildListBySalesOrderCode(String salesOrderCode);
+
+        /*
+        * 根据销售单号和物料号更新销售单子表数据
+        * */
+        int updateSysSalesOrderChildByCodeAndQuoteId(SysSalesOrderChild sysSalesOrderChild);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java
index ff4fcaf0..f87f3d25 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java
@@ -23,4 +23,8 @@ public interface ISysSalesOrderChildService {
 
         SysSalesOrderChild selectOneByQuoteIdAndMaterialCode(String quoteId,String materialCode);
 
+        /*
+        *  通过销售订单号查询销售订单子表
+        * */
+        List<SysSalesOrderChild> selectOrderChildListBySalesOrderCode(String salesOrderCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java
index 40877029..91657cc7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java
@@ -87,4 +87,9 @@ public interface ISysSalesOrderService
     * 根据销售单号更新销售订单
     * */
     int updateSysSalesOrderBySalesOrderCode(SysSalesOrder sysSalesOrder);
+
+    /**
+     * 修改保存发起出货
+     */
+    int updateSalesDeliverGoods(SysSalesOrder sysSalesOrder);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
index 3cd18bc3..2290f0b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.SysSalesOrder;
 import com.ruoyi.system.domain.SysSalesShippingInform;
 
 /**
@@ -72,4 +74,9 @@ public interface ISysSalesShippingInformService
      * @return
      */
     int restoreSysSalesShippingInformById(Long shippingInformId);
+
+    /**
+    * 通过销售发起出货生成销售出货通知单列表
+    * */
+    int generateShippingInformBySalesOrder(SysSalesOrder sysSalesOrder, String outOrderCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java
index 255ed536..6a693507 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java
@@ -51,4 +51,13 @@ public class SysSalesOrderChildServiceImpl implements ISysSalesOrderChildService
     public SysSalesOrderChild selectOneByQuoteIdAndMaterialCode(String quoteId, String materialCode) {
         return sysCustomerQuoteChildMapper.selectOneByQuoteIdAndMaterialCode(quoteId,materialCode);
     }
+
+    /*
+     *  通过销售订单号查询销售订单子表
+     * */
+    @Override
+    public List<SysSalesOrderChild> selectOrderChildListBySalesOrderCode(String salesOrderCode) {
+
+        return sysCustomerQuoteChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
index cbaa4013..60a24051 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.service.ICommonService;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
@@ -13,9 +14,11 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.process.general.service.IProcessService;
 import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
 import com.ruoyi.system.domain.*;
+import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.*;
+import com.ruoyi.warehouse.service.IWarehouseOutOrderService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -70,6 +73,15 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     @Autowired
     private ISysSalesOrderChildService sysSalesOrderChildService;
 
+    @Autowired
+    private SysSalesOrderChildMapper salesOrderChildMapper;
+
+    @Autowired
+    private ISysSalesShippingInformService sysSalesShippingInformService;
+
+    @Autowired
+    private IWarehouseOutOrderService warehouseOutOrderService;
+
     /**
      * 查询销售订单
      *
@@ -352,6 +364,42 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
         return sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
     }
 
+    /**
+     * 修改保存发起出货
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int updateSalesDeliverGoods(SysSalesOrder sysSalesOrder) {
+
+        String loginName = ShiroUtils.getLoginName();
+
+        sysSalesOrder.setUpdateBy(loginName);
+        sysSalesOrder.setUpdateTime(new Date());
+
+        for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrder.getSysSalesOrderChildList()) {
+
+              sysSalesOrderChild.setUpdateTime(new Date());
+              sysSalesOrderChild.setUpdateBy(loginName);
+              sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode());
+              sysSalesOrderChild.setHasApplyShippingNum(sysSalesOrderChild.getApplyShippingNum());
+            int updateSysSalesOrderChildResult = salesOrderChildMapper.updateSysSalesOrderChildByCodeAndQuoteId(sysSalesOrderChild);
+            if (updateSysSalesOrderChildResult <= 0){
+                throw new BusinessException("更新销售订单子表数据失败");
+            }
+        }
+
+
+        //两个表生成同一个出库单号
+        String outOrderCode = redisCache.generateBillNo("CK");
+        //通过销售发起出货生成仓库出库单
+        int insertWarehouseOutOrderResult = warehouseOutOrderService.generateWarehouseOutOrderBySalesOrder(sysSalesOrder,outOrderCode);
+
+        //通过销售发起出货生成销售出货通知单列表
+        int insertShippingInformResult = sysSalesShippingInformService.generateShippingInformBySalesOrder(sysSalesOrder,outOrderCode);
+
+        return sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
+    }
+
 
     private ProcessInstance startProcessInstance(String applyTitle,String instanceType,SysSalesOrder sysSalesOrder, SysUser user) {
         Long nessKey = sysSalesOrder.getSalesOrderId();
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 44056899..a8e5460b 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
@@ -1,8 +1,18 @@
 package com.ruoyi.system.service.impl;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysSalesOrder;
+import com.ruoyi.system.domain.SysSalesOrderVo;
+import com.ruoyi.system.mapper.SysSalesOrderMapper;
+import com.ruoyi.warehouse.domain.WarehouseOutOrder;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.SysSalesShippingInformMapper;
@@ -16,12 +26,19 @@ import com.ruoyi.common.core.text.Convert;
  * @author 刘晓旭
  * @date 2024-07-09
  */
+@Slf4j
 @Service
 public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInformService 
 {
     @Autowired
     private SysSalesShippingInformMapper sysSalesShippingInformMapper;
 
+    @Autowired
+    private SysSalesOrderMapper sysSalesOrderMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询销售出货通知
      * 
@@ -123,4 +140,38 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     {
         return sysSalesShippingInformMapper.restoreSysSalesShippingInformById(shippingInformId);
     }
+
+    /**
+     * 通过销售发起出货生成销售出货通知单列表
+     * */
+    @Override
+    public int generateShippingInformBySalesOrder(SysSalesOrder sysSalesOrder,String outOrderCode) {
+
+        SysSalesShippingInform sysSalesShippingInform = new SysSalesShippingInform();
+        String salesOrderCode = sysSalesOrder.getSalesOrderCode();
+        if (StringUtils.isEmpty(salesOrderCode)){
+            log.warn("销售订单编号为空:{}",salesOrderCode);
+        }
+        //从数据库查询的数据
+        SysSalesOrderVo sysSalesOrderVo = sysSalesOrderMapper.selectSysSalesOrderBySalesOrderCode(salesOrderCode);
+
+        sysSalesShippingInform.setOutOrderCode(outOrderCode);
+        //出库状态为 待仓库准备物料
+        sysSalesShippingInform.setWarehouseOutStatus("0");
+        sysSalesShippingInform.setSalesOrderCode(salesOrderCode);
+        //订单类型设置为 销售订单
+        sysSalesShippingInform.setWarehouseOrderType("0");
+        //出库类型设置为 销售出库
+        sysSalesShippingInform.setWarehouseOutType("0");
+        sysSalesShippingInform.setCustomerId(sysSalesOrderVo.getEnterpriseCode());
+        sysSalesShippingInform.setCustomerName(sysSalesOrderVo.getEnterpriseName());
+        sysSalesShippingInform.setDeliveryCondition(sysSalesOrderVo.getDeliveryConditions());
+        sysSalesShippingInform.setCreateTime(new Date());
+        sysSalesShippingInform.setCreateBy(ShiroUtils.getLoginName());
+        sysSalesShippingInform.setAllPriceExcludingTaxDollar(BigDecimal.valueOf(sysSalesOrderVo.getNoUsdSum()));
+        sysSalesShippingInform.setAllPriceExcludingTaxRmb(BigDecimal.valueOf(sysSalesOrderVo.getNoRmbSum()));
+        sysSalesShippingInform.setAllPriceIncludesTax(BigDecimal.valueOf(sysSalesOrderVo.getRmbTaxSum()));
+
+        return sysSalesShippingInformMapper.insertSysSalesShippingInform(sysSalesShippingInform);
+    }
 }
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 8aea63fe..38c02b65 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
@@ -3,6 +3,7 @@ package com.ruoyi.warehouse.service;
 import java.util.List;
 
 import com.ruoyi.system.domain.SysMakeorderPickVo;
+import com.ruoyi.system.domain.SysSalesOrder;
 import com.ruoyi.warehouse.domain.WarehouseOutOrder;
 
 /**
@@ -100,4 +101,9 @@ public interface IWarehouseOutOrderService
     * 生产单-出库
     * */
     int updateMakeOutWarehouse(WarehouseOutOrder warehouseOutOrder);
+
+    /**
+     * 通过销售发起出货生成仓库出库单
+     * */
+    int generateWarehouseOutOrderBySalesOrder(SysSalesOrder sysSalesOrder, String outOrderCode);
 }
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 eb5431d5..e1a7d6ba 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
@@ -8,15 +8,13 @@ import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysMakeOrder;
-import com.ruoyi.system.domain.SysMakeorderPickDetail;
-import com.ruoyi.system.domain.SysMakeorderPickVo;
-import com.ruoyi.system.domain.SysSalesOrder;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.SysMakeOrderMapper;
 import com.ruoyi.system.mapper.SysMakeorderPickDetailMapper;
 import com.ruoyi.system.mapper.SysMakeorderPickMapper;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
 import com.ruoyi.warehouse.mapper.WarehouseOutOrderDetailMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -513,4 +511,67 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         }
         return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
     }
+
+    /**
+     * 通过销售发起出货生成仓库出库单
+     * */
+    @Override
+    public int generateWarehouseOutOrderBySalesOrder(SysSalesOrder sysSalesOrder,String outOrderCode) {
+
+        String salesOrderCode = sysSalesOrder.getSalesOrderCode();
+        if (StringUtils.isEmpty(salesOrderCode)){
+            log.warn("销售订单编号为空:{}",salesOrderCode);
+        }
+        //从数据库查询的数据
+        SysSalesOrderVo sysSalesOrderVo = sysSalesOrderMapper.selectSysSalesOrderBySalesOrderCode(salesOrderCode);
+
+        WarehouseOutOrder warehouseOutOrder = new WarehouseOutOrder();
+        warehouseOutOrder.setOutOrderCode(outOrderCode);
+        //出库状态为 待仓库准备物料
+        warehouseOutOrder.setWarehouseOutStatus("0");
+        warehouseOutOrder.setRelatedOrderCode(salesOrderCode);
+        warehouseOutOrder.setSalesOrderCode(salesOrderCode);
+        //订单类型设置为 销售订单
+        warehouseOutOrder.setWarehouseOrderType("0");
+        //出库类型设置为 销售出库
+        warehouseOutOrder.setWarehouseOutType("0");
+        warehouseOutOrder.setBusinessName(sysSalesOrderVo.getBusinessMembers());
+        warehouseOutOrder.setCustomerId(sysSalesOrderVo.getEnterpriseCode());
+        warehouseOutOrder.setCustomerName(sysSalesOrderVo.getEnterpriseName());
+        warehouseOutOrder.setApplyName(sysSalesOrderVo.getApplyUserName());
+        warehouseOutOrder.setDeliveryCondition(sysSalesOrderVo.getDeliveryConditions());
+        warehouseOutOrder.setCreateTime(new Date());
+        warehouseOutOrder.setCreateBy(ShiroUtils.getLoginName());
+        //新增出库单明细
+        CreateOutOrderDetailBySalesOrderChildList(sysSalesOrder, salesOrderCode, sysSalesOrderVo, outOrderCode);
+
+        return warehouseOutOrderMapper.insertWarehouseOutOrder(warehouseOutOrder);
+    }
+    //新增出库单明细
+    private void CreateOutOrderDetailBySalesOrderChildList(SysSalesOrder sysSalesOrder, String salesOrderCode, SysSalesOrderVo sysSalesOrderVo, String outOrderCode) {
+        List<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
+        for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildList) {
+            WarehouseOutOrderDetail warehouseOutOrderDetail = new WarehouseOutOrderDetail();
+            warehouseOutOrderDetail.setOutOrderCode(outOrderCode);
+            warehouseOutOrderDetail.setRelatedOrderCode(salesOrderCode);
+            warehouseOutOrderDetail.setMaterialNo(sysSalesOrderChild.getMaterialCode());
+            warehouseOutOrderDetail.setMaterialName(sysSalesOrderChild.getMaterialName());
+            warehouseOutOrderDetail.setMaterialType(sysSalesOrderChild.getMaterialType());
+            warehouseOutOrderDetail.setMaterialBrand(sysSalesOrderChild.getBrand());
+            warehouseOutOrderDetail.setMaterialUnit(sysSalesOrderChild.getUnit());
+            warehouseOutOrderDetail.setMaterialDescribe(sysSalesOrderChild.getDescribe());
+            warehouseOutOrderDetail.setMaterialProcessMethod(sysSalesOrderChild.getProcessMethod());
+            warehouseOutOrderDetail.setMakeNum(sysSalesOrderChild.getMaterialNum());
+            warehouseOutOrderDetail.setApplyOutOrderSum(sysSalesOrderChild.getApplyShippingNum());
+            warehouseOutOrderDetail.setCustomerId(sysSalesOrderVo.getEnterpriseCode());
+            warehouseOutOrderDetail.setCustomerName(sysSalesOrderVo.getEnterpriseName());
+            warehouseOutOrderDetail.setDeliveryCondition(sysSalesOrderVo.getDeliveryConditions());
+            warehouseOutOrderDetail.setCreateTime(new Date());
+            warehouseOutOrderDetail.setCreateBy(ShiroUtils.getLoginName());
+            int insertOutOrderDetailResult = outOrderDetailMapper.insertWarehouseOutOrderDetail(warehouseOutOrderDetail);
+            if (insertOutOrderDetailResult <= 0){
+                throw new BusinessException("新增出库单明细数据失败");
+            }
+        }
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
index 3e4b3320..9804fe0a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
@@ -20,7 +20,9 @@ import com.ruoyi.quality.mapper.QualityOrderReportUnqualifiedMapper;
 import com.ruoyi.quality.service.IQualityOrderService;
 import com.ruoyi.system.domain.SysMakeOrder;
 import com.ruoyi.system.domain.SysSalesOrder;
+import com.ruoyi.system.domain.SysSalesOrderChild;
 import com.ruoyi.system.mapper.SysMakeOrderMapper;
+import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.system.service.ISysMakeOrderService;
 import com.ruoyi.system.service.ISysSalesOrderService;
@@ -69,6 +71,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
     @Autowired
     private SysMakeOrderMapper sysMakeOrderMapper;
 
+    @Autowired
+    private SysSalesOrderChildMapper salesOrderChildMapper;
 
     @Autowired
     private RedisCache redisCache;
@@ -790,6 +794,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             throw new BusinessException("更新生产订单数据失败");
         }
 
+
         //更新销售订单数据
         SysSalesOrder sysSalesOrder = salesOrderMapper.selectSysSalesOrderBySalesOrderCode(tempSysMakeOrder.getSaleNo());
         //设置为全部完成
@@ -801,6 +806,20 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             throw new BusinessException("更新销售订单数据失败");
         }
 
+        //更新销售订单子表的数据
+        for (WarehouseStorageOrderDetail warehouseStorageOrderDetail : warehouseStorageOrderDetailList) {
+            SysSalesOrderChild sysSalesOrderChild = new SysSalesOrderChild();
+            sysSalesOrderChild.setQuoteId(tempSysMakeOrder.getSaleNo());
+            sysSalesOrderChild.setMaterialCode(warehouseStorageOrderDetail.getMaterialNo());
+            sysSalesOrderChild.setFinishNum(warehouseStorageOrderDetail.getStorageNum());
+            sysSalesOrderChild.setUpdateBy(loginName);
+            sysSalesOrderChild.setUpdateTime(new Date());
+            int updateSalesOrderChildResult = salesOrderChildMapper.updateSysSalesOrderChildByCodeAndQuoteId(sysSalesOrderChild);
+            if (updateSalesOrderChildResult <= 0){
+                throw new BusinessException("更新销售订单子表数据失败");
+            }
+        }
+
 
 //        //更新生产单数据
 //        int updateMakeOrderResult = sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder, warehouseStorageOrderDetailList);
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index 862af4b3..616bc64a 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -32,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="expiryDay"            column="expiry_day"             />
         <result property="outBoundQuantity"     column="out_bound_quantity"     />
         <result property="unBoundQuantity"      column="un_bound_quantity"      />
+        <result property="finishNum"            column="finish_num"             />
+        <result property="applyShippingNum"     column="apply_shipping_num"     />
+        <result property="hasApplyShippingNum"  column="has_apply_shipping_num" />
         <result property="createBy"             column="create_by"              />
         <result property="createTime"           column="create_time"            />
         <result property="updateBy"             column="update_by"              />
@@ -84,6 +87,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and materialCode = #{materialCode}
     </select>
 
+    <select id="selectOrderChildListBySalesOrderCode" resultMap="SysSalesOrderChildResult">
+        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand,
+               warehouseDept,materialNum, photoUrl,finish_num,apply_shipping_num,has_apply_shipping_num
+        from sys_sales_order_child
+        where quoteId = #{quoteId}
+    </select>
+
 
     <insert id="insertSysSalesOrderChild" parameterType="SysSalesOrderChild" useGeneratedKeys="true" keyProperty="id">
         insert into sys_sales_order_child
@@ -115,6 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expiryDay != null">expiry_day,</if>
             <if test="outBoundQuantity != null">out_bound_quantity,</if>
             <if test="unBoundQuantity != null">un_bound_quantity,</if>
+            <if test="finishNum != null">finish_num,</if>
+            <if test="applyShippingNum != null">apply_shipping_num,</if>
+            <if test="hasApplyShippingNum != null">has_apply_shipping_num,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remark != null">remark,</if>
@@ -151,6 +164,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expiryDay != null">#{expiryDay},</if>
             <if test="outBoundQuantity != null">#{outBoundQuantity},</if>
             <if test="unBoundQuantity != null">#{unBoundQuantity},</if>
+            <if test="finishNum != null">#{finishNum},</if>
+            <if test="applyShippingNum != null">#{applyShippingNum}</if>
+            <if test="hasApplyShippingNum != null">#{hasApplyShippingNum},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null">#{remark},</if>
@@ -191,6 +207,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expiryDay != null">expiry_day = #{expiryDay},</if>
             <if test="outBoundQuantity != null">out_bound_quantity = #{outBoundQuantity},</if>
             <if test="unBoundQuantity != null">un_bound_quantity = #{unBoundQuantity},</if>
+            <if test="finishNum != null">finish_num = #{finishNum},</if>
+            <if test="applyShippingNum != null">apply_shipping_num = #{applyShippingNum},</if>
+            <if test="hasApplyShippingNum != null">has_apply_shipping_num = #{hasApplyShippingNum},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
@@ -202,6 +221,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+
+    <update id="updateSysSalesOrderChildByCodeAndQuoteId" parameterType="SysSalesOrderChild">
+        update sys_sales_order_child
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="quoteId != null">quoteId = #{quoteId},</if>
+            <if test="materialId != null">materialId = #{materialId},</if>
+            <if test="materialCode != null">materialCode = #{materialCode},</if>
+            <if test="materialName != null">materialName = #{materialName},</if>
+            <if test="materialType != null">materialType = #{materialType},</if>
+            <if test="processMethod != null">processMethod = #{processMethod},</if>
+            <if test="brand != null">brand = #{brand},</if>
+            <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="describe != null">`describe` = #{describe},</if>
+            <if test="warehouseDept != null">warehouseDept = #{warehouseDept},</if>
+            <if test="countTax != null">countTax = #{countTax},</if>
+            <if test="usdTax != null">usdTax = #{usdTax},</if>
+            <if test="materialNum != null">materialNum = #{materialNum},</if>
+            <if test="materialSole != null">materialSole = #{materialSole},</if>
+            <if test="materialRmb != null">materialRmb = #{materialRmb},</if>
+            <if test="materialNoRmb != null">materialNoRmb = #{materialNoRmb},</if>
+            <if test="materialNoUsd != null">materialNoUsd = #{materialNoUsd},</if>
+            <if test="materialUsd != null">materialUsd = #{materialUsd},</if>
+            <if test="materialUsdSum != null">materialUsdSum = #{materialUsdSum},</if>
+            <if test="materialNoUsdSum != null">materialNoUsdSum = #{materialNoUsdSum},</if>
+            <if test="materialNoRmbSum != null">materialNoRmbSum = #{materialNoRmbSum},</if>
+            <if test="materialRmbSum != null">materialRmbSum = #{materialRmbSum},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="expiryDay != null">expiry_day = #{expiryDay},</if>
+            <if test="outBoundQuantity != null">out_bound_quantity = #{outBoundQuantity},</if>
+            <if test="unBoundQuantity != null">un_bound_quantity = #{unBoundQuantity},</if>
+            <if test="finishNum != null">finish_num = #{finishNum},</if>
+            <if test="applyShippingNum != null">apply_shipping_num = #{applyShippingNum},</if>
+            <if test="hasApplyShippingNum != null">has_apply_shipping_num = #{hasApplyShippingNum},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="useStatus != null">use_status = #{useStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where quoteId = #{quoteId}
+        and materialCode = #{materialCode}
+    </update>
+
+
+
     <delete id="deleteSysSalesOrderChildById" parameterType="Long">
         delete from sys_sales_order_child where id = #{id}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html
new file mode 100644
index 00000000..073fe82e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html
@@ -0,0 +1,231 @@
+<!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-salesDeliverGoods-edit" th:object="${sysSalesOrder}">
+        <input name="salesOrderId" th:field="*{salesOrderId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">订单类型：</label>
+            <div class="col-sm-8">
+                <select name="salesOrderType" class="form-control m-b" th:with="type=${@dict.getType('sys_order_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{salesOrderType}"></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" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人员：</label>
+            <div class="col-sm-8">
+                <input name="applyUser" th:field="*{applyUser}" 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="warehouseOutType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_type')}" disabled>-->
+<!--                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOutType}"></option>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--        </div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">客户ID：</label>
+            <div class="col-sm-8">
+                <input name="enterpriseCode" th:field="*{enterpriseCode}" 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="enterpriseName" th:field="*{enterpriseName}" 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="customerDelivery" th:field="*{customerDelivery}" 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="deliveryPhone" th:field="*{deliveryPhone}" 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 sysSalesOrder = [[${sysSalesOrder}]];
+
+    var prefix = ctx + "system/salesOrder";
+    $("#form-salesDeliverGoods-edit").validate({
+        focusCleanup: true
+    });
+
+    // 新增提交
+    function submitHandler() {
+        // 获取表单数据
+        const salesOrderData = $("#form-salesDeliverGoods-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 {
+                "id":item.id,
+                "materialCode": item.materialCode,
+                "materialName": item.materialName,
+                "materialType": item.materialType,
+                "describe": item.describe,
+                "unit": item.unit,
+                "brand": item.brand,
+                "processMethod": item.processMethod,
+                "materialNum": item.materialNum,
+                "finishNum": item.finishNum,
+                "hasApplyShippingNum": item.hasApplyShippingNum,
+                "outBoundQuantity": item.outBoundQuantity,
+                "applyShippingNum": item.applyShippingNum,
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, salesOrderData, {
+            sysSalesOrderChildList: materialDataList,
+        });
+        // 合并表单数据和表格数据
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/salesDeliverGoods", jsonData);
+    }
+
+    //物料信息展示列表
+    $(function() {
+        var options = {
+            modalName: "选择物料",
+            url: prefix + "/salesDeliverGoodsDetailList",
+            queryParams: queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
+            columns: [{
+                checkbox: true
+            },
+                {
+                    title: '销售订单详情ID',
+                    field: 'id',
+                    visible: false
+                },
+                {
+                    title: '料号',
+                    field: 'materialCode',
+                },
+                {
+                    title: '图片',
+                    field: 'photoUrl',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '描述',
+                    field: 'describe',
+                },
+                {
+                    title: '单位',
+                    field: 'unit',
+                },
+                {
+                    title: '品牌',
+                    field: 'brand',
+                },
+
+                {
+                    title: '加工方式',
+                    field: 'processMethod',
+                },
+                {
+                    title: '订单数量',
+                    field: 'materialNum',
+                },
+                {
+                    title: '已完成数',
+                    field: 'finishNum',
+
+                },
+                {
+                    title: '已申请出货数',
+                    field: 'hasApplyShippingNum',
+
+                },
+                {
+                    title: '已出库数',
+                    field: 'outBoundQuantity',
+                },
+                {
+                    title: '申请出货数',
+                    field: 'applyShippingNum',
+                    editable:true,
+                },
+            ]
+        };
+        $.table.init(options);
+    })
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            salesOrderCode:  sysSalesOrder.salesOrderCode
+        };
+        return curParams;
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From 80bcbc538b17e913bea91b092abf172cdb4c12d4 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 10 Jul 2024 11:06:39 +0800
Subject: [PATCH 02/10] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=AE=A1=E7=90=86=20=E6=96=B0=E5=A2=9E=20=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=9A=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=86=8D=E5=8A=A0=E4=B8=8A=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=20=E6=96=B0=E5=A2=9E=20=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=89=A9=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=B1=95=E7=A4=BA=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E5=8F=B7=E7=9B=B8=E5=85=B3=E5=87=BA=E8=B4=A7=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=B1=95=E7=A4=BA=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E7=9B=B8=E5=85=B3=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E7=94=B3=E8=AF=B7=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E7=AD=89=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=96=9D=E7=94=B3=E8=AF=B7=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E4=BF=9D=E5=AD=98=E9=94=80=E5=94=AE=E5=8D=95-?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99=20=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=97=B6=E6=9B=B4=E6=96=B0=20=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=20=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWarehouseOutController.java     |  36 +++
 .../AfterSalesShippingDeviceMapper.java       |   5 +
 .../IAftersalesWarehouseOutService.java       |   5 +
 .../AftersalesWarehouseOutServiceImpl.java    |  27 ++
 .../controller/SysMakeOrderController.java    |   1 +
 .../impl/WarehouseOutOrderServiceImpl.java    |  15 +-
 .../AfterSalesShippingDeviceMapper.xml        |   7 +
 .../warehouseOutOrder/addShippingDevices.html | 186 ------------
 .../addShippingDevicesOne.html                | 273 ++++++++++++++++++
 .../maintenanceEquipmentOne.html              |  39 ++-
 .../system/makeorder/addEquipmentResume.html  |   3 +-
 .../warehouseOutOrder/prepareMaterial.html    |  12 +-
 12 files changed, 412 insertions(+), 197 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevices.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
index 96723c52..163c8516 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
@@ -263,6 +263,7 @@ public class AftersalesWarehouseOutController extends BaseController
         List<WarehouseOutOrderDetail> list = warehouseOutOrderService.selectOutOrderDetailListByCode(warehouseOutOrder);
         return getDataTable(list);
     }
+
     /**
      * 展示售后第一次维护设备料号相关出货设备信息
      */
@@ -276,6 +277,41 @@ public class AftersalesWarehouseOutController extends BaseController
         return getDataTable(list);
     }
 
+
+
+
+    /**
+     * 售后第一次维护设备 添加出货设备信息
+     */
+    @GetMapping("/addShippingDevicesOne/{outOrderDetailId}")
+    public String addShippingDevicesOne(@PathVariable("outOrderDetailId") Long outOrderDetailId, ModelMap mmap)
+    {
+        WarehouseOutOrderDetail warehouseOutOrderDetail = outOrderDetailService.selectWarehouseOutOrderDetailById(outOrderDetailId);
+        mmap.put("warehouseOutOrderDetail", warehouseOutOrderDetail);
+        return prefix + "/addShippingDevicesOne";
+    }
+
+
+
+
+
+    /**
+     * 展示售后第一次维护设备添加出货设备料号相关出货设备信息
+     */
+    @PostMapping("/getEquipMaterialDetailByMaterialNo")
+    @ResponseBody
+    public TableDataInfo showAftersalesShippingDevicelist(WarehouseOutOrderDetail warehouseOutOrderDetail)
+    {
+
+        startPage();
+        List<SelectShippingDeviceVO> list = warehouseOutOrderService.selectAftersalesShippingDeviceListByMaterialNo(warehouseOutOrderDetail);
+        return getDataTable(list);
+    }
+
+
+
+
+
     /**
      * 第一次维护设备删除物料信息出货设备信息
      */
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 2e1a3a3b..2fd79a99 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
@@ -102,4 +102,9 @@ public interface AfterSalesShippingDeviceMapper
      * 根据生产单号和关联销售单号查询出货设备履历信息
      * */
     List<AfterSalesShippingDevice> selectAfterSalesShippingDeviceByNoAndCode(AfterSalesShippingDevice afterSalesShippingDevice);
+
+    /*
+    *  根据物料号查询出货设备信息列表
+    * */
+    List<AfterSalesShippingDevice> selectShippingDeviceListByMaterialNo(AfterSalesShippingDevice afterSalesShippingDevice);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
index 77a7c7d0..2e95ce8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
@@ -114,4 +114,9 @@ public interface IAftersalesWarehouseOutService
     * 展示售后第一次维护设备物料相关信息
     * */
     List<WarehouseOutOrderDetail> selectOutOrderDetailListByCode(WarehouseOutOrder warehouseOutOrder);
+
+    /**
+    * 展示售后第一次维护设备 添加出货设备 料号相关出货设备信息
+    * */
+    List<SelectShippingDeviceVO> selectAftersalesShippingDeviceListByMaterialNo(WarehouseOutOrderDetail warehouseOutOrderDetail);
 }
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 5b4614a2..1291ad81 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
@@ -184,6 +184,33 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
         return warehouseOutOrderDetails;
     }
 
+    /**
+     * 展示售后第一次维护设备 添加出货设备 料号相关出货设备信息
+     * */
+    @Override
+    public List<SelectShippingDeviceVO> selectAftersalesShippingDeviceListByMaterialNo(WarehouseOutOrderDetail warehouseOutOrderDetail) {
+
+        List<SelectShippingDeviceVO> selectShippingDeviceVOs = new ArrayList<>();
+        AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+        afterSalesShippingDevice.setMaterialNo(warehouseOutOrderDetail.getMaterialNo());
+        List<AfterSalesShippingDevice> afterSalesShippingDevices = shippingDeviceMapper.selectShippingDeviceListByMaterialNo(afterSalesShippingDevice);
+        if (!StringUtils.isNotEmpty(afterSalesShippingDevices)) {
+            // 记录日志
+            log.warn("未查找到与物料号关联的出库设备数据, 物料号: {}",warehouseOutOrderDetail.getMaterialNo());
+        }
+
+        for (AfterSalesShippingDevice tempAfterSalesShippingDevice : afterSalesShippingDevices) {
+            SelectShippingDeviceVO shippingDeviceVO = new SelectShippingDeviceVO();
+            shippingDeviceVO.setShippingDeviceId(tempAfterSalesShippingDevice.getShippingDeviceId());
+            shippingDeviceVO.setDeviceModelCode(tempAfterSalesShippingDevice.getDeviceModelCode());
+            shippingDeviceVO.setDeviceRunningNumber(tempAfterSalesShippingDevice.getDeviceRunningNumber());
+            shippingDeviceVO.setMakePhotoUrl(tempAfterSalesShippingDevice.getMakePhotourl());
+            shippingDeviceVO.setQuoteId(tempAfterSalesShippingDevice.getSalesOrderCode());
+            selectShippingDeviceVOs.add(shippingDeviceVO);
+        }
+        return selectShippingDeviceVOs;
+    }
+
     /*
      * 售后第一次维护设备信息根据设备ID删除出货设备信息
      * */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
index e227446b..444e367f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
@@ -257,6 +257,7 @@ public class SysMakeOrderController extends BaseController
         AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
         afterSalesShippingDevice.setMakeNo(makeNo);
         afterSalesShippingDevice.setSalesOrderCode(salesOrderCode);
+        afterSalesShippingDevice.setMaterialNo(equipMaterialDto.getMaterialCode());
         List<SysEquipDetailDto> equipDetailDtos = salesShippingDeviceService.selectAfterSalesShippingDeviceByNoAndCode(afterSalesShippingDevice);
         return getDataTable(equipDetailDtos);
     }
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 e1a7d6ba..f554a845 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
@@ -170,20 +170,27 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         String loginName = ShiroUtils.getLoginName();
         warehouseOutOrder.setUpdateBy(loginName);
         warehouseOutOrder.setUpdateTime(new Date());
-        warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
+
+        //更改出库状态为 第一次维护设备信息
+        warehouseOutOrder.setWarehouseOutStatus("1");
         List<WarehouseOutOrderDetail> warehouseOutOrderDetailList = warehouseOutOrder.getWarehouseOutOrderDetailList();
         if (StringUtils.isEmpty(warehouseOutOrderDetailList)){
             log.warn("保存销售单-准备物料,物料列表信息为空：{}",warehouseOutOrder);
         }
-        int updateRows = 0;
         for (WarehouseOutOrderDetail warehouseOutOrderDetail : warehouseOutOrderDetailList) {
             warehouseOutOrderDetail.setUpdateBy(loginName);
             warehouseOutOrderDetail.setUpdateTime(new Date());
             warehouseOutOrderDetail.setRemark(warehouseOutOrder.getRemark());
             //更新数据库记录
-            updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail);
+            int updateOutOrderDetail = outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail);
+            if (updateOutOrderDetail <= 0){
+                throw new BusinessException("更新出库单详情数据失败");
+            }
         }
-        return updateRows;
+        //出库单点击准备物料后生成售后单
+
+        int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
+        return updateWarehouseOutOrderResult;
     }
 
 
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 33997e27..d5a9f599 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -98,6 +98,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAfterSalesShippingDeviceVo"/>
         where make_no = #{makeNo}
         and  sales_order_code = #{salesOrderCode}
+        and  material_no = #{materialNo}
+    </select>
+
+
+    <select id="selectShippingDeviceListByMaterialNo" parameterType="AfterSalesShippingDevice" resultMap="AfterSalesShippingDeviceResult">
+        <include refid="selectAfterSalesShippingDeviceVo"/>
+        where material_no = #{materialNo}
     </select>
 
 
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevices.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevices.html
deleted file mode 100644
index 316a5184..00000000
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevices.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!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-warehouseOutOrder-edit" th:object="${selectMaterialsVO}">
-<!--        <input name="quoteId" th:field="*{quoteId}" type="hidden">-->
-<!--        <input name="materialCode" th:field="*{materialCode}" type="hidden">-->
-        <div class="col-sm-12 select-table table-striped">
-            <h3 class="mb-4">物料信息</h3>
-            <table id="table-material"></table>
-        </div>
-        <div class="col-sm-12 select-table table-striped">
-            <h3 class="mb-4">出货设备</h3>
-            <table id="table-shippingDevices"></table>
-        </div>
-    </form>
-</div>
-<th:block th:include="include :: footer" />
-<th:block th:include="include :: datetimepicker-js" />
-<script th:inline="javascript">
-    // var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]];
-    // var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]];
-
-    var prefix = ctx + "aftersales/warehouseOutOrder";
-    var selectMaterialsVO = [[${selectMaterialsVO}]];
-
-    $("#form-warehouseOutOrder-edit").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/edit", $('#form-warehouseOutOrder-edit').serialize());
-        }
-    }
-
-    $("input[name='outOrderTime']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
-
-    $("input[name='planDeliveryTime']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
-
-    /*物料信息列表*/
-    $(function() {
-        // 物料信息
-        $('#table-material').bootstrapTable('destroy');
-        var materialOptions = {
-            id:"table-material",
-            url: prefix + "/addShippingDevicesMaterial",
-            modalName: "物料信息",
-            showColumns: false,
-            pagination: false,
-            showToggle: false,
-            showRefresh:false,
-            showSearch:false,
-            queryParams:queryParams,
-            columns: [{
-                checkbox: true
-            },
-                {   title:'销售订单号',
-                    field:'quoteId',
-                    visible: false
-                },
-                {
-                    title: '料号',
-                    field: 'materialCode',
-                },
-                {
-                    title: '图片',
-                    field: 'photoUrl',
-                },
-                {
-                    title: '物料名称',
-                    field: 'materialName',
-                },
-                {
-                    title: '物料类型',
-                    field: 'materialType',
-                },
-                {
-                    title: '单位',
-                    field: 'materialUnit',
-                },
-                {
-                    title: '品牌',
-                    field: 'brand',
-                },
-                {
-                    title: '描述',
-                    field: 'describe',
-                },
-            ]
-        };
-        $.table.init(materialOptions);
-
-    })
-    function queryParams(params) {
-        var curParams = {
-            // 传递参数查询参数
-            quoteId:  selectMaterialsVO.quoteId,
-            materialCode:  selectMaterialsVO.materialCode,
-        };
-        return curParams;
-    }
-
-    /* 出货设备列表 */
-    $(function() {
-        // 物料信息
-        $('#table-shippingDevices').bootstrapTable('destroy');
-        var shippingDevicesOptions = {
-            id: "table-shippingDevices",
-            url: prefix + "/addShippingDevicesOptions",
-            modalName: "物料信息",
-            showColumns: false,
-            pagination: false,
-            showToggle: false,
-            showRefresh: false,
-            showSearch: false,
-            queryParams:shippingDevicesQueryParams,
-            columns: [
-                {
-                    checkbox: true // 保留原有全选checkbox
-                },
-                {
-                    title: '销售订单号',
-                    field: 'quoteId',
-                    visible: false
-                },
-                {
-                    title: '出货设备ID',
-                    field: 'shippingDeviceId',
-                },
-                {
-                    title: '设备型号',
-                    field: 'deviceModelCode',
-                },
-                {
-                    title: '流水号',
-                    field: 'deviceRunningNumber',
-                },
-                {
-                    title: '生产图片',
-                    field: 'makePhotoUrl',
-                },
-                {
-                    title: '确认添加', // 修改标题为操作
-                    align: 'center',
-                    // formatter: function(value, row, index) {
-                    //     // 自定义操作列内容，包含一个确认添加按钮和一个独立的checkbox
-                    //     var checkboxHtml = '<input type="checkbox" value="' + row.shippingDeviceId + '" class="custom-checkbox">';
-                    //     var addButtonHtml = '<a class="btn btn-success btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="addShippingDevices(\'' + row.materialCode + '\')"><i class="fa fa-add"></i>添加出货设备</a>';
-                    //     return checkboxHtml + ' ' + addButtonHtml;
-                    // },
-                    // events: { // 添加事件处理器
-                    //     'click .custom-checkbox': function(e, value, row, index) {
-                    //         // 这里可以添加点击checkbox时的处理逻辑
-                    //         var checkbox = e.target;
-                    //         console.log("Checkbox for device ID: " + row.shippingDeviceId + " was clicked. Checked: " + checkbox.checked);
-                    //     }
-                    // }
-                }
-            ]
-        };
-        $.table.init(shippingDevicesOptions);
-    });
-
-    function shippingDevicesQueryParams(params) {
-        var curParams = {
-            // 传递参数查询参数
-            quoteId:  selectMaterialsVO.quoteId,
-        };
-        return curParams;
-    }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
new file mode 100644
index 00000000..af49b115
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
@@ -0,0 +1,273 @@
+<!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-addShippingDevicesOne-edit" th:object="${warehouseOutOrderDetail}">
+        <div class="form-group">
+            <label class="col-sm-4 control-label">料号：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">图片：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialPhotoUrl" th:field="*{materialPhotoUrl}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">物料名称：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialName" th:field="*{materialName}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <!--            <div class="form-group">-->
+        <!--                <label class="col-sm-4 control-label">物料类型：</label>-->
+        <!--                <div class="col-sm-8">-->
+        <!--                    <input readonly name="materialType" th:field="*{materialType}" class="form-control" type="text">-->
+        <!--                </div>-->
+        <!--            </div>-->
+        <!--            <div class="form-group">-->
+        <!--                <label class="col-sm-4 control-label">物料类别：</label>-->
+        <!--                <div class="col-sm-8">-->
+        <!--                    <input readonly name="materialClass" th:field="*{materialClass}" class="form-control" type="text">-->
+        <!--                </div>-->
+        <!--            </div>-->
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">型号：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialModel" th:field="*{materialModel}" class="form-control" type="text">
+            </div>
+        </div>
+
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">规格：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialSpecification" th:field="*{materialSpecification}" class="form-control"
+                       type="text">
+            </div>
+        </div>
+
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">单位：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">品牌：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">描述：</label>
+            <div class="col-sm-8">
+                <input readonly name="materialDescribe" th:field="*{materialDescribe}" class="form-control" type="text">
+            </div>
+        </div>
+<!--        <div class="col-sm-12 select-table table-striped">-->
+<!--            <h3 class="mb-4">物料信息</h3>-->
+<!--            <table id="table-material"></table>-->
+<!--        </div>-->
+
+
+    </form>
+    <div class="container">
+        <!-- 选择出货设备 -->
+        <div class="row">
+
+            <div class="col-sm-12 select-table table-striped">
+                <h3 class="mb-4">出货设备</h3>
+                <table id="table-shippingDevices"></table>
+            </div>
+        </div>
+    </div>
+
+
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    // var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]];
+    // var addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevice')}]];
+
+    var prefix = ctx + "aftersales/warehouseOutOrder";
+    var warehouseOutOrderDetail = [[${warehouseOutOrderDetail}]];
+
+    $("#form-addShippingDevicesOne-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-addShippingDevicesOne-edit').serialize());
+        }
+    }
+
+    $("input[name='outOrderTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='planDeliveryTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+    //
+    // /*物料信息列表*/
+    // $(function() {
+    //     // 物料信息
+    //     $('#table-material').bootstrapTable('destroy');
+    //     var materialOptions = {
+    //         id:"table-material",
+    //         url: prefix + "/addShippingDevicesMaterial",
+    //         modalName: "物料信息",
+    //         showColumns: false,
+    //         pagination: false,
+    //         showToggle: false,
+    //         showRefresh:false,
+    //         showSearch:false,
+    //         queryParams:queryParams,
+    //         columns: [{
+    //             checkbox: true
+    //         },
+    //             {   title:'销售订单号',
+    //                 field:'quoteId',
+    //                 visible: false
+    //             },
+    //             {
+    //                 title: '料号',
+    //                 field: 'materialCode',
+    //             },
+    //             {
+    //                 title: '图片',
+    //                 field: 'photoUrl',
+    //             },
+    //             {
+    //                 title: '物料名称',
+    //                 field: 'materialName',
+    //             },
+    //             {
+    //                 title: '物料类型',
+    //                 field: 'materialType',
+    //             },
+    //             {
+    //                 title: '单位',
+    //                 field: 'materialUnit',
+    //             },
+    //             {
+    //                 title: '品牌',
+    //                 field: 'brand',
+    //             },
+    //             {
+    //                 title: '描述',
+    //                 field: 'describe',
+    //             },
+    //         ]
+    //     };
+    //     $.table.init(materialOptions);
+    //
+    // })
+    // function queryParams(params) {
+    //     var curParams = {
+    //         // 传递参数查询参数
+    //         quoteId:  selectMaterialsVO.quoteId,
+    //         materialCode:  selectMaterialsVO.materialCode,
+    //     };
+    //     return curParams;
+    // }
+
+    $(function(){
+
+        var options = {
+            id: "form-equipMaterialDetail-add",
+            url: prefix + "/getEquipMaterialDetailByMaterialNo",
+            pagination: false,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            queryParams:queryParams,
+            sidePagination: "client",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'equipmentIndex',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                        // 使用bootstrap-table的内置序号生成
+                        return index + 1;
+                    }
+                },
+                {
+                    field: 'equipmentId',
+                    align: 'center',
+                    title: '出货设备id',
+                },
+                {
+                    field: 'equipmentModel',
+                    align: 'center',
+                    title: '设备型号',
+                },
+                {
+                    field: 'serialNo',
+                    align: 'center',
+                    title: '流水号',
+                },
+                {
+                    field: 'producePic',
+                    align: 'center',
+                    title: '生产图片',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return '<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(' + index + ')"><i class="fa fa-remove"></i>删除</a>';
+                    }
+                }
+
+            ]
+        };
+        $.table.init(options);
+
+    })
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            materialNo: warehouseOutOrderDetail.materialNo
+        };
+        return curParams;
+    }
+
+    function removeRow(index) {
+        var data = $('#form-equipMaterialDetail-add').bootstrapTable('getData');
+        var row = data[index]; // 获取要删除的行数据
+        if (row) {
+            $('#form-equipMaterialDetail-add').bootstrapTable('remove', {
+                field: 'equipmentIndex',
+                values: [row.equipmentIndex]
+            });
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
index d35431fa..304c596e 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
@@ -124,13 +124,20 @@
       columns: [{
         checkbox: true
       },
+
         {   title:'销售订单号',
           field:'quoteId',
           visible: false
         },
+        {
+          title:'出库单详情Id',
+          field:'outOrderDetailId',
+          visible: false
+
+        },
         {
           title: '料号',
-          field: 'materialCode',
+          field: 'materialNo',
         },
         {
           title: '图片',
@@ -156,12 +163,28 @@
           title: '描述',
           field: 'describe',
         },
+        {
+          title: '订单数量',
+          field: 'makeNum',
+        },
+        {
+          title: '已出库数',
+          field: 'hasOutOrderSum',
+        },
+        {
+          title: '申请出库数',
+          field: 'applyOutOrderSum',
+        },
+        {
+          title: '准备出库数',
+          field: 'prepareOutOrderSum',
+        },
         {
           title: '操作',
           align: 'center',
           formatter: function(value, row, index) {
             var actions = [];
-            actions.push('<a class="btn btn-success btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="addShippingDevices(\'' + row.quoteId + '\',\'' + row.materialCode + '\')"><i class="fa fa-add"></i>添加出货设备</a>');
+            actions.push('<a class="btn btn-success btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="addShippingDevicesOne(\'' + row.outOrderDetailId + '\')"><i class="fa fa-add"></i>添加出货设备</a>');
             return actions.join('');
           }
         }
@@ -255,12 +278,18 @@
 
 
   /*添加出货设备*/
-  function addShippingDevices(quoteId, materialCode) {
-    // 确保URL编码，特别是如果materialCode中可能含有特殊字符
-    var url = ctx + 'aftersales/warehouseOutOrder/addShippingDevices/' + encodeURIComponent(quoteId) + '/' + encodeURIComponent(materialCode);
+  // function addShippingDevicesOne(quoteId, materialCode) {
+  //   // 确保URL编码，特别是如果materialCode中可能含有特殊字符
+  //   var url = ctx + 'aftersales/warehouseOutOrder/addShippingDevicesOne/' + encodeURIComponent(quoteId) + '/' + encodeURIComponent(materialCode);
+  //   $.modal.open("添加出货设备", url);
+  // }
+
+  function addShippingDevicesOne(outOrderDetailId) {
+    var url = prefix + '/addShippingDevicesOne/' + outOrderDetailId
     $.modal.open("添加出货设备", url);
   }
 
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
index 6756d2b3..b00778cf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
@@ -207,7 +207,8 @@
             var curParams = {
                 // 传递参数查询参数
                 makeNo:  equipMaterial.makeNo,
-                quoteId: equipMaterial.quoteId
+                quoteId: equipMaterial.quoteId,
+                materialCode: equipMaterial.materialCode
             };
             return curParams;
         }
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 5b0bc67b..367571f2 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterial.html
@@ -117,7 +117,17 @@
                 "outOrderDetailId":item.outOrderDetailId,
                 "outOrderCode":item.outOrderCode,
                 "materialNo": item.materialNo, // 假设id对应materialId
-                "prepareOutOrderSum":item.prepareOutOrderSum,
+                "materialName": item.materialName,
+                "materialType": item.materialType,
+                "materialPhotourl": item.materialPhotourl,
+                "materialDescribe": item.materialDescribe,
+                "materialBrand": item.materialBrand,
+                "materialUnit": item.materialUnit,
+                "materialProcessMethod": item.materialProcessMethod,
+                "makeNum": item.makeNum,
+                "hasOutOrderSum": item.hasOutOrderSum,
+                "applyOutOrderSum": item.applyOutOrderSum,
+                "prepareOutOrderSum": item.prepareOutOrderSum,
                 // ...其他字段
             };
         });

From 5bc948d15298c0ad387e04d32b0fd759cf425e65 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 10 Jul 2024 14:46:04 +0800
Subject: [PATCH 03/10] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=94=AE=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=20=E5=9B=BE=E7=89=87=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=94=AE=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=20=E6=8F=90=E4=BA=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=B1=A5=E5=8E=86=E4=BF=A1=E6=81=AFJS=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=A1=A8=E6=96=B0=E5=A2=9E=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20=E6=96=B0=E5=A2=9E=20=E5=94=AE=E5=90=8E=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=20=E4=BF=AE=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=94=AE=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=20=E6=B7=BB=E5=8A=A0=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=99=E5=8F=B7=E5=B7=B2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWarehouseOutController.java     | 27 +++++----
 .../domain/AfterSalesShippingDevice.java      | 12 +++-
 .../IAftersalesWarehouseOutService.java       |  6 ++
 .../AftersalesWarehouseOutServiceImpl.java    | 29 ++++++++++
 .../domain/WarehouseOutOrderDetail.java       | 16 ++++++
 .../IWarehouseOutOrderDetailService.java      |  5 ++
 .../WarehouseOutOrderDetailServiceImpl.java   | 24 ++++++++
 .../AfterSalesShippingDeviceMapper.xml        |  7 ++-
 .../addShippingDevicesOne.html                | 55 +++++++++++++++----
 .../maintenanceEquipmentOne.html              |  4 +-
 10 files changed, 160 insertions(+), 25 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
index 163c8516..f083025a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
@@ -11,11 +11,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.aftersales.service.IAftersalesWarehouseOutService;
@@ -265,15 +261,15 @@ public class AftersalesWarehouseOutController extends BaseController
     }
 
     /**
-     * 展示售后第一次维护设备料号相关出货设备信息
+     * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
      */
-    @PostMapping("/showAftersalesShippingDevicelist")
+    @PostMapping("/showAftersalesShippingDeviceList")
     @ResponseBody
-    public TableDataInfo showAftersalesShippingDevicelist(WarehouseOutOrder warehouseOutOrder)
+    public TableDataInfo showAftersalesShippingDeviceList(@RequestParam("materialNo") String materialNo)
     {
 
         startPage();
-        List<SelectShippingDeviceVO> list = warehouseOutOrderService.selectAftersalesShippingDevicelistByCodeAndNo(warehouseOutOrder);
+        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceList(materialNo);
         return getDataTable(list);
     }
 
@@ -293,6 +289,17 @@ public class AftersalesWarehouseOutController extends BaseController
 
 
 
+    /**
+     * 修改保存售后第一次维护设备 添加出货设备信息
+     */
+    @ResponseBody
+    @PostMapping("/addShippingDevicesOne")
+    public AjaxResult addShippingDevicesOne(@RequestBody WarehouseOutOrderDetail warehouseOutOrderDetail)
+    {
+
+       return toAjax(outOrderDetailService.addShippingDevicesOne(warehouseOutOrderDetail));
+    }
+
 
 
     /**
@@ -310,8 +317,6 @@ public class AftersalesWarehouseOutController extends BaseController
 
 
 
-
-
     /**
      * 第一次维护设备删除物料信息出货设备信息
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
index 1bdffb92..6bf4cece 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
@@ -158,7 +158,8 @@ public class AfterSalesShippingDevice extends BaseEntity
     @Excel(name = "维修时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date maintainTime;
 
-
+     /** 是否添加出货设备（0代表是 1代表否） */
+    private String addShippingDeviceFlag;
     public void setShippingDeviceCode(Long shippingDeviceCode) 
     {
         this.shippingDeviceCode = shippingDeviceCode;
@@ -464,6 +465,14 @@ public class AfterSalesShippingDevice extends BaseEntity
         this.maintainTime = maintainTime;
     }
 
+    public String getAddShippingDeviceFlag() {
+        return addShippingDeviceFlag;
+    }
+
+    public void setAddShippingDeviceFlag(String addShippingDeviceFlag) {
+        this.addShippingDeviceFlag = addShippingDeviceFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -505,6 +514,7 @@ public class AfterSalesShippingDevice extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("addShippingDeviceFlag",getAddShippingDeviceFlag())
             .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
index 2e95ce8b..1420df74 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
@@ -119,4 +119,10 @@ public interface IAftersalesWarehouseOutService
     * 展示售后第一次维护设备 添加出货设备 料号相关出货设备信息
     * */
     List<SelectShippingDeviceVO> selectAftersalesShippingDeviceListByMaterialNo(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
+     * */
+    List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo);
+
 }
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 1291ad81..d4859b94 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
@@ -2,6 +2,7 @@ package com.ruoyi.aftersales.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
 import com.ruoyi.aftersales.domain.vo.SelectMaterialsVO;
@@ -211,6 +212,34 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
         return selectShippingDeviceVOs;
     }
 
+    /**
+     * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
+     * */
+    @Override
+    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo) {
+
+        List<SelectShippingDeviceVO> selectShippingDeviceVOs = new ArrayList<>();
+        AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+        afterSalesShippingDevice.setMaterialNo(materialNo);
+        List<AfterSalesShippingDevice> afterSalesShippingDevices = shippingDeviceMapper.selectShippingDeviceListByMaterialNo(afterSalesShippingDevice);
+        List<AfterSalesShippingDevice> filterAfterSalesShippingDevices = afterSalesShippingDevices.stream().filter(shippingDevice -> "0".equals(shippingDevice.getAddShippingDeviceFlag())).collect(Collectors.toList());
+        if (!StringUtils.isNotEmpty(filterAfterSalesShippingDevices)) {
+            // 记录日志
+            log.warn("未查找到与物料号关联的出库设备数据, 物料号: {}",materialNo);
+        }
+
+        for (AfterSalesShippingDevice tempAfterSalesShippingDevice : filterAfterSalesShippingDevices) {
+            SelectShippingDeviceVO shippingDeviceVO = new SelectShippingDeviceVO();
+            shippingDeviceVO.setShippingDeviceId(tempAfterSalesShippingDevice.getShippingDeviceId());
+            shippingDeviceVO.setDeviceModelCode(tempAfterSalesShippingDevice.getDeviceModelCode());
+            shippingDeviceVO.setDeviceRunningNumber(tempAfterSalesShippingDevice.getDeviceRunningNumber());
+            shippingDeviceVO.setMakePhotoUrl(tempAfterSalesShippingDevice.getMakePhotourl());
+            shippingDeviceVO.setQuoteId(tempAfterSalesShippingDevice.getSalesOrderCode());
+            selectShippingDeviceVOs.add(shippingDeviceVO);
+        }
+        return selectShippingDeviceVOs;
+    }
+
     /*
      * 售后第一次维护设备信息根据设备ID删除出货设备信息
      * */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrderDetail.java
index 777e0796..57f887ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrderDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrderDetail.java
@@ -1,7 +1,10 @@
 package com.ruoyi.warehouse.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.aftersales.domain.vo.SelectShippingDeviceVO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -199,6 +202,10 @@ public class WarehouseOutOrderDetail extends BaseEntity
     @Excel(name = "收货电话")
     private String deliveryNumber;
 
+    /** 添加出货设备列表*/
+    private List<SelectShippingDeviceVO> SelectShippingDeviceVOList;
+
+
     public void setOutOrderDetailId(Long outOrderDetailId) 
     {
         this.outOrderDetailId = outOrderDetailId;
@@ -605,6 +612,14 @@ public class WarehouseOutOrderDetail extends BaseEntity
         return deliveryNumber;
     }
 
+    public List<SelectShippingDeviceVO> getSelectShippingDeviceVOList() {
+        return SelectShippingDeviceVOList;
+    }
+
+    public void setSelectShippingDeviceVOList(List<SelectShippingDeviceVO> selectShippingDeviceVOList) {
+        SelectShippingDeviceVOList = selectShippingDeviceVOList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -658,6 +673,7 @@ public class WarehouseOutOrderDetail extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("selectShippingDeviceVOList",getSelectShippingDeviceVOList())
             .toString();
     }
 }
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 0739d3d2..ed3624bb 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
@@ -91,4 +91,9 @@ public interface IWarehouseOutOrderDetailService
      * 退换货-出库 供应商物料详情列表
      */
     List<WarehouseOutOrderDetail> selectWarehouseOutOrderDetailListByCode(String outOrderCode);
+
+    /**
+     * 修改保存售后第一次维护设备 添加出货设备信息
+     */
+    int addShippingDevicesOne(WarehouseOutOrderDetail warehouseOutOrderDetail);
 }
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 9b70eca2..c4dcb061 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
@@ -3,7 +3,9 @@ package com.ruoyi.warehouse.service.impl;
 import java.util.List;
 
 import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
+import com.ruoyi.aftersales.domain.vo.SelectShippingDeviceVO;
 import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper;
+import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -16,6 +18,7 @@ import com.ruoyi.warehouse.mapper.WarehouseOutOrderDetailMapper;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
 import com.ruoyi.warehouse.service.IWarehouseOutOrderDetailService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 出库单详情Service业务层处理
@@ -165,4 +168,25 @@ public class WarehouseOutOrderDetailServiceImpl implements IWarehouseOutOrderDet
 
         return warehouseOutOrderDetailMapper.selectOutOrderDetailListByCode(outOrderCode);
     }
+
+    /**
+     * 修改保存售后第一次维护设备 添加出货设备信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int addShippingDevicesOne(WarehouseOutOrderDetail warehouseOutOrderDetail) {
+        List<SelectShippingDeviceVO> selectShippingDeviceVOList = warehouseOutOrderDetail.getSelectShippingDeviceVOList();
+        int updateShippingDeviceResult = 0;
+        for (SelectShippingDeviceVO selectShippingDeviceVO : selectShippingDeviceVOList) {
+            AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+            afterSalesShippingDevice.setShippingDeviceId(selectShippingDeviceVO.getShippingDeviceId());
+            //设置为已经添加出货设备
+            afterSalesShippingDevice.setAddShippingDeviceFlag("0");
+            updateShippingDeviceResult += afterSalesShippingDeviceMapper.updateAfterSalesShippingDevice(afterSalesShippingDevice);
+            if (updateShippingDeviceResult <= 0){
+                throw new BusinessException("更新出货设备信息失败");
+            }
+        }
+           return updateShippingDeviceResult;
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index d5a9f599..c93078fa 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -43,10 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="addShippingDeviceFlag"    column="add_shipping_device_flag"    />
+
     </resultMap>
 
     <sql id="selectAfterSalesShippingDeviceVo">
-        select shipping_device_code, shipping_device_id, make_no,sales_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe, device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag, component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time from aftersales_shipping_device
+        select shipping_device_code, shipping_device_id, make_no,sales_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe, device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag, component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time, add_shipping_device_flag from aftersales_shipping_device
     </sql>
 
     <select id="selectAfterSalesShippingDeviceList" parameterType="AfterSalesShippingDevice" resultMap="AfterSalesShippingDeviceResult">
@@ -148,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="addShippingDeviceFlag != null">add_shipping_device_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="shippingDeviceId != null and shippingDeviceId != ''">#{shippingDeviceId},</if>
@@ -186,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="addShippingDeviceFlag != null">#{addShippingDeviceFlag}</if>
          </trim>
     </insert>
 
@@ -228,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="addShippingDeviceFlag != null">add_shipping_device_flag = #{addShippingDeviceFlag},</if>
         </trim>
         where shipping_device_id= #{shippingDeviceId}
     </update>
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
index af49b115..90501a5d 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
@@ -17,7 +17,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">图片：</label>
             <div class="col-sm-8">
-                <input readonly name="materialPhotoUrl" th:field="*{materialPhotoUrl}" class="form-control" type="text">
+                <input readonly name="materialPhotourl" th:field="*{materialPhotourl}" class="form-control" type="text">
             </div>
         </div>
 
@@ -111,12 +111,47 @@
         focusCleanup: true
     });
 
+    /*
+          * 提交设备履历信息
+          * */
     function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/edit", $('#form-addShippingDevicesOne-edit').serialize());
+        // 获取表单数据
+        const shippingDevicesData = $("#form-addShippingDevicesOne-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        // var table = $('#table-shippingDevices').bootstrapTable('getData');
+        //获取选中复选框行的数据
+        const selectedRows = $("#table-shippingDevices").bootstrapTable('getSelections');
+        // 检查表格数据是否为空
+        if (selectedRows.length===0){
+            $.modal.alertWarning("请至少选择一条出货设备信息后再保存!");
+            return;
         }
+        // 将表数据转换成与complaintNoticeData格式一致的数组
+        var equipDetailDataList = selectedRows.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "shippingDeviceId": item.shippingDeviceId,
+                "deviceModelCode": item.deviceModelCode,
+                "deviceRunningNumber": item.deviceRunningNumber,
+                "makePhotoUrl": item.makePhotoUrl
+                // ...其他字段
+            };
+        });
+
+        // 合并表单数据和表格数据
+        const combinedData = Object.assign({}, shippingDevicesData, { selectShippingDeviceVOList: equipDetailDataList });
+
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/addShippingDevicesOne", jsonData);
     }
 
+
     $("input[name='outOrderTime']").datetimepicker({
         format: "yyyy-mm-dd",
         minView: "month",
@@ -195,7 +230,7 @@
     $(function(){
 
         var options = {
-            id: "form-equipMaterialDetail-add",
+            id: "table-shippingDevices",
             url: prefix + "/getEquipMaterialDetailByMaterialNo",
             pagination: false,
             showSearch: false,
@@ -217,22 +252,22 @@
                     }
                 },
                 {
-                    field: 'equipmentId',
+                    field: 'shippingDeviceId',
                     align: 'center',
                     title: '出货设备id',
                 },
                 {
-                    field: 'equipmentModel',
+                    field: 'deviceModelCode',
                     align: 'center',
                     title: '设备型号',
                 },
                 {
-                    field: 'serialNo',
+                    field: 'deviceRunningNumber',
                     align: 'center',
                     title: '流水号',
                 },
                 {
-                    field: 'producePic',
+                    field: 'makePhotoUrl',
                     align: 'center',
                     title: '生产图片',
                 },
@@ -259,10 +294,10 @@
     }
 
     function removeRow(index) {
-        var data = $('#form-equipMaterialDetail-add').bootstrapTable('getData');
+        var data = $('#table-shippingDevices').bootstrapTable('getData');
         var row = data[index]; // 获取要删除的行数据
         if (row) {
-            $('#form-equipMaterialDetail-add').bootstrapTable('remove', {
+            $('#table-shippingDevices').bootstrapTable('remove', {
                 field: 'equipmentIndex',
                 values: [row.equipmentIndex]
             });
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
index 304c596e..3adb18d3 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
@@ -200,12 +200,12 @@
     var childTableId = 'child_table_'+index;
     $detail.html('<table id="'+childTableId+'"></table>');
     $('#'+childTableId).bootstrapTable({
-      url: prefix + "/showAftersalesShippingDevicelist",
+      url: prefix + "/showAftersalesShippingDeviceList",
       method: 'post',
       sidePagination: "server",
       contentType: "application/x-www-form-urlencoded",
       queryParams : {
-        salesOrderCode: warehouseOutOrder.salesOrderCode,
+        // salesOrderCode: warehouseOutOrder.salesOrderCode,
         materialNo: parentRow.materialNo
       },
       columns: [

From 03bf21d5463806d7cef8237d4c002ff8e064c9de Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 10 Jul 2024 20:07:24 +0800
Subject: [PATCH 04/10] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E8=B4=A7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20js=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87ID?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=8A=B6=E6=80=81=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=89=8D=E7=AB=AF=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8B=BF=E4=B8=8D=E5=88=B0=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=8A=A0=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=B6=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=20snCode?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=20=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=9B=86=E5=90=88=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=8D=95=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99=E5=90=8E=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWarehouseOutController.java     |  4 +-
 .../domain/vo/SelectShippingDeviceVO.java     |  2 +
 .../AfterSalesShippingDeviceMapper.java       | 12 +++-
 .../IAftersalesWarehouseOutService.java       |  4 ++
 .../AftersalesWarehouseOutServiceImpl.java    | 50 ++++++++++++++
 .../mapper/SysSalesShippingInformMapper.java  | 10 +++
 .../warehouse/domain/WarehouseOutOrder.java   | 15 +++++
 .../impl/WarehouseOutOrderServiceImpl.java    | 23 +++++--
 .../AfterSalesShippingDeviceMapper.xml        |  8 +++
 .../system/SysSalesShippingInformMapper.xml   | 36 ++++++++++
 .../addShippingDevicesOne.html                |  2 +-
 .../maintenanceEquipmentOne.html              | 66 +++++++++++++++++--
 12 files changed, 216 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
index f083025a..230b3b2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
@@ -241,9 +241,9 @@ public class AftersalesWarehouseOutController extends BaseController
     @Log(title = "售后维护设备出库", businessType = BusinessType.UPDATE)
     @PostMapping("/maintenanceEquipmentOne")
     @ResponseBody
-    public AjaxResult maintenanceEquipmentOneSave(WarehouseOutOrder warehouseOutOrder)
+    public AjaxResult maintenanceEquipmentOneSave(@RequestBody WarehouseOutOrder warehouseOutOrder)
     {
-        return toAjax(warehouseOutOrderService.updateWarehouseOutOrder(warehouseOutOrder));
+        return toAjax(warehouseOutOrderService.updateMaintenanceEquipmentOne(warehouseOutOrder));
     }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
index 0fbae240..f6a0ec33 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
@@ -18,5 +18,7 @@ public class SelectShippingDeviceVO {
 
     private String makePhotoUrl;
 
+    private String snCode;
+
 }
 
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 2fd79a99..afe3d0d0 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
@@ -14,12 +14,20 @@ public interface AfterSalesShippingDeviceMapper
     /**
      * 查询出货设备
      * 
-     * @param shippingDeviceCode 出货设备ID
+     * @param shippingDeviceCode 出货设备Code
      * @return 出货设备
      */
     public AfterSalesShippingDevice selectAfterSalesShippingDeviceById(Long shippingDeviceCode);
 
 
+    /**
+     * 查询出货设备
+     *
+     * @param shippingDeviceId 出货设备ID
+     * @return 出货设备
+     */
+    public AfterSalesShippingDevice selectAfterSalesShippingDeviceByShippingDeviceId(String shippingDeviceId);
+
     /**
      * 查询选择设备
      *
@@ -64,7 +72,7 @@ public interface AfterSalesShippingDeviceMapper
     /**
      * 删除出货设备
      * 
-     * @param shippingDeviceCode 出货设备ID
+     * @param shippingDeviceId 出货设备ID
      * @return 结果
      */
     public int deleteAfterSalesShippingDeviceById(String shippingDeviceId);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
index 1420df74..b091fc29 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
@@ -125,4 +125,8 @@ public interface IAftersalesWarehouseOutService
      * */
     List<SelectShippingDeviceVO> showAftersalesShippingDeviceList(String materialNo);
 
+    /**
+     * 修改保存售后第一次维护设备
+     */
+    int updateMaintenanceEquipmentOne(WarehouseOutOrder warehouseOutOrder);
 }
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 d4859b94..e176bfef 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
@@ -1,6 +1,7 @@
 package com.ruoyi.aftersales.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -13,7 +14,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysSalesOrderChild;
+import com.ruoyi.system.domain.SysSalesShippingInform;
 import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
+import com.ruoyi.system.mapper.SysSalesShippingInformMapper;
 import com.ruoyi.warehouse.domain.WarehouseOutOrder;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
 import com.ruoyi.warehouse.mapper.WarehouseOutOrderDetailMapper;
@@ -23,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.aftersales.service.IAftersalesWarehouseOutService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 出库单Service业务层处理
@@ -46,6 +50,9 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
     @Autowired
     private WarehouseOutOrderDetailMapper outOrderDetailMapper;
 
+    @Autowired
+    private SysSalesShippingInformMapper shippingInformMapper;
+
     /**
      * 查询出库单
      * 
@@ -240,6 +247,49 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
         return selectShippingDeviceVOs;
     }
 
+    /**
+     * 修改保存售后第一次维护设备
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int updateMaintenanceEquipmentOne(WarehouseOutOrder warehouseOutOrder) {
+
+        String loginName = ShiroUtils.getLoginName();
+
+        List<SelectShippingDeviceVO> selectShippingDeviceVOList = warehouseOutOrder.getSelectShippingDeviceVOList();
+        for (SelectShippingDeviceVO selectShippingDeviceVO : selectShippingDeviceVOList) {
+            AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+            afterSalesShippingDevice.setShippingDeviceId(selectShippingDeviceVO.getShippingDeviceId());
+            afterSalesShippingDevice.setSnCode(selectShippingDeviceVO.getSnCode());
+            afterSalesShippingDevice.setUpdateBy(loginName);
+            afterSalesShippingDevice.setUpdateTime(new Date());
+            int updateShippingDeviceResult = shippingDeviceMapper.updateAfterSalesShippingDevice(afterSalesShippingDevice);
+            if (updateShippingDeviceResult <= 0){
+                throw new BusinessException("更新出货设备数据失败");
+            }
+
+        }
+
+        //设置出库单为待业务确认发货
+        warehouseOutOrder.setWarehouseOutStatus("2");
+
+        //更新销售管理销售出库的出货状态 待业务确认发货
+        SysSalesShippingInform sysSalesShippingInform = new SysSalesShippingInform();
+        sysSalesShippingInform.setOutOrderCode(warehouseOutOrder.getOutOrderCode());
+        sysSalesShippingInform.setWarehouseOutStatus("2");
+        sysSalesShippingInform.setUpdateBy(loginName);
+        sysSalesShippingInform.setUpdateTime(new Date());
+        int updateShippingInformResult = shippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform);
+        if (updateShippingInformResult <= 0){
+            log.warn("出库单号为空：{}",warehouseOutOrder.getOutOrderCode());
+            throw new BusinessException("更新销售出库单数据失败");
+        }
+
+
+
+        return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
+    }
+
     /*
      * 售后第一次维护设备信息根据设备ID删除出货设备信息
      * */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
index 3aae2e63..1118c835 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
@@ -43,6 +43,16 @@ public interface SysSalesShippingInformMapper
      */
     public int updateSysSalesShippingInform(SysSalesShippingInform sysSalesShippingInform);
 
+
+    /**
+     * 修改销售出货通知
+     *
+     * @param sysSalesShippingInform 销售出货通知
+     * @return 结果
+     */
+    public int updateSysSalesShippingInformByOutOrderCode(SysSalesShippingInform sysSalesShippingInform);
+
+
     /**
      * 删除销售出货通知
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java
index ca862021..3304d077 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.aftersales.domain.vo.SelectShippingDeviceVO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -130,6 +131,11 @@ public class WarehouseOutOrder extends BaseEntity
     /** 仓库出库单详情*/
     private List<WarehouseOutOrderDetail>  warehouseOutOrderDetailList;
 
+    /** 添加出货设备列表*/
+
+    private List<SelectShippingDeviceVO> selectShippingDeviceVOList;
+
+
     public void setOutOrderId(Long outOrderId) 
     {
         this.outOrderId = outOrderId;
@@ -428,6 +434,14 @@ public class WarehouseOutOrder extends BaseEntity
         this.warehouseOutOrderDetailList = warehouseOutOrderDetailList;
     }
 
+    public List<SelectShippingDeviceVO> getSelectShippingDeviceVOList() {
+        return selectShippingDeviceVOList;
+    }
+
+    public void setSelectShippingDeviceVOList(List<SelectShippingDeviceVO> selectShippingDeviceVOList) {
+        this.selectShippingDeviceVOList = selectShippingDeviceVOList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -469,6 +483,7 @@ public class WarehouseOutOrder extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("warehouseOutOrderDetailList",getWarehouseOutOrderDetailList())
+            .append("selectShippingDeviceVOList",getSelectShippingDeviceVOList())
             .toString();
     }
 }
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 f554a845..a189925d 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
@@ -9,10 +9,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.*;
-import com.ruoyi.system.mapper.SysMakeOrderMapper;
-import com.ruoyi.system.mapper.SysMakeorderPickDetailMapper;
-import com.ruoyi.system.mapper.SysMakeorderPickMapper;
-import com.ruoyi.system.mapper.SysSalesOrderMapper;
+import com.ruoyi.system.mapper.*;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
@@ -58,6 +55,10 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private SysSalesShippingInformMapper shippingInformMapper;
+
+
     /**
      * 查询仓库出库单
      * 
@@ -187,7 +188,19 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
                 throw new BusinessException("更新出库单详情数据失败");
             }
         }
-        //出库单点击准备物料后生成售后单
+
+
+        SysSalesShippingInform sysSalesShippingInform = new SysSalesShippingInform();
+        sysSalesShippingInform.setOutOrderCode(warehouseOutOrder.getOutOrderCode());
+        //更新销售管理销售出库的出货状态 待售后维护设备1
+        sysSalesShippingInform.setWarehouseOutStatus("1");
+        sysSalesShippingInform.setUpdateBy(loginName);
+        sysSalesShippingInform.setUpdateTime(new Date());
+        int updateShippingInformResult = shippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform);
+        if (updateShippingInformResult <= 0){
+            log.warn("出库单号为空：{}",warehouseOutOrder.getOutOrderCode());
+            throw new BusinessException("更新销售出库单数据失败");
+        }
 
         int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
         return updateWarehouseOutOrderResult;
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index c93078fa..c4468920 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -79,6 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where shipping_device_code = #{shippingDeviceCode}
     </select>
 
+
+    <select id="selectAfterSalesShippingDeviceByShippingDeviceId" parameterType="String" resultMap="AfterSalesShippingDeviceResult">
+        <include refid="selectAfterSalesShippingDeviceVo"/>
+        where shipping_device_id = #{shippingDeviceId}
+    </select>
+
+
+
     <select id="selectShippingDeviceByMakeNo" parameterType="String" resultMap="AfterSalesShippingDeviceResult">
         <include refid="selectAfterSalesShippingDeviceVo"/>
         where make_no = #{makeNo}
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
index 05686663..745b4aca 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
@@ -151,6 +151,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where shipping_inform_id = #{shippingInformId}
     </update>
 
+    <update id="updateSysSalesShippingInformByOutOrderCode" parameterType="SysSalesShippingInform">
+        update sys_sales_shipping_inform
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status = #{warehouseOutStatus},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="businessMembers != null">business_members = #{businessMembers},</if>
+            <if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="customerContact != null">customer_contact = #{customerContact},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
+            <if test="customerContactAddress != null">customer_contact_address = #{customerContactAddress},</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>
+            <if test="allPriceExcludingTaxRmb != null">all_price_excluding_tax_rmb = #{allPriceExcludingTaxRmb},</if>
+            <if test="allPriceExcludingTaxDollar != null">all_price_excluding_tax_dollar = #{allPriceExcludingTaxDollar},</if>
+            <if test="allPriceIncludesTax != null">all_price_includes_tax = #{allPriceIncludesTax},</if>
+            <if test="plannedDeliveryTime != null">planned_delivery_time = #{plannedDeliveryTime},</if>
+            <if test="acceptanceTime != null">acceptance_time = #{acceptanceTime},</if>
+            <if test="paymentCondition != null">payment_condition = #{paymentCondition},</if>
+            <if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
+            <if test="deliverTime != null">deliver_time = #{deliverTime},</if>
+        </trim>
+        where out_order_code = #{outOrderCode}
+    </update>
+
+
+
     <delete id="deleteSysSalesShippingInformById" parameterType="Long">
         delete from sys_sales_shipping_inform where shipping_inform_id = #{shippingInformId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
index 90501a5d..3df5aba7 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/addShippingDevicesOne.html
@@ -111,7 +111,7 @@
         focusCleanup: true
     });
 
-    /*
+          /*
           * 提交设备履历信息
           * */
     function submitHandler() {
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
index 3adb18d3..d075be63 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
@@ -6,7 +6,7 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-  <form class="form-horizontal m" id="form-warehouseOutOrder-edit" th:object="${warehouseOutOrder}">
+  <form class="form-horizontal m" id="form-maintenanceEquipmentOne-edit" th:object="${warehouseOutOrder}">
     <input name="outOrderId" th:field="*{outOrderId}" type="hidden">
     <div class="form-group">
       <label class="col-sm-3 control-label">出库单号：</label>
@@ -85,16 +85,53 @@
   var prefix = ctx + "aftersales/warehouseOutOrder";
   var warehouseOutOrder = [[${warehouseOutOrder}]];
 
-  $("#form-warehouseOutOrder-edit").validate({
+  $("#form-maintenanceEquipmentOne-edit").validate({
     focusCleanup: true
   });
 
+  // function submitHandler() {
+  //   if ($.validate.form()) {
+  //     $.operate.save(prefix + "/maintenanceEquipmentOne", $('#form-maintenanceEquipmentOne-edit').serialize());
+  //   }
+  // }
+
+
   function submitHandler() {
-    if ($.validate.form()) {
-      $.operate.save(prefix + "/edit", $('#form-warehouseOutOrder-edit').serialize());
-    }
+    // 获取表单数据
+    const shippingDevicesData = $("#form-maintenanceEquipmentOne-edit").serializeArray().reduce((obj, item) => {
+      obj[item.name] = item.value;
+      return obj;
+    }, {});
+
+    // 在需要收集所有子表数据的地方调用此函数
+    var allSubData = getAllSubTablesData();
+
+    // 将表数据转换成与complaintNoticeData格式一致的数组
+    var equipDetailDataList = allSubData.map(function(item) {
+      // 根据实际字段名调整
+      return {
+        "shippingDeviceId": item.shippingDeviceId,
+        "deviceModelCode": item.deviceModelCode,
+        "deviceRunningNumber": item.deviceRunningNumber,
+        "makePhotoUrl": item.makePhotoUrl,
+        "snCode": item.snCode
+        // ...其他字段
+      };
+    });
+
+    // 合并表单数据和表格数据
+    const combinedData = Object.assign({}, shippingDevicesData, { selectShippingDeviceVOList: equipDetailDataList });
+
+    console.log(combinedData)
+    // 使用 JSON.stringify() 序列化数据
+    const jsonData = JSON.stringify(combinedData);
+    // 发送 AJAX 请求到后端接口
+    $.operate.saveJson(prefix + "/maintenanceEquipmentOne", jsonData);
   }
 
+
+
+
   $("input[name='outOrderTime']").datetimepicker({
     format: "yyyy-mm-dd",
     minView: "month",
@@ -107,8 +144,10 @@
     autoclose: true
   });
 
+
   $(function() {
     var options = {
+      id:'bootstrap-table',
       url: prefix + "/getMaintenanceEquipmentOneMaterials",
       modalName: "物料信息",
       showColumns: false,
@@ -191,7 +230,6 @@
       ]
     };
     $.table.init(options);
-
   })
 
 
@@ -237,6 +275,7 @@
     });
   };
 
+
   function queryParams(params) {
     var curParams = {
       // 传递参数查询参数
@@ -246,6 +285,21 @@
   }
 
 
+  // 获取所有子表数据的函数
+  // 获取所有子表数据的函数
+  function getAllSubTablesData() {
+    var allSubData = [];
+    // 获取所有被展开的行
+    var parentLength = $("#bootstrap-table").bootstrapTable("getData").length;
+    for (let i = 0; i < parentLength; i++) {
+      var sonData =  $('#'+"child_table_" + i).bootstrapTable("getData");
+      //循环获取子表中存在的行数据，每个行数据转换添加到allSubData数组中
+      allSubData = allSubData.concat(sonData);
+    }
+    return allSubData;
+  }
+
+
   function deleteRow(shippingDeviceId) {
     // 弹出确认框询问用户是否确定删除
     if (confirm("确定要删除这条记录吗？")) {

From 81aef1730430160f0ffe2c4b74249d30c300dd1e Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 10 Jul 2024 20:31:40 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8A=A5=E4=BB=B7=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/customerQuote/add.html   |  89 +++++----
 .../system/customerQuote/detail.html          |  27 +--
 .../templates/system/customerQuote/edit.html  |  22 +--
 .../system/customerQuote/taskModifyApply.html | 172 ++++++++++--------
 .../system/customerQuote/taskYwjlVerify.html  | 100 +++++-----
 .../system/customerQuote/taskYwzgVerify.html  |  65 ++++---
 .../system/customerQuote/taskZozjVerify.html  |  87 ++++-----
 7 files changed, 276 insertions(+), 286 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 2a1da822..f722f360 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -145,6 +145,7 @@
         var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var userName = [[${@permission.getPrincipalProperty('userName')}]];
+        var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
         var prefix = ctx + "system/customerQuote";
         var commonCurrency = $("#commonCurrency_add option:selected").val();
         $("#form-customerQuote-add").validate({focusCleanup: true});
@@ -166,11 +167,9 @@
                 }
             }
         }
-            //获取客户信息
 
-
-                // 监听客户编号下拉框的变化
-                $('#customerCode').on('change', function() {
+       // 监听客户编号下拉框的变化
+        $('#customerCode').on('change', function() {
                     var selectedCustomerCode = $(this).val(); // 获取选中的客户ID
                     if (selectedCustomerCode) {
                         // 发起Ajax请求获取客户名称
@@ -208,14 +207,12 @@
                         $('input[name="customerName"]').val('');
                     }
                 });
-
-
         $(document).ready(function() {
             // 初始化时默认加载客户编号列表
             loadCustomerIds();
         });
             // 假设的加载客户编号列表函数
-            function loadCustomerIds() {
+        function loadCustomerIds() {
                 var url = ctx + 'system/customer/getCustomers';
                 $.ajax({
                     type: 'GET', // 请求类型
@@ -245,9 +242,6 @@
                     }
                 });
             }
-
-
-
         //添加收款明细
         function insertNoMaterialNoRow() {
             // 生成一个简单的唯一标识，这里使用时间戳作为示例
@@ -270,8 +264,6 @@
 
         }
 
-
-
         $(function() {
             var options = {
                 id:'bootstrap-sub-table-quoteChild',
@@ -544,46 +536,51 @@
                     // 可以选择取消这次编辑操作，但Bootstrap Table默认不会提供直接的API来取消编辑后的保存，您可能需要手动恢复数据或采取其他策略。
                 }
             });
-
             // 初始化时也需要根据当前的货币类型设置一次
             $("#commonCurrency_add").trigger('change');
+            getBusinessMembers();
+            getCustomerCode();
         });
-        //获取单号
-        $.ajax({
-            url: prefix + "/getId",
-            type: "post",
-            dateType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    $("input[name='supplierCode']").val(resp.data);
-                } else {
-                    $.modal.msgError("失败啦");
+        function getCustomerCode(){
+            //获取单号
+            $.ajax({
+                url: prefix + "/getId",
+                type: "post",
+                dateType: "json",
+                success: function (resp) {
+                    if (resp.code === 0) {
+                        $("input[name='supplierCode']").val(resp.data);
+                    } else {
+                        $.modal.msgError("失败啦");
+                    }
+                },
+                error: function () {
+                    $.modal.msgError("后台出错啦！");
                 }
-            },
-            error: function () {
-                $.modal.msgError("后台出错啦！");
-            }
-        });
-        /*业务员列表*/
-        $.ajax({
-            url: ctx + 'system/salesOrder/getBinessMembers',
-            type: 'get',
-            success: function (res) {
-                console.log(res)
-                if (res.rows.length > 0) {
-                    var usertData = res.rows;
-                    //alert(JSON.stringify(data));
-                    for (let i in usertData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-customerQuote-add select[name='businessMembers']").append(
-                            "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+            });
+        }
+        function getBusinessMembers(){
+            /*业务员列表*/
+            $.ajax({
+                url: ctx + 'system/salesOrder/getBinessMembers',
+                type: 'get',
+                success: function (res) {
+                    console.log(res)
+                    if (res.rows.length > 0) {
+                        var usertData = res.rows;
+                        //alert(JSON.stringify(data));
+                        for (let i in usertData) {
+                            // console.log(finishProductData[i].finishProductCode)
+                            $("#form-customerQuote-add select[name='businessMembers']").append(
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
+                        }
+                        $("#form-customerQuote-add select[name='businessMembers']").val(loginName).trigger("change");
+                    } else {
+                        $.modal.msgError(res.msg);
                     }
-                    $("#form-customerQuote-add select[name='businessMembers']").val(userName).trigger("change");
-                } else {
-                    $.modal.msgError(res.msg);
                 }
-            }
-        });
+            });
+        }
         function doSubmit(index, layero,uniqueId){
             console.log(uniqueId);
             var iframeWin = window[layero.find('iframe')[0]['name']];
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
index 4a5e27d6..df0750e0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
@@ -70,7 +70,10 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">国内税率：</label>
             <div class="col-sm-8">
-                <input name="rmbTax" th:field="*{rmbTax}" id="rmbTax_edit" class="form-control" type="number" placeholder="13%" disabled/>
+                <div class="input-group">
+                    <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control"  placeholder="13" disabled/>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
@@ -142,28 +145,6 @@
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
     $("#form-customerQuote-edit").validate({focusCleanup: true});
     //计算
-    $(function() {
-        /*业务员列表*/
-        $.ajax({
-            url: ctx + 'system/salesOrder/getBinessMembers',
-            type: 'get',
-            success: function (res) {
-                console.log(res)
-                if (res.rows.length > 0) {
-                    var usertData = res.rows;
-                    //alert(JSON.stringify(data));
-                    for (let i in usertData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-customerQuote-detail select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" +
-                            usertData[i].userName + "</option>");
-                    }
-                    $("#form-customerQuote-detail select[name='businessMembers']").val(sysCustomerQuote.businessMembers);
-                } else {
-                    $.modal.msgError(res.msg);
-                }
-            }
-        });
-    });
     $(function() {
         var options = {
             id: "bootstrap-table-Quote-child-detail",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index 79b379e2..54f3e6c0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -466,22 +466,22 @@
     //计算
     function getTotalAmount(){
         let getData = $("#bootstrap-table-Quote-child-edit1").bootstrapTable('getData', true);
-        var enterprise = "";
+        var enterprise = 0;
         let enterpriseSum = 0;
         let noRmb = 0;let rmb = 0;let noRmbSum = 0;
         let rmbSum = 0;let noUsd = 0;let usd = 0;
         let noUsdSum = 0;let usdSum = 0;
         for(var i=0;i<getData.length;i++){
-            enterprise += getData[i].materialName + ": 数量 :" + getData[i].materialNum +"; ";
-            enterpriseSum += Number(getData[i].materialNum);
-            noRmb += Number(getData[i].materialNoRmb);
-            rmb += Number(getData[i].materialRmb) ;
-            noRmbSum += Number(getData[i].materialNoRmbSum);
-            rmbSum += Number(getData[i].materialRmbSum);
-            noUsd += Number(getData[i].materialNoUsd) ;
-            usd += Number(getData[i].materialUsd) ;
-            noUsdSum += Number(getData[i].materialNoUsdSum);
-            usdSum += Number(getData[i].materialUsdSum);
+            enterprise += 1;
+            enterpriseSum = parseInt(enterprise + getData[i].materialNum).toFixed(0);
+            noRmb = parseFloat(noRmb + getData[i].materialNoRmb).toFixed(2);
+            rmb = parseFloat(rmb + getData[i].materialRmb).toFixed(2) ;
+            noRmbSum = parseFloat(noRmbSum + getData[i].materialNoRmbSum).toFixed(2);
+            rmbSum = parseFloat(rmbSum + getData[i].materialRmbSum).toFixed(2);
+            noUsd = parseFloat(noUsd + getData[i].materialNoUsd).toFixed(2) ;
+            usd = parseFloat(usd + getData[i].materialUsd).toFixed(2) ;
+            noUsdSum = parseFloat(noUsdSum + getData[i].materialNoUsdSum).toFixed(2);
+            usdSum = parseFloat(usdSum + getData[i].materialUsdSum).toFixed(2);
         }
         $("#enterprise_edit").val(enterprise);
         $("#enterpriseSum_edit").val(enterpriseSum);
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
index 2b926b94..c16e5b5f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
@@ -2,7 +2,9 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.w3.org/1999/xhtml">
 <head>
     <th:block th:include="include :: header('驳回调整')" />
+    <th:block th:include="include :: datetimepicker-css" />
     <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: bootstrap-editable-css" />
     <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
 </head>
 <body class="white-bg">
@@ -16,13 +18,13 @@
         <!--驳回调整允许更新内容-->
         <input type="hidden" name="saveEntity" value="true" />
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请人：</label>
+            <label class="col-sm-4 control-label">申请人：</label>
             <div class="col-sm-8">
                 <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请时间：</label>
+            <label class="col-sm-4 control-label">申请时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -31,7 +33,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">标题：</label>
+            <label class="col-sm-4 control-label">标题：</label>
             <div class="col-sm-8">
                 <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
             </div>
@@ -48,12 +50,11 @@
                 <input  name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
             <label class="col-sm-4 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select readonly class="form-control" name="businessMembers" required th:field="*{businessMembers}">
-                    <option value="">请选择</option>
-                </select>
+                <input  class="form-control" name="businessMembers" th:field="*{businessMembers}" readonly>
+
             </div>
         </div>
         <div class="form-group">
@@ -84,8 +85,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-6 control-label is-required">是否含税：</label>
-            <div class="col-sm-6">
+            <label class="col-sm-4 control-label is-required">是否含税：</label>
+            <div class="col-sm-8">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
                     <input required type="radio" th:id="${'confirmFax_' + dict.dictCode}"
                            name="confirmFax" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
@@ -96,7 +97,10 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">国内税率：</label>
             <div class="col-sm-8">
-                <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}"  class="form-control" type="number" placeholder="13%" />
+                <div class="input-group">
+                    <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control"  placeholder="13" type="number" />
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
@@ -170,6 +174,9 @@
     </div>
 </div>
 <th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@@ -184,39 +191,16 @@
     var sysCustomerQuote = [[${formData}]];
     var prefix = ctx + "system/customerQuote"
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
-    $("#form-customerQuote-modify").validate({
-        focusCleanup: true,
-    });
-    $(function() {
-        /*业务员列表*/
-        $.ajax({
-            url: ctx + 'system/salesOrder/getBinessMembers',
-            type: 'get',
-            success: function (res) {
-                console.log(res)
-                if (res.rows.length > 0) {
-                    var usertData = res.rows;
-                    for (let i in usertData) {
-                        $("#form-customerQuote-modify select[name='businessMembers']").append("<option value='"
-                            + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
-                    }
-                    $("#form-customerQuote-modify select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change")
-                } else {
-                    $.modal.msgError(res.msg);
-                }
-            }
-        });
-        var confirmFax = $("input[name='confirmFax']");
-        confirmFax.val([sysCustomerQuote.confirmFax]);
-        $("input[name='rmbTax']").val([sysCustomerQuote.taxRate]);
-        confirmFax.change(function () {
-            if ($("input[name='confirmFax']").val() == "1") {
-                $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
-            } else {
-                $("input[name='rmbTax']").val(0);
-            }
-        });
-        $("#commonCurrency_edit").val(sysCustomerQuote.commonCurrency).trigger('change');
+    var businessMembers = [[${formData.businessMembers}]];
+    var confirmFax = $("input[name='confirmFax']");
+    $("#form-customerQuote-modify").validate({ focusCleanup: true});
+    confirmFax.val([sysCustomerQuote.confirmFax]);
+    confirmFax.change(function () {
+        if ($("input[name='confirmFax']").val() == "1") {
+            $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
+        } else {
+            $("input[name='rmbTax']").val(0);
+        }
     });
     $(function() {
         var options = {
@@ -410,6 +394,25 @@
         };
         $.table.init(options);
     });
+    function getBuniessMembers(){
+        /*业务员列表*/
+        $.ajax({
+            url: ctx + 'system/salesOrder/getBinessMembers',
+            type: 'get',
+            success: function (res) {
+                console.log(res)
+                if (res.rows.length > 0) {
+                    var usertData = res.rows;
+                    for (let i in usertData) {
+                        $("#form-customerQuote-modify select[name='businessMembers']").append("<option value='"
+                            + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
+                    }
+                } else {
+                    $.modal.msgError(res.msg);
+                }
+            }
+        });
+    }
     function queryParams(params) {
         var curParams = {
             // 传递参数查询参数
@@ -422,11 +425,7 @@
     }
     function submitHandler() {
         if ($.validate.form()) {
-            var formData = $("#form-customerQuote-modify").serializeArray();
-            console.log("formData",formData);
             var tableData = $("#bootstrap-table-Quote-child2").bootstrapTable('getData');
-            console.log("tableData",JSON.stringify(tableData));
-            var rows = tableData.length;
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             if ($('textarea[name="comment"]').val()) {
@@ -495,43 +494,66 @@
         });
         getTotalAmount();
     }
-    $("input[name='pricingDate']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
     //计算
     function getTotalAmount(){
         let getData = $("#bootstrap-table-Quote-child2").bootstrapTable('getData', true);
-        var enterprise = "";
+        let enterprise = 0;
         let enterpriseSum = 0;
         let noRmb = 0;let rmb = 0;let noRmbSum = 0;
         let rmbSum = 0;let noUsd = 0;let usd = 0;
         let noUsdSum = 0;let usdSum = 0;
-        for(var i=0;i<getData.length;i++){
-            enterprise += getData[i].materialName + ": 数量 :" + getData[i].materialNum +"; ";
-            enterpriseSum += Number(getData[i].materialNum);
-            noRmb += Number(getData[i].materialNoRmb);
-            rmb += Number(getData[i].materialRmb) ;
-            noRmbSum += Number(getData[i].materialNoRmbSum);
-            rmbSum += Number(getData[i].materialRmbSum);
-            noUsd += Number(getData[i].materialNoUsd) ;
-            usd += Number(getData[i].materialUsd) ;
-            noUsdSum += Number(getData[i].materialNoUsdSum);
-            usdSum += Number(getData[i].materialUsdSum);
+        $("input[name='enterprise']").val(0);
+        $("input[name='enterpriseSum']").val(0);
+        $("input[name='noRmb']").val(0);
+        $("input[name='noRmbSum']").val(0);
+        $("input[name='rmb']").val(0);
+        $("input[name='rmbSum']").val(0);
+        $("input[name='noUsd']").val(0);
+        $("input[name='noUsdSum']").val(0);
+        $("input[name='usd']").val(0);
+        $("input[name='usdSum']").val(0);
+        // 计算企业数量和物料数量总和
+        enterprise = getData.length; // 直接获取数据长度
+        // 先累加数值，toFixed在累加后应用以避免精度损失
+        for (let i = 0; i < getData.length; i++) {
+            enterpriseSum += parseInt(getData[i].materialNum) || 0;
+            noRmb += parseFloat(getData[i].materialNoRmb) || 0;
+            rmb += parseFloat(getData[i].materialRmb) || 0;
+            noRmbSum += parseFloat(getData[i].materialNoRmbSum) || 0;
+            rmbSum += parseFloat(getData[i].materialRmbSum) || 0;
+            noUsd += parseFloat(getData[i].materialNoUsd) || 0;
+            usd += parseFloat(getData[i].materialUsd) || 0;
+            noUsdSum += parseFloat(getData[i].materialNoUsdSum) || 0;
+            usdSum += parseFloat(getData[i].materialUsdSum) || 0;
         }
-        $("#enterprise_edit").val(enterprise);
-        $("#enterpriseSum_edit").val(enterpriseSum);
-        $("#noRmb_edit").val(noRmb);
-        $("#rmb_edit").val(rmb);
-        $("#noRmbSum_edit").val(noRmbSum);
-        $("#rmbSum_edit").val(rmbSum);
-        $("#noUsd_edit").val(noUsd);
-        $("#usd_edit").val(usd);
-        $("#noUsdSum_edit").val(noUsdSum);
-        $("#usdSum_edit").val(usdSum);
-    }
 
+        // 将累加的结果格式化为两位小数
+        noRmb = noRmb.toFixed(2);
+        rmb = rmb.toFixed(2);
+        noRmbSum = noRmbSum.toFixed(2);
+        rmbSum = rmbSum.toFixed(2);
+        noUsd = noUsd.toFixed(2);
+        usd = usd.toFixed(2);
+        noUsdSum = noUsdSum.toFixed(2);
+        usdSum = usdSum.toFixed(2);
+
+        // 设置表单输入值
+        $("input[name='enterprise']").val(enterprise);
+        $("input[name='enterpriseSum']").val(enterpriseSum);
+        $("input[name='noRmb']").val(noRmb);
+        $("input[name='noRmbSum']").val(noRmbSum);
+        $("input[name='rmb']").val(rmb);
+        $("input[name='rmbSum']").val(rmbSum);
+        $("input[name='noUsd']").val(noUsd);
+        $("input[name='noUsdSum']").val(noUsdSum);
+        $("input[name='usd']").val(usd);
+        $("input[name='usdSum']").val(usdSum);
+    }
+    $("input[name='pricingDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
index e1d261e9..b2b8310a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
@@ -14,13 +14,13 @@
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请人：</label>
+            <label class="col-sm-4 control-label">申请人：</label>
             <div class="col-sm-8">
                 <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请时间：</label>
+            <label class="col-sm-4 control-label">申请时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -29,7 +29,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">标题：</label>
+            <label class="col-sm-4 control-label">标题：</label>
             <div class="col-sm-8">
                 <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
             </div>
@@ -46,12 +46,10 @@
                 <input  name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
             <label class="col-sm-4 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select class="form-control" name="businessMembers" disabled required th:field="*{businessMembers}">
-                    <option value="">请选择</option>
-                </select>
+                <input class="form-control" name="businessMembers" disabled required th:field="*{businessMembers}">
             </div>
         </div>
         <div class="form-group">
@@ -69,7 +67,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">报价币种：</label>
             <div class="col-sm-8">
-                <select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" required>
+                <select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" disabled required>
                     <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" ></option>
                 </select>
@@ -78,7 +76,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率">
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly/>
             </div>
         </div>
         <div class="form-group">
@@ -94,7 +92,10 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">国内税率：</label>
             <div class="col-sm-8">
-                <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}"  class="form-control" type="number" placeholder="13%" />
+                <div class="input-group">
+                    <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control"  placeholder="13" type="number" readonly/>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
@@ -116,7 +117,7 @@
         <div class="container">
             <h4 class="form-header h4">计算</h4>
             <div class="col-xs-12 form-row">
-                <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="text" readonly/>
+                <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="number" readonly/>
                 <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
             </div>
             <div class="col-xs-12 form-row">
@@ -174,6 +175,7 @@
 </div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js" />
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@@ -188,39 +190,6 @@
     var sysCustomerQuote = [[${formData}]];
     var prefix = ctx + "system/customerQuote"
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
-    $("#form-customerQuote-ywjl").validate({
-        focusCleanup: true,
-    });
-    $(function() {
-        /*业务员列表*/
-        $.ajax({
-            url: ctx + 'system/salesOrder/getBinessMembers',
-            type: 'get',
-            success: function (res) {
-                console.log(res)
-                if (res.rows.length > 0) {
-                    var usertData = res.rows;
-                    for (let i in usertData) {
-                        $("#form-customerQuote-ywjl select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
-                    }
-                    $("#form-customerQuote-ywjl select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change")
-                } else {
-                    $.modal.msgError(res.msg);
-                }
-            }
-        });
-        var confirmFax = $("input[name='confirmFax']");
-        confirmFax.val([sysCustomerQuote.confirmFax]);
-        $("input[name='rmbTax']").val([sysCustomerQuote.taxRate]);
-        confirmFax.change(function () {
-            if ($("input[name='confirmFax']").val() == "1") {
-                $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
-            } else {
-                $("input[name='rmbTax']").val(0);
-            }
-        });
-        $("#commonCurrency_edit").val(sysCustomerQuote.commonCurrency).trigger('change');
-    });
     $(function() {
         var options = {
             id: "bootstrap-table-Quote-child4",
@@ -479,6 +448,24 @@
         })
         getTotalAmount();
     }
+    function getBuniessMembers() {
+        $.ajax({
+            url: ctx + 'system/salesOrder/getBinessMembers',
+            type: 'get',
+            success: function (res) {
+                console.log(res)
+                if (res.rows.length > 0) {
+                    var usertData = res.rows;
+                    for (let i in usertData) {
+                        $("#form-customerQuote-ywjl select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                    }
+                    $("#form-customerQuote-ywjl select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change")
+                } else {
+                    $.modal.msgError(res.msg);
+                }
+            }
+        });
+    }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
         minView: "month",
@@ -486,23 +473,24 @@
     });
     //计算
     function getTotalAmount(){
-        let getData = $("#bootstrap-table-Quote-child4").bootstrapTable('getData', true);
-        var enterprise = "";
+        let getData = $("#bootstrap-table-Quote-child4").bootstrapTable('getData');
+        var enterprise = 0;
         let enterpriseSum = 0;
         let noRmb = 0;let rmb = 0;let noRmbSum = 0;
         let rmbSum = 0;let noUsd = 0;let usd = 0;
         let noUsdSum = 0;let usdSum = 0;
         for(var i=0;i<getData.length;i++){
-            enterprise += getData[i].materialName + ": 数量 :" + getData[i].materialNum +"; ";
-            enterpriseSum += Number(getData[i].materialNum);
-            noRmb += Number(getData[i].materialNoRmb);
-            rmb += Number(getData[i].materialRmb) ;
-            noRmbSum += Number(getData[i].materialNoRmbSum);
-            rmbSum += Number(getData[i].materialRmbSum);
-            noUsd += Number(getData[i].materialNoUsd) ;
-            usd += Number(getData[i].materialUsd) ;
-            noUsdSum += Number(getData[i].materialNoUsdSum);
-            usdSum += Number(getData[i].materialUsdSum);
+            enterprise += 1;
+            enterpriseSum = parseInt(enterprise + getData[i].materialNum).toFixed(0);
+            noRmb = parseFloat(noRmb + getData[i].materialNoRmb).toFixed(2);
+            rmb = parseFloat(rmb + getData[i].materialRmb).toFixed(2) ;
+            noRmbSum = parseFloat(noRmbSum + getData[i].materialNoRmbSum).toFixed(2);
+            rmbSum = parseFloat(rmbSum + getData[i].materialRmbSum).toFixed(2);
+            noUsd = parseFloat(noUsd + getData[i].materialNoUsd).toFixed(2) ;
+            usd = parseFloat(usd + getData[i].materialUsd).toFixed(2) ;
+            noUsdSum = parseFloat(noUsdSum + getData[i].materialNoUsdSum).toFixed(2);
+            usdSum = parseFloat(usdSum + getData[i].materialUsdSum).toFixed(2);
+
         }
         $("#enterprise_edit").val(enterprise);
         $("#enterpriseSum_edit").val(enterpriseSum);
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
index 3b798fe9..061674a6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
@@ -46,12 +46,11 @@
                 <input  name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
             <label class="col-sm-4 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select class="form-control" name="businessMembers" disabled required th:field="*{businessMembers}">
-                    <option value="">请选择</option>
-                </select>
+                <input class="form-control" name="businessMembers"  th:field="*{businessMembers}" disabled required />
+
             </div>
         </div>
         <div class="form-group">
@@ -174,6 +173,7 @@
 </div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js" />
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@@ -490,28 +490,43 @@
         let noRmb = 0;let rmb = 0;let noRmbSum = 0;
         let rmbSum = 0;let noUsd = 0;let usd = 0;
         let noUsdSum = 0;let usdSum = 0;
-        for(var i=0;i<getData.length;i++){
-            enterprise += getData[i].materialName + ": 数量 :" + getData[i].materialNum +"; ";
-            enterpriseSum += Number(getData[i].materialNum);
-            noRmb += Number(getData[i].materialNoRmb);
-            rmb += Number(getData[i].materialRmb) ;
-            noRmbSum += Number(getData[i].materialNoRmbSum);
-            rmbSum += Number(getData[i].materialRmbSum);
-            noUsd += Number(getData[i].materialNoUsd) ;
-            usd += Number(getData[i].materialUsd) ;
-            noUsdSum += Number(getData[i].materialNoUsdSum);
-            usdSum += Number(getData[i].materialUsdSum);
+        // 计算企业数量和物料数量总和
+        enterprise = getData.length; // 直接获取数据长度
+        enterpriseSum = getData.reduce((sum, item) => sum + (parseInt(item.materialNum) || 0), 0);
+
+        // 先累加数值，toFixed在累加后应用以避免精度损失
+        for (let i = 0; i < getData.length; i++) {
+            noRmb += parseFloat(getData[i].materialNoRmb) || 0;
+            rmb += parseFloat(getData[i].materialRmb) || 0;
+            noRmbSum += parseFloat(getData[i].materialNoRmbSum) || 0;
+            rmbSum += parseFloat(getData[i].materialRmbSum) || 0;
+            noUsd += parseFloat(getData[i].materialNoUsd) || 0;
+            usd += parseFloat(getData[i].materialUsd) || 0;
+            noUsdSum += parseFloat(getData[i].materialNoUsdSum) || 0;
+            usdSum += parseFloat(getData[i].materialUsdSum) || 0;
         }
-        $("#enterprise_edit").val(enterprise);
-        $("#enterpriseSum_edit").val(enterpriseSum);
-        $("#noRmb_edit").val(noRmb);
-        $("#rmb_edit").val(rmb);
-        $("#noRmbSum_edit").val(noRmbSum);
-        $("#rmbSum_edit").val(rmbSum);
-        $("#noUsd_edit").val(noUsd);
-        $("#usd_edit").val(usd);
-        $("#noUsdSum_edit").val(noUsdSum);
-        $("#usdSum_edit").val(usdSum);
+
+        // 将累加的结果格式化为两位小数
+        noRmb = noRmb.toFixed(2);
+        rmb = rmb.toFixed(2);
+        noRmbSum = noRmbSum.toFixed(2);
+        rmbSum = rmbSum.toFixed(2);
+        noUsd = noUsd.toFixed(2);
+        usd = usd.toFixed(2);
+        noUsdSum = noUsdSum.toFixed(2);
+        usdSum = usdSum.toFixed(2);
+
+        // 设置表单输入值
+        $("input[name='enterprise']").val(enterprise);
+        $("input[name='enterpriseSum']").val(enterpriseSum);
+        $("input[name='noRmb']").val(noRmb);
+        $("input[name='noRmbSum']").val(noRmbSum);
+        $("input[name='rmb']").val(rmb);
+        $("input[name='rmbSum']").val(rmbSum);
+        $("input[name='noUsd']").val(noUsd);
+        $("input[name='noUsdSum']").val(noUsdSum);
+        $("input[name='usd']").val(usd);
+        $("input[name='usdSum']").val(usdSum);
     }
     function submitHandler() {
         if ($.validate.form()) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
index 56abf0c9..75ec7cf9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
@@ -175,6 +175,7 @@
 </div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js" />
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@@ -188,35 +189,6 @@
     var prefix = ctx + "system/customerQuote"
     var commonCurrency = $("#commonCurrency_edit option:selected").val();
     $("#form-customerQuote-zozj").validate({focusCleanup: true});
-    $(function() {
-        /*业务员列表*/
-        $.ajax({
-            url: ctx + 'system/salesOrder/getBinessMembers',
-            type: 'get',
-            success: function (res) {
-                console.log(res)
-                if (res.rows.length > 0) {
-                    var usertData = res.rows;
-                    for (let i in usertData) {
-                        $("#form-customerQuote-zozj select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
-                    }
-                    $("#form-customerQuote-zozj select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change")
-                } else {
-                    $.modal.msgError(res.msg);
-                }
-            }
-        });
-        var confirmFax = $("input[name='confirmFax']");
-        confirmFax.val([sysCustomerQuote.confirmFax]).attr("checked", "check");
-        $("input[name='rmbTax']").val([sysCustomerQuote.taxRate]);
-        confirmFax.change(function () {
-            if ($("input[name='confirmFax']").val() == "1") {
-                $("input[name='rmbTax']").val(sysCustomerQuote.taxRate);
-            } else {
-                $("input[name='rmbTax']").val(0);
-            }
-        });
-    });
     $(function() {
         var options = {
             id: "bootstrap-table-Quote-child5",
@@ -423,28 +395,43 @@
         let noRmb = 0;let rmb = 0;let noRmbSum = 0;
         let rmbSum = 0;let noUsd = 0;let usd = 0;
         let noUsdSum = 0;let usdSum = 0;
-        for(var i=0;i<getData.length;i++){
-            enterprise += getData[i].materialName + ": 数量 :" + getData[i].materialNum +"; ";
-            enterpriseSum += Number(getData[i].materialNum);
-            noRmb += Number(getData[i].materialNoRmb);
-            rmb += Number(getData[i].materialRmb) ;
-            noRmbSum += Number(getData[i].materialNoRmbSum);
-            rmbSum += Number(getData[i].materialRmbSum);
-            noUsd += Number(getData[i].materialNoUsd) ;
-            usd += Number(getData[i].materialUsd) ;
-            noUsdSum += Number(getData[i].materialNoUsdSum);
-            usdSum += Number(getData[i].materialUsdSum);
+        // 计算企业数量和物料数量总和
+        enterprise = getData.length; // 直接获取数据长度
+        enterpriseSum = getData.reduce((sum, item) => sum + (parseInt(item.materialNum) || 0), 0);
+
+        // 先累加数值，toFixed在累加后应用以避免精度损失
+        for (let i = 0; i < getData.length; i++) {
+            noRmb += parseFloat(getData[i].materialNoRmb) || 0;
+            rmb += parseFloat(getData[i].materialRmb) || 0;
+            noRmbSum += parseFloat(getData[i].materialNoRmbSum) || 0;
+            rmbSum += parseFloat(getData[i].materialRmbSum) || 0;
+            noUsd += parseFloat(getData[i].materialNoUsd) || 0;
+            usd += parseFloat(getData[i].materialUsd) || 0;
+            noUsdSum += parseFloat(getData[i].materialNoUsdSum) || 0;
+            usdSum += parseFloat(getData[i].materialUsdSum) || 0;
         }
-        $("#enterprise_edit").val(enterprise);
-        $("#enterpriseSum_edit").val(enterpriseSum);
-        $("#noRmb_edit").val(noRmb);
-        $("#rmb_edit").val(rmb);
-        $("#noRmbSum_edit").val(noRmbSum);
-        $("#rmbSum_edit").val(rmbSum);
-        $("#noUsd_edit").val(noUsd);
-        $("#usd_edit").val(usd);
-        $("#noUsdSum_edit").val(noUsdSum);
-        $("#usdSum_edit").val(usdSum);
+
+        // 将累加的结果格式化为两位小数
+        noRmb = noRmb.toFixed(2);
+        rmb = rmb.toFixed(2);
+        noRmbSum = noRmbSum.toFixed(2);
+        rmbSum = rmbSum.toFixed(2);
+        noUsd = noUsd.toFixed(2);
+        usd = usd.toFixed(2);
+        noUsdSum = noUsdSum.toFixed(2);
+        usdSum = usdSum.toFixed(2);
+
+        // 设置表单输入值
+        $("input[name='enterprise']").val(enterprise);
+        $("input[name='enterpriseSum']").val(enterpriseSum);
+        $("input[name='noRmb']").val(noRmb);
+        $("input[name='noRmbSum']").val(noRmbSum);
+        $("input[name='rmb']").val(rmb);
+        $("input[name='rmbSum']").val(rmbSum);
+        $("input[name='noUsd']").val(noUsd);
+        $("input[name='noUsdSum']").val(noUsdSum);
+        $("input[name='usd']").val(usd);
+        $("input[name='usdSum']").val(usdSum);
     }
 
     function submitHandler() {

From af14da5c7b59e2fe8517abdb0aea85b97549254a Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 10 Jul 2024 20:32:56 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Abom=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E6=94=B9=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8F=AF=E5=85=A8=E9=83=A8=E6=9D=83=E9=99=90=E3=80=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/bom/add.html |  1 +
 .../main/resources/templates/erp/bom/bom.html |  2 +-
 .../resources/templates/erp/bom/detail.html   | 22 ++++++++++++-------
 .../resources/templates/erp/bom/edit.html     |  2 +-
 .../templates/erp/bom/taskGcjlVerify.html     |  1 -
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
index d4e04253..fa8a082f 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
@@ -168,6 +168,7 @@
                                 "<option value='" + usertData[i].loginName + "'>" + usertData[i].loginName + "</option>");
                         }
                         $("#selectEngineer").val(loginName);
+                        $("input[name='engineer']").val(loginName);
                     } else {
                         $.modal.msgError(res.msg);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
index 4f1b3307..af806cde 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
@@ -220,7 +220,7 @@
                             // 有待办人展示审批按钮，
                             if (row.todoUserId) {
                                 var todoUserIdList = row.todoUserId.split(",");
-                                if(todoUserIdList.includes(loginName) || todoUserIdList.includes("admin")){
+                                if(todoUserIdList.includes(loginName)){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
                                     actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
index abd9b705..17cf99c2 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
@@ -231,19 +231,19 @@
                         editable : {
                             editor: {
                                 defaultValue: '%',
-                                title: '损耗率(%)',
-                                mode: 'inline',
+                                title : '损耗率(%)',
+                                mode:'inline',
                                 type: 'text',
                                 // 编辑时同样附带百分比符号
-                                formatter: function (value) {
+                                formatter: function(value) {
                                     return value + '%';
                                 },
                                 // 编辑后去除百分比符号
-                                custom_getter: function (value) {
+                                custom_getter: function(value) {
                                     return value.replace('%', '');
                                 }
                             },
-                            validate : function (value) {
+                            validate : function(value) {
                                 if (!value) {
                                     return '损耗率不能为空';
                                 }
@@ -256,13 +256,19 @@
                                 if (num < 0 || num > 100) {
                                     return '损耗率必须大于等于0小于等于100';
                                 }
-                            }
+                            },
                         },
                         formatter: function (value,row,index){
-                            if(value == null){
+                            if (value == null || value == ''){
                                 return "%";
                             }
-                            return value + "%";
+                            const regex = /(\d+(?:\.\d+)?)%/g; // 创建正则表达式，g标志表示全局匹配
+                            const match = value.match(regex); // 使用match方法查找所有匹配
+                            if (match) {
+                                return value;
+                            }else{
+                                return value + "%";
+                            }
                         },
                     },
                     {
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
index 8b761f04..9c3b5c09 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
@@ -290,7 +290,7 @@
                     {
                         field: 'processMethod',
                         align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(processMethodDatas, value);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
index 826598d4..e8410fb7 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
@@ -263,7 +263,6 @@
             $.operate.save(prefix + "/complete/" + taskId, $('#form-edit').serialize());
         }
     }
-
 </script>
 </body>
 </html>
\ No newline at end of file

From 93732d2ed1f7778b87fad1260f66eae3f90c4d7d Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 10 Jul 2024 20:34:38 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=B8=BA=E9=80=9A=E8=BF=87=E5=90=8E=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/ErpMaterialController.java     | 15 ++++++++++++++-
 .../resources/templates/erp/material/select.html  |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
index 29381023..f04db8c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
@@ -95,7 +95,20 @@ public class ErpMaterialController extends BaseController
         List<ErpMaterialVo> list = erpMaterialService.selectErpMaterialList(erpMaterialVo);
         return getDataTable(list);
     }
-
+    /**
+     * 物料信息审核，通过物料查询*/
+    @RequiresPermissions("erp:material:list")
+    @PostMapping("/selectList")
+    @ResponseBody
+    public TableDataInfo selectList(ErpMaterialVo erpMaterialVo)
+    {
+        erpMaterialVo.setUseStatus("1");
+        erpMaterialVo.setAuditStatus("1");
+        // 工程文员角色只能看到自己创建的数据
+        startPage();
+        List<ErpMaterialVo> list = erpMaterialService.selectErpMaterialList(erpMaterialVo);
+        return getDataTable(list);
+    }
     /**
      * 导出物料信息列表
      */
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/select.html b/ruoyi-admin/src/main/resources/templates/erp/material/select.html
index 88592cbd..f40e758b 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/select.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/select.html
@@ -52,7 +52,7 @@
                 id: 'bootstrap-select-table',
                 clickToSelect: true, // 点击选中行
                 singleSelect: true, // 单选
-                url: prefix + "/list",
+                url: prefix + "/selectList",
                 modalName: "物料信息",
                 columns: [
                     {checkbox: true},

From 3f1404257560f66f883351ae0bb4059988fdc476 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 10 Jul 2024 20:35:33 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=87=87=E8=B4=AD=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purchaseOrder/detail.html        | 506 ++++++++++++++++++
 .../purchaseOrder/taskCgjlVerify.html         | 181 +++++++
 .../purchaseOrder/taskCgzgVerify.html         | 181 +++++++
 .../purchaseOrder/taskFzjlVerify.html         | 181 +++++++
 .../purchaseOrder/taskModifyApply.html        | 175 ++++++
 5 files changed, 1224 insertions(+)
 create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgzgVerify.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskModifyApply.html

diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
new file mode 100644
index 00000000..87b289e3
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
@@ -0,0 +1,506 @@
+<!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" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
+    <th:block th:include="include :: bootstrap-editable-css"/>
+    <style>
+        .other-container {
+            width: 90%;
+            height: 200px;
+            margin: auto;
+        }
+        .other {
+            margin-top: 20px;
+        }
+        h4 {
+            display: inline-block;
+            margin-right: 20px;
+        }
+        .modal-body{
+            height: 550px;
+        }
+        iframe{
+            width: 100%;
+            height: 500px;
+            frameborder: 0;
+            border: 0;
+            display: inline-block;
+        }
+    </style>
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-purchaseOrder-detail" th:object="${purchaseOrder}">
+            <input name="purchaseOrderId" th:field="*{purchaseOrderId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">采购单号：</label>
+                <div class="col-sm-8">
+                    <input name="purchaseOrderCode" th:field="*{purchaseOrderCode}" 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="purchaseCategory" th:field="*{purchaseCategory}" class="form-control" type="text">-->
+                    <select name="purchaseCategory" th:field="*{purchaseCategory}" class="form-control m-b" th:with="type=${@dict.getType('purchase_category')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="container">
+                <!--物料相关-->
+                <div class="row">
+                    <div class="col-sm-12" id="tablesContainer">
+                        <!-- 表格将在这里动态生成 -->
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="other-container">
+        <div class="other">
+            <br><hr>
+            <h4>选择采购信息</h4>
+            <a class="btn btn-primary" onclick="showQuotationModal()"><i class="fa fa-plus"></i>&nbsp;选择材料</a>
+            <a class="btn btn-danger" onclick="removeMaterial()" ><i class="fa fa-remove"></i>&nbsp;删除材料</a>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="addQuotationTable" style="white-space:nowrap"></table>
+            </div>
+        </div>
+        <div class="modal inmodal" id="supplierQuotationModal"
+             role="dilog" aria-hidden="true">
+
+            <!--        查询供应商报价-->
+            <div class="modal-dialog" style="width: 1000px;background-color: #FFFFFF">
+
+                <div class="modal-content" style="background-color: #FFFFFF">
+
+                    <div class="modal-body">
+                        <div class="container-div">
+                            <div class="row">
+                                <div class="col-sm-12 search-collapse">
+                                    <form id="quotationFormId">
+                                        <div class="select-list">
+                                            <ul>
+                                                <li>
+                                                    <label>报价编码：</label>
+                                                    <input type="text" name="quotationCode"/>
+                                                </li>
+                                                <li>
+                                                    <label>原辅料代码：</label>
+                                                    <input type="text" name="rawSubsidiaryCode"/>
+
+                                                </li>
+                                                <li>
+                                                    <label>原辅料名称：</label>
+                                                    <input type="text" name="rawSubsidiaryName"/>
+                                                </li>
+<!--                                                <li>-->
+<!--                                                    <label>供应商名称：</label>-->
+<!--                                                    <input type="text" name="supplierName"/>-->
+
+<!--                                                </li>-->
+                                                <li>
+                                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('quotationFormId','quotationTable')"><i
+                                                            class="fa fa-search"></i>&nbsp;搜索</a>
+                                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('quotationFormId','quotationTable')"><i
+                                                            class="fa fa-refresh"></i>&nbsp;重置</a>
+                                                </li>
+                                            </ul>
+                                        </div>
+                                    </form>
+                                </div>
+                                <div class="col-sm-12 select-table table-striped">
+                                    <table id="quotationTable" style="white-space:nowrap"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <a class="btn btn-warning btn-rounded" onclick="addQuotationToTable()">确认添加</a>
+                        <a class="btn btn-primary btn-rounded" onclick="closeQuotationModal()">关闭</a>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js"/>
+    <th:block th:include="include :: bootstrap-table-editable-js"/>
+    <script th:inline="javascript">
+
+        var getData = [[${purchaseOrder}]];
+
+
+        var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
+        var purchasingUnitDatas = [[${@dict.getType('sys_unit_class')}]];
+        var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
+        var confirmTaxDatas = [[${@dict.getType('sys_whether')}]];
+        var currentQuoteDatas = [[${@dict.getType('sys_whether')}]];
+        var confirmNoDatas = [[${@dict.getType('sys_whether')}]];
+        var auditNoDatas = [[${@dict.getType('sys_whether')}]];
+        var approveNoDatas = [[${@dict.getType('sys_whether')}]];
+
+        var prefix = ctx + "purchase/purchaseOrder";
+        var prefixSupplierQuotation = ctx + 'system/supplierquotation'
+        var prefixPurchaseMaterial = ctx + 'purchase/purchaseMaterial'
+
+        $("#form-purchaseOrder-detail").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            // if ($.validate.form()) {
+            //     $.operate.save(prefix + "/edit", $('#form-purchaseOrder-detail').serialize());
+            // }
+            let getData=$('#addQuotationTable').bootstrapTable('getData', true)
+            if(getData.length > 0){
+                if ($.validate.form()) {
+                    $.modal.confirm("确认以上修改吗？", function (){
+                        //确认添加选中的物料数据
+                        confirmQuotation();
+                        $.operate.save(prefix + "/edit", $('#form-purchaseOrder-detail').serialize());
+                    })
+                }
+            } else {
+                $.modal.alertWarning("未选择产品，请选择！")
+            }
+        }
+
+        $("input[name='billingDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true,
+            todayBtn: true
+        });
+
+        $(function() {
+            //初始化添加材料表
+            $('#addQuotationTable').bootstrapTable({
+                url: prefixPurchaseMaterial + '/list',
+                pagination: true,
+                pageNumber: 1,
+                pageSize: 10,
+                method: "post",
+                contentType: "application/x-www-form-urlencoded",
+                striped: true, // 是否显示行间隔色
+                cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+                showToggle: false, // 是否显示详细视图和列表视图的切换按钮
+                cardView: false, // 是否显示详细视图
+                detailView: false, // 是否显示父子表
+                smartDisplay: false, // 加了这个才显示每页显示的行数
+                showExport: false, // 是否显示导出按钮
+                clickToSelect: true,
+                paginationDetailHAlign: ' hiddenDetailInfo',
+                height: 250,
+                uniqueId: 'purchaseOrderChildId',
+                queryParams: function (params) {
+                    //console.log("123");
+                    var curParams = {
+                        // 传递参数查询参数
+                        pageSize: params.limit,
+                        pageNum: params.offset / params.limit + 1,
+                        purchaseOrderCode: getData.purchaseOrderCode,
+                        supplierCode: getData.supplierCode,
+                        supplierName: getData.supplierName
+                    };
+                    // console.log(data[0].enterpriseCode)
+                    return curParams
+                },
+                columns: [{
+                        checkbox: true
+                    },
+                        {
+                            title: '采购订单子表id',
+                            field: 'purchaseOrderChildId',
+                            visible: false
+                        },
+                        {
+                            title: '关联采购订单号',
+                            field: 'purchaseOrderCode',
+                        },
+                        {
+                            title: '供应商代码',
+                            field: 'supplierCode',
+                        },
+                        {
+                            title: '供应商名称',
+                            field: 'supplierName',
+                        },
+                        {
+                            title: '物料料号',
+                            field: 'materialCode',
+                        },
+                        {
+                            title: '物料名称',
+                            field: 'materialName',
+                        },
+                        {
+                            title: '物料不含税单价',
+                            field: 'materialNormb',
+                        },
+                        {
+                            title: '物料含税单价',
+                            field: 'materialRmb',
+                        },
+                        {
+                            title: '采购物料数量',
+                            field: 'materialNum',
+                        },
+                        {
+                            title: '物料合计',
+                            field: 'materialAmount',
+                        },
+                        {
+                            title: '数量合计',
+                            field: 'materialSum',
+                        },
+                        {
+                            title: '不含税总价(RMB)',
+                            field: 'materialNormbsum',
+                        },
+                        {
+                            title: '含税总价(RMB)',
+                            field: 'materialRmbsum',
+                        },
+                        {
+                            title: '交货时间',
+                            field: 'deliveryTime',
+                        },
+                        {
+                            title: '收货状态',
+                            field: 'eceiptStatus',
+                        },
+                        {
+                            title: '打款结案状态',
+                            field: 'paymentStatus',
+                        },
+                        {
+                            title: '税率',
+                            field: 'taxRate',
+                        },
+                    ]
+            })
+
+        });
+
+        /*供应商列表*/
+        $.ajax({
+            url: ctx + 'system/supplier/list',
+            type: 'post',
+            success: function (res) {
+                console.log(res)
+                if (res.rows.length > 0) {
+                    var suppliertData = res.rows;
+                    //alert(JSON.stringify(data));
+                    for (let i in suppliertData) {
+                        // console.log(finishProductData[i].finishProductCode)
+                        $("#form-purchaseOrder-detail select[name='supplierCode']").append("<option value='" + suppliertData[i].supplierCode + "'>" + suppliertData[i].supplierCode + "</option>");
+                    }
+                    $("#form-purchaseOrder-detail select[name='supplierCode']").val(getData.supplierCode).trigger("change")
+                    $("#form-purchaseOrder-detail select[name='supplierCode']").change(function () {
+                        var code = $(this).val();
+                        for (let i=0;i<suppliertData.length;i++) {
+                            if (suppliertData[i].supplierCode == code) {
+                                $("#form-purchaseOrder-detail input[name='supplierName']").val(suppliertData[i].supplierName);
+                                $("#form-purchaseOrder-detail input[name='customerContact']").val(suppliertData[i].customerContact);
+                                $("#form-purchaseOrder-detail input[name='contactNumber']").val(suppliertData[i].contactNumber);
+                                $("#form-purchaseOrder-detail input[name='customerFax']").val(suppliertData[i].customerFax);
+                                $("#form-purchaseOrder-detail input[name='paymentTerms']").val(suppliertData[i].paymentTerms);
+                                $("#form-purchaseOrder-detail input[name='taxRate']").val(suppliertData[i].taxRate);
+                            }
+                        }
+                    })
+
+                } else {
+                    $.modal.msgError(res.msg);
+                }
+            }
+        })
+        /*用户列表*/
+        $.ajax({
+            url: ctx + 'system/user/list',
+            type: 'post',
+            success: function (res) {
+                console.log(res)
+                if (res.rows.length > 0) {
+                    var usertData = res.rows;
+                    //alert(JSON.stringify(data));
+                    for (let i in usertData) {
+                        // console.log(finishProductData[i].finishProductCode)
+                        $("#form-purchaseOrder-detail select[name='purchaseCommander']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                    }
+                    $("#form-purchaseOrder-detail select[name='purchaseCommander']").val(getData.purchaseCommander).trigger("change")
+                } else {
+                    $.modal.msgError(res.msg);
+                }
+            }
+        })
+
+        /*添加报价信息*/
+        //点击按钮显示报价信息模态框
+        function showQuotationModal() {
+            if ($.validate.form()) {
+                $("#supplierQuotationModal").modal("show");
+                //显示报价信息
+                showQuotationData();
+            } else {
+                $.modal.alertWarning("请填写必填项");
+            }
+        }
+
+        //关闭报价信息模态框
+        function closeQuotationModal() {
+            $("#supplierQuotationModal").modal("hide");
+        }
+
+        //显示报价信息
+        function showQuotationData() {
+            var supplierCode = $("#form-purchaseOrder-detail select[name='supplierCode']").val()
+            $("#quotationTable").bootstrapTable("destroy")
+            var options = {
+                id: 'quotationTable',
+                url: prefixSupplierQuotation + "/list",
+                modalName: "供应商报价",
+                pagination: true,
+                pageNumber: 1,
+                pageSize: 10,
+                showRefresh: false,
+                showToggle: false,
+                clickToSelect: true,
+                queryParams: function (params) {
+                    var curParams = {
+                        // 传递参数查询参数
+                        pageSize: params.limit,
+                        pageNum: params.offset / params.limit + 1,
+                        supplierCode: supplierCode
+                    };
+                    let json = $.extend(curParams, $.common.formToJSON("quotationFormId"));
+                    return json;
+                },
+                columns: [
+                    {title: '采购单子表编号',field: 'purchaseOrderChildId',visible: false},
+                    {title: '关联采购订单号',field: 'purchaseOrderCode',visible: false},
+                    {title: '供应商ID',field: 'supplierCode',},
+                    {title: '供应商名称',field: 'supplierName',},
+                    {title: '物料合计',field: 'materialAmount',},
+                    {title: '数量合计',field: 'materialSum',},
+                    {title: '不含税总价(RMB)',field: 'materialNoRmbSum',},
+                    {title: '含税总价(RMB)',field: 'materialRmbSum',},
+                    {title:'收货状态',field: 'eceiptStatus',formatter: function (value, row, index) {
+                            $.table.selectDictLabel(eceiptStatusDatas, value);}
+                    },
+                    {title:'打款状态',field: 'paymentStatus',formatter: function (value, row, index) {
+                            $.table.selectDictLabel(paymentStatusDatas, value);}
+                    },
+                    {title: '交货时间',field: 'deliveryTime',visible: false},
+                ]
+
+            };
+            $.table.init(options);
+        }
+
+        //表中添加选中的物料信息
+        function addQuotationToTable() {
+            var data = $("#quotationTable").bootstrapTable("getSelections");
+            var count = $('#addQuotationTable').bootstrapTable('getData').length;
+            var purchaseOrderNumber = $("input[name='purchaseOrderNumber']").val();
+            var supplierCode = $("select[name='supplierCode']").val();
+            var supplierName = $("input[name='supplierName']").val();
+            // console.log(data);
+            // console.log(count);
+            for (var i = 0; i < data.length; i++) {
+                let rawSubsidiary = $('#addQuotationTable').bootstrapTable('getRowByUniqueId', data[i].rawSubsidiaryCode);
+                if (rawSubsidiary != null) {
+                    alert(rawSubsidiary.rawSubsidiaryName + "已存在，不可重复添加!");
+                    continue;
+                }
+                $("#addQuotationTable").bootstrapTable('insertRow', {
+                    index: count + i,
+                    row: {
+                        purchaseOrderNumber: purchaseOrderNumber,
+                        supplierCode: supplierCode,
+                        supplierName: supplierName,
+                        materialQuantity: '',
+                        amountMoney: '',
+                        deliveryTime: '',
+                        purchaseExplain: '',
+                        accountReconciliationFlag: 0
+                    }
+                });
+            }
+
+            $("#quotationTable").bootstrapTable("uncheckAll");
+            closeQuotationModal();
+        }
+
+        //确认添加选中的物料数据
+        function confirmQuotation() {
+            $("#addQuotationTable").bootstrapTable('refresh');
+            let data = $('#addQuotationTable').bootstrapTable('getData', true);
+            // console.log(data)
+            if (data.length > 0) {
+                for (var i = 0; i < data.length; i++) {
+                    data[i].purchaseOrderNumber = $("input[name='purchaseOrderNumber']").val();
+                    data[i].supplierCode = $("select[name='supplierCode']").val();
+                    data[i].supplierName = $("input[name='supplierName']").val();
+                }
+                $.ajax({
+                    url: prefixPurchaseMaterial + '/addEditSave',
+                    type: "POST",
+                    data: {
+                        data: JSON.stringify(data)
+                    },
+                    dataType: "json",
+                    success: function (resp) {
+                        // console.log(data)
+                        console.log(resp)
+                    },
+
+                })
+            }
+        }
+
+        // 批量删除成品
+        function removeMaterial() {
+            var addQuotationTableData = $("#addQuotationTable").bootstrapTable("getSelections");
+            var ids = [];
+            var rawSubsidiaryCodes=[];
+            for (let i = 0;i < addQuotationTableData.length;i++) {
+                ids.push(addQuotationTableData[i].purchaseMaterialId)
+                rawSubsidiaryCodes.push(addQuotationTableData[i].rawSubsidiaryCode)
+            }
+            // console.log(ids)
+            if (addQuotationTableData.length > 0) {
+                $.modal.confirm("是否确认要删除选中的产品？", function (){
+                    $.ajax({
+                        url: prefixPurchaseMaterial + "/removeMaterial",
+                        type: "POST",
+                        data: {
+                            ids: JSON.stringify(ids)
+                        },
+                        success: function (res) {
+                            // console.log(ids)
+                            // console.log(res)
+                            $.modal.msgSuccess("删除成功")
+                            // $("#addProductTable").bootstrapTable('refreshOptions', {pageNumber: 1});  // pageNumber:1, 指定页码为第1页
+                            // $("#addProductTable").bootstrapTable('refresh');
+                            $("#addQuotationTable").bootstrapTable ('remove', { field: 'rawSubsidiaryCode', values: rawSubsidiaryCodes })
+                        }
+                    })
+                })
+
+            } else {
+                alert("请选择需要删除的数据")
+            }
+
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
new file mode 100644
index 00000000..a4ae33a1
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('采购经理审核')" />
+    <th:block th:include="include :: select2-css" />
+    <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+</head>
+<body class="white-bg">
+<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-gcjl-edit" th:object="${formData}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <input name="taskId" th:field="*{taskId}" type="hidden">
+        <input name="taskName" th:field="*{taskName}" type="hidden">
+        <input name="instanceId" th:field="*{instanceId}" type="hidden">
+        <input name="instanceType" th:field="*{instanceType}" type="hidden">
+        <input type="hidden" name="p_COM_comment" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人：</label>
+            <div class="col-sm-8">
+                <input name="applyUserName" th:field="*{applyUserName}" 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">
+                <div class="input-group date">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">标题：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="cgjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <div class="col-sm-8">
+                <select name="p_B_cgjlVerifyApproved" id="cgjlVerifyApproved" class="form-control m-b" required>
+                    <option value=""></option>
+                    <option value="true">同意</option>
+                    <option value="false">拒绝</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<th:block th:include="include :: select2-js" />
+<script th:src="@{/js/activiti.js}"></script>
+<script th:inline="javascript">
+    var erpMaterial = [[${formData}]];
+    var prefix = ctx + "purchase/purchaseOrder";
+    var purchaseOrderCode =  [[${purchaseOrder.purchaseOrderCode}]];
+    var warehouseCode = [[${purchaseOrder.stockNo}]];
+    var warehouseName = [[${purchaseOrder.stockName}]];
+    var warehouseDetailAddress = [[${purchaseOrder.stockAddress}]];
+    $("#form-gcjl-edit").validate({focusCleanup: true});
+    function submitHandler() {
+        if ($.validate.form()) {
+            if ($('textarea[name="comment"]').val()) {
+                $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
+            }
+            var taskId = [[${taskId}]];
+            $.operate.save(prefix + "/complete/" + taskId, $('#form-gcjl-edit').serialize());
+        }
+    }
+
+    var prefix = ctx + "purchase/purchaseOrder";
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var useStatusDatas = [[${@dict.getType('useStatus')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialUnitDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    $("#form-addPurchaseStorage-edit").validate({ focusCleanup: true});
+    //生成的不同table的id集合
+    var tableDatas = [];
+    $(function() {
+        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+        var purchaseOrderCode = [[${purchaseOrder.purchaseOrderCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
+        $.getJSON(prefix + "/detailListGroupedBySupplier?qualityOrderCode=" + purchaseOrderCode, function(data) {
+            for (var supplierCode in data) {
+                if (data.hasOwnProperty(supplierCode)) {
+                    var supplierData = data[supplierCode];
+                    createTableForSupplier(supplierCode, supplierData);
+                }
+            }
+        });
+    });
+    function createTableForSupplier(supplierCode, supplierData) {
+        var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        tableDatas.push(tableId);
+        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+        // 确保supplierData至少有一条记录，并从中提取供应商详细信息
+        var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
+        // 构建含有额外供应商信息的标题字符串
+        var headerTitle ='供应商'+'</br>'+supplierCode + ' -  ' + supplierInfo.supplierName ;
+        var $header = $('<h4>' + headerTitle + '</h4>');
+        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+        $table.bootstrapTable({
+            data: supplierData,
+            columns: [
+                {checkbox: false,visible: false},
+                {title: '供应商ID',field: 'supplierCode',visible: false},
+                {title: '料号',field: 'materialCode'},
+                {title: '物料名称',field: 'materialName'},
+                {title: '物料类型',field: 'materialType',
+                    formatter: function (value,row, index) {
+                        $.table.selectCategoryLabel(materialTypeDatas, value)
+                    }
+                },
+                {title: '物料图片地址',field: 'materialPhotourl',
+                    formatter: function (value, row, index) {
+                        $.table.imageView(value)
+                    }
+                },
+                {title: '物料描述',field: 'materialDescribe',},
+                {title: '物料品牌',field: 'materialBrand',},
+                {title: '物料单位',field: 'materialUnit',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(materialUnitDatas, value);
+                    }
+                },
+                {title: '物料加工方式',field: 'materialProcessMethod',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {title: '计划采购数',field: 'materialNum',},
+                {title: '实际采购数',field: 'materialRealNum',},
+                {title: '交付时间',field: 'deliveryTime',},
+                {title: '通知已到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '已入库数',field: 'hasStorageNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '通知到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        return '<input type="number" min="0" oninput="validity.valid || (value = 0)" data-id="notifyArriveNum"  class="form-control" name="notifyArriveNum" value="'+value+'"';
+                    }
+                }
+            ]
+        });
+        $tableWrapper.append($header).append($table);
+        $('#tablesContainer').append($tableWrapper);
+    }
+    $("input[name='arrivedTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgzgVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgzgVerify.html
new file mode 100644
index 00000000..2fb72b10
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgzgVerify.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('工程主管审核')" />
+    <th:block th:include="include :: select2-css" />
+    <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+</head>
+<body class="white-bg">
+<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-edit" th:object="${formData}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <input name="taskId" th:field="*{taskId}" type="hidden">
+        <input name="taskName" th:field="*{taskName}" type="hidden">
+        <input name="instanceId" th:field="*{instanceId}" type="hidden">
+        <input name="instanceType" th:field="*{instanceType}" type="hidden">
+        <input type="hidden" name="p_COM_comment" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人：</label>
+            <div class="col-sm-8">
+                <input name="applyUserName" th:field="*{applyUserName}" 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">
+                <div class="input-group date">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">标题：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="cgzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <div class="col-sm-8">
+                <select name="p_B_cgzgVerifyApproved" id="cgzgVerifyApproved" class="form-control m-b" required>
+                    <option value=""></option>
+                    <option value="true">同意</option>
+                    <option value="false">拒绝</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<th:block th:include="include :: select2-js" />
+<script th:src="@{/js/activiti.js}"></script>
+<script th:inline="javascript">
+    var erpMaterial = [[${formData}]];
+    var prefix = ctx + "purchase/purchaseOrder";
+    var purchaseOrderCode =  [[${purchaseOrder.purchaseOrderCode}]];
+    var warehouseCode = [[${purchaseOrder.stockNo}]];
+    var warehouseName = [[${purchaseOrder.stockName}]];
+    var warehouseDetailAddress = [[${purchaseOrder.stockAddress}]];
+    $("#form-gcjl-edit").validate({focusCleanup: true});
+    function submitHandler() {
+        if ($.validate.form()) {
+            if ($('textarea[name="comment"]').val()) {
+                $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
+            }
+            var taskId = [[${taskId}]];
+            $.operate.save(prefix + "/complete/" + taskId, $('#form-gcjl-edit').serialize());
+        }
+    }
+
+    var prefix = ctx + "purchase/purchaseOrder";
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var useStatusDatas = [[${@dict.getType('useStatus')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialUnitDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    $("#form-addPurchaseStorage-edit").validate({ focusCleanup: true});
+    //生成的不同table的id集合
+    var tableDatas = [];
+    $(function() {
+        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+        var purchaseOrderCode = [[${purchaseOrder.purchaseOrderCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
+        $.getJSON(prefix + "/detailListGroupedBySupplier?qualityOrderCode=" + purchaseOrderCode, function(data) {
+            for (var supplierCode in data) {
+                if (data.hasOwnProperty(supplierCode)) {
+                    var supplierData = data[supplierCode];
+                    createTableForSupplier(supplierCode, supplierData);
+                }
+            }
+        });
+    });
+    function createTableForSupplier(supplierCode, supplierData) {
+        var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        tableDatas.push(tableId);
+        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+        // 确保supplierData至少有一条记录，并从中提取供应商详细信息
+        var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
+        // 构建含有额外供应商信息的标题字符串
+        var headerTitle ='供应商'+'</br>'+supplierCode + ' -  ' + supplierInfo.supplierName ;
+        var $header = $('<h4>' + headerTitle + '</h4>');
+        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+        $table.bootstrapTable({
+            data: supplierData,
+            columns: [
+                {checkbox: false,visible: false},
+                {title: '供应商ID',field: 'supplierCode',visible: false},
+                {title: '料号',field: 'materialCode'},
+                {title: '物料名称',field: 'materialName'},
+                {title: '物料类型',field: 'materialType',
+                    formatter: function (value,row, index) {
+                        $.table.selectCategoryLabel(materialTypeDatas, value)
+                    }
+                },
+                {title: '物料图片地址',field: 'materialPhotourl',
+                    formatter: function (value, row, index) {
+                        $.table.imageView(value)
+                    }
+                },
+                {title: '物料描述',field: 'materialDescribe',},
+                {title: '物料品牌',field: 'materialBrand',},
+                {title: '物料单位',field: 'materialUnit',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(materialUnitDatas, value);
+                    }
+                },
+                {title: '物料加工方式',field: 'materialProcessMethod',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {title: '计划采购数',field: 'materialNum',},
+                {title: '实际采购数',field: 'materialRealNum',},
+                {title: '交付时间',field: 'deliveryTime',},
+                {title: '通知已到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '已入库数',field: 'hasStorageNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '通知到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        return '<input type="number" min="0" oninput="validity.valid || (value = 0)" data-id="notifyArriveNum"  class="form-control" name="notifyArriveNum" value="'+value+'"';
+                    }
+                }
+            ]
+        });
+        $tableWrapper.append($header).append($table);
+        $('#tablesContainer').append($tableWrapper);
+    }
+    $("input[name='arrivedTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
new file mode 100644
index 00000000..d6366b0c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('副总经理审核')" />
+    <th:block th:include="include :: select2-css" />
+    <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+</head>
+<body class="white-bg">
+<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-edit" th:object="${formData}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <input name="taskId" th:field="*{taskId}" type="hidden">
+        <input name="taskName" th:field="*{taskName}" type="hidden">
+        <input name="instanceId" th:field="*{instanceId}" type="hidden">
+        <input name="instanceType" th:field="*{instanceType}" type="hidden">
+        <input type="hidden" name="p_COM_comment" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人：</label>
+            <div class="col-sm-8">
+                <input name="applyUserName" th:field="*{applyUserName}" 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">
+                <div class="input-group date">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">标题：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="fzjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <div class="col-sm-8">
+                <select name="p_B_fzjlVerifyApproved" id="fzjlVerifyApproved" class="form-control m-b" required>
+                    <option value=""></option>
+                    <option value="true">同意</option>
+                    <option value="false">拒绝</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<th:block th:include="include :: select2-js" />
+<script th:src="@{/js/activiti.js}"></script>
+<script th:inline="javascript">
+    var erpMaterial = [[${formData}]];
+    var prefix = ctx + "purchase/purchaseOrder";
+    var purchaseOrderCode =  [[${purchaseOrder.purchaseOrderCode}]];
+    var warehouseCode = [[${purchaseOrder.stockNo}]];
+    var warehouseName = [[${purchaseOrder.stockName}]];
+    var warehouseDetailAddress = [[${purchaseOrder.stockAddress}]];
+    $("#form-gcjl-edit").validate({focusCleanup: true});
+    function submitHandler() {
+        if ($.validate.form()) {
+            if ($('textarea[name="comment"]').val()) {
+                $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
+            }
+            var taskId = [[${taskId}]];
+            $.operate.save(prefix + "/complete/" + taskId, $('#form-gcjl-edit').serialize());
+        }
+    }
+
+    var prefix = ctx + "purchase/purchaseOrder";
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var useStatusDatas = [[${@dict.getType('useStatus')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialUnitDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    $("#form-addPurchaseStorage-edit").validate({ focusCleanup: true});
+    //生成的不同table的id集合
+    var tableDatas = [];
+    $(function() {
+        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+        var purchaseOrderCode = [[${purchaseOrder.purchaseOrderCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
+        $.getJSON(prefix + "/detailListGroupedBySupplier?qualityOrderCode=" + purchaseOrderCode, function(data) {
+            for (var supplierCode in data) {
+                if (data.hasOwnProperty(supplierCode)) {
+                    var supplierData = data[supplierCode];
+                    createTableForSupplier(supplierCode, supplierData);
+                }
+            }
+        });
+    });
+    function createTableForSupplier(supplierCode, supplierData) {
+        var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        tableDatas.push(tableId);
+        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+        // 确保supplierData至少有一条记录，并从中提取供应商详细信息
+        var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
+        // 构建含有额外供应商信息的标题字符串
+        var headerTitle ='供应商'+'</br>'+supplierCode + ' -  ' + supplierInfo.supplierName ;
+        var $header = $('<h4>' + headerTitle + '</h4>');
+        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+        $table.bootstrapTable({
+            data: supplierData,
+            columns: [
+                {checkbox: false,visible: false},
+                {title: '供应商ID',field: 'supplierCode',visible: false},
+                {title: '料号',field: 'materialCode'},
+                {title: '物料名称',field: 'materialName'},
+                {title: '物料类型',field: 'materialType',
+                    formatter: function (value,row, index) {
+                        $.table.selectCategoryLabel(materialTypeDatas, value)
+                    }
+                },
+                {title: '物料图片地址',field: 'materialPhotourl',
+                    formatter: function (value, row, index) {
+                        $.table.imageView(value)
+                    }
+                },
+                {title: '物料描述',field: 'materialDescribe',},
+                {title: '物料品牌',field: 'materialBrand',},
+                {title: '物料单位',field: 'materialUnit',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(materialUnitDatas, value);
+                    }
+                },
+                {title: '物料加工方式',field: 'materialProcessMethod',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {title: '计划采购数',field: 'materialNum',},
+                {title: '实际采购数',field: 'materialRealNum',},
+                {title: '交付时间',field: 'deliveryTime',},
+                {title: '通知已到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '已入库数',field: 'hasStorageNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '通知到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        return '<input type="number" min="0" oninput="validity.valid || (value = 0)" data-id="notifyArriveNum"  class="form-control" name="notifyArriveNum" value="'+value+'"';
+                    }
+                }
+            ]
+        });
+        $tableWrapper.append($header).append($table);
+        $('#tablesContainer').append($tableWrapper);
+    }
+    $("input[name='arrivedTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskModifyApply.html
new file mode 100644
index 00000000..5cac9cb8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskModifyApply.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('驳回调整')" />
+    <th:block th:include="include :: select2-css" />
+    <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+</head>
+<body class="white-bg">
+<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-edit" th:object="${formData}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <input name="taskId" th:field="*{taskId}" type="hidden">
+        <input name="taskName" th:field="*{taskName}" type="hidden">
+        <input name="instanceId" th:field="*{instanceId}" type="hidden">
+        <input name="instanceType" th:field="*{instanceType}" type="hidden">
+        <!--驳回调整允许更新内容-->
+        <input type="hidden" name="saveEntity" value="true" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人：</label>
+            <div class="col-sm-8">
+                <input name="applyUserName" th:field="*{applyUserName}" 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">
+                <div class="input-group date">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">标题：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="reApply">是否继续申请：</label>
+            <div class="col-sm-8">
+                <select id="reApply" name="p_B_reApply" class="form-control m-b">
+                    <option value="true">重新申请</option>
+                    <option value="false">结束流程</option>
+                </select>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<th:block th:include="include :: select2-js" />
+<script th:src="@{/js/activiti.js}"></script>
+<script th:inline="javascript">
+    var erpMaterial = [[${formData}]];
+    var prefix = ctx + "purchase/purchaseOrder";
+    var purchaseOrderCode =  [[${purchaseOrder.purchaseOrderCode}]];
+    var warehouseCode = [[${purchaseOrder.stockNo}]];
+    var warehouseName = [[${purchaseOrder.stockName}]];
+    var warehouseDetailAddress = [[${purchaseOrder.stockAddress}]];
+    $("#form-gcjl-edit").validate({focusCleanup: true});
+    function submitHandler() {
+        if ($.validate.form()) {
+            if ($('textarea[name="comment"]').val()) {
+                $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
+            }
+            var taskId = [[${taskId}]];
+            $.operate.save(prefix + "/complete/" + taskId, $('#form-gcjl-edit').serialize());
+        }
+    }
+
+    var prefix = ctx + "purchase/purchaseOrder";
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var useStatusDatas = [[${@dict.getType('useStatus')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialUnitDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    $("#form-addPurchaseStorage-edit").validate({ focusCleanup: true});
+    //生成的不同table的id集合
+    var tableDatas = [];
+    $(function() {
+        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+        var purchaseOrderCode = [[${purchaseOrder.purchaseOrderCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
+        $.getJSON(prefix + "/detailListGroupedBySupplier?qualityOrderCode=" + purchaseOrderCode, function(data) {
+            for (var supplierCode in data) {
+                if (data.hasOwnProperty(supplierCode)) {
+                    var supplierData = data[supplierCode];
+                    createTableForSupplier(supplierCode, supplierData);
+                }
+            }
+        });
+    });
+    function createTableForSupplier(supplierCode, supplierData) {
+        var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        tableDatas.push(tableId);
+        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+        // 确保supplierData至少有一条记录，并从中提取供应商详细信息
+        var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
+        // 构建含有额外供应商信息的标题字符串
+        var headerTitle ='供应商'+'</br>'+supplierCode + ' -  ' + supplierInfo.supplierName ;
+        var $header = $('<h4>' + headerTitle + '</h4>');
+        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+        $table.bootstrapTable({
+            data: supplierData,
+            columns: [
+                {checkbox: false,visible: false},
+                {title: '供应商ID',field: 'supplierCode',visible: false},
+                {title: '料号',field: 'materialCode'},
+                {title: '物料名称',field: 'materialName'},
+                {title: '物料类型',field: 'materialType',
+                    formatter: function (value,row, index) {
+                        $.table.selectCategoryLabel(materialTypeDatas, value)
+                    }
+                },
+                {title: '物料图片地址',field: 'materialPhotourl',
+                    formatter: function (value, row, index) {
+                        $.table.imageView(value)
+                    }
+                },
+                {title: '物料描述',field: 'materialDescribe',},
+                {title: '物料品牌',field: 'materialBrand',},
+                {title: '物料单位',field: 'materialUnit',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(materialUnitDatas, value);
+                    }
+                },
+                {title: '物料加工方式',field: 'materialProcessMethod',
+                    formatter:function (value) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {title: '计划采购数',field: 'materialNum',},
+                {title: '实际采购数',field: 'materialRealNum',},
+                {title: '交付时间',field: 'deliveryTime',},
+                {title: '通知已到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '已入库数',field: 'hasStorageNum',
+                    formatter: function (value, row, index) {
+                        if (value == null || value == '') {
+                            return 0;
+                        }
+                        return value;
+                    }
+                },
+                {title: '通知到货数',field: 'notifyArriveNum',
+                    formatter: function (value, row, index) {
+                        return '<input type="number" min="0" oninput="validity.valid || (value = 0)" data-id="notifyArriveNum"  class="form-control" name="notifyArriveNum" value="'+value+'"';
+                    }
+                }
+            ]
+        });
+        $tableWrapper.append($header).append($table);
+        $('#tablesContainer').append($tableWrapper);
+    }
+    $("input[name='arrivedTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file

From 9ec6b3a0352674d76e1d5fce91fdb0cc28479f3b Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 11 Jul 2024 09:38:25 +0800
Subject: [PATCH 09/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=20=E7=A1=AE=E8=AE=A4=E5=8F=91=E8=B4=A7=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=20=E6=96=B0=E5=A2=9E=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E9=80=9A=E7=9F=A5=E5=8D=95=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=91=E8=B4=A7=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=80=9A=E7=9F=A5=E5=8D=95=20=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=92=8C=E4=BF=AE=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=20=E5=8F=96=E6=B6=88=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysSalesShippingInformController.java     | 55 +++++++++++++++++--
 .../ISysSalesShippingInformService.java       | 11 ++++
 .../SysSalesShippingInformServiceImpl.java    | 48 +++++++++++++++-
 .../mapper/WarehouseOutOrderMapper.java       |  5 ++
 .../warehouse/WarehouseOutOrderMapper.xml     |  8 +++
 .../salesShippingInform/cancelShipping.html   | 35 ++++++++++++
 .../salesShippingInform/confirmShipping.html  | 49 +++++++++++++++++
 .../salesShippingInform.html                  | 19 +++++--
 8 files changed, 219 insertions(+), 11 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
index 7b18ba4d..82b00c35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
@@ -1,15 +1,13 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.SysSalesOrder;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysSalesShippingInform;
@@ -147,5 +145,52 @@ public class SysSalesShippingInformController extends BaseController
         return toAjax(sysSalesShippingInformService.restoreSysSalesShippingInformById(id));
     }
 
+    /**
+     *  确认发货
+     */
+    @GetMapping("/confirmShipping/{shippingInformId}")
+    public String confirmShipping(@PathVariable("shippingInformId") Long shippingInformId, ModelMap mmap)
+    {
+        SysSalesShippingInform sysSalesShippingInform = sysSalesShippingInformService.selectSysSalesShippingInformById(shippingInformId);
+        mmap.put("sysSalesShippingInform", sysSalesShippingInform);
+        return prefix + "/confirmShipping";
+    }
+
+    /**
+     * 修改保存确认发货
+     */
+    @RequiresPermissions("system:salesShippingInform:confirmShipping")
+    @Log(title = "销售确认发货", businessType = BusinessType.UPDATE)
+    @PostMapping("/confirmShipping")
+    @ResponseBody
+    public AjaxResult confirmShippingSave(SysSalesShippingInform sysSalesShippingInform)
+    {
+        return toAjax(sysSalesShippingInformService.updateConfirmShipping(sysSalesShippingInform));
+    }
+
+
+
+    /**
+     *  取消发货
+     */
+    @GetMapping("/cancelShipping/{shippingInformId}")
+    public String cancelShipping(@PathVariable("shippingInformId") Long shippingInformId, ModelMap mmap)
+    {
+        SysSalesShippingInform sysSalesShippingInform = sysSalesShippingInformService.selectSysSalesShippingInformById(shippingInformId);
+        mmap.put("sysSalesShippingInform", sysSalesShippingInform);
+        return prefix + "/cancelShipping";
+    }
+
+    /**
+     * 修改保存取消发货
+     */
+    @RequiresPermissions("system:salesShippingInform:cancelShipping")
+    @Log(title = "销售取消发货", businessType = BusinessType.UPDATE)
+    @PostMapping("/cancelShipping")
+    @ResponseBody
+    public AjaxResult cancelShippingSave(SysSalesShippingInform sysSalesShippingInform)
+    {
+        return toAjax(sysSalesShippingInformService.updateCancelShipping(sysSalesShippingInform));
+    }
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
index 2290f0b9..b2a59311 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
@@ -79,4 +79,15 @@ public interface ISysSalesShippingInformService
     * 通过销售发起出货生成销售出货通知单列表
     * */
     int generateShippingInformBySalesOrder(SysSalesOrder sysSalesOrder, String outOrderCode);
+
+
+    /**
+     * 修改保存确认发货
+     */
+    int updateConfirmShipping(SysSalesShippingInform sysSalesShippingInform);
+
+    /**
+     * 修改保存取消发货
+     */
+    int updateCancelShipping(SysSalesShippingInform sysSalesShippingInform);
 }
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 a8e5460b..96682a81 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
@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -12,6 +13,8 @@ import com.ruoyi.system.domain.SysSalesOrder;
 import com.ruoyi.system.domain.SysSalesOrderVo;
 import com.ruoyi.system.mapper.SysSalesOrderMapper;
 import com.ruoyi.warehouse.domain.WarehouseOutOrder;
+import com.ruoyi.warehouse.mapper.WarehouseOutOrderMapper;
+import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +22,7 @@ import com.ruoyi.system.mapper.SysSalesShippingInformMapper;
 import com.ruoyi.system.domain.SysSalesShippingInform;
 import com.ruoyi.system.service.ISysSalesShippingInformService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 销售出货通知Service业务层处理
@@ -28,7 +32,7 @@ import com.ruoyi.common.core.text.Convert;
  */
 @Slf4j
 @Service
-public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInformService 
+public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInformService
 {
     @Autowired
     private SysSalesShippingInformMapper sysSalesShippingInformMapper;
@@ -39,6 +43,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private WarehouseOutOrderMapper warehouseOutOrderMapper;
+
     /**
      * 查询销售出货通知
      * 
@@ -174,4 +181,43 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
         return sysSalesShippingInformMapper.insertSysSalesShippingInform(sysSalesShippingInform);
     }
+
+    /**
+     * 修改保存确认发货
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int updateConfirmShipping(SysSalesShippingInform sysSalesShippingInform) {
+
+        String loginName = ShiroUtils.getLoginName();
+        //设置出库状态为 待设备维护2
+        sysSalesShippingInform.setWarehouseOutStatus("3");
+        sysSalesShippingInform.setUpdateBy(loginName);
+        sysSalesShippingInform.setUpdateTime(new Date());
+
+        //更新出库单数据
+        String outOrderCode = sysSalesShippingInform.getOutOrderCode();
+        if (StringUtils.isEmpty(outOrderCode)){
+         log.warn("出库单号为空:{}",outOrderCode);
+        }
+        WarehouseOutOrder warehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByCode(outOrderCode);
+        warehouseOutOrder.setWarehouseOutStatus("3");
+        warehouseOutOrder.setUpdateBy(loginName);
+        warehouseOutOrder.setUpdateTime(new Date());
+
+        int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
+        if (updateWarehouseOutOrderResult <= 0){
+            throw new BusinessException("更新出库单数据失败");
+        }
+        return sysSalesShippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform);
+    }
+
+    /**
+     * 修改保存取消发货 （后续完善）
+     */
+    @Override
+    public int updateCancelShipping(SysSalesShippingInform sysSalesShippingInform) {
+
+        return 1;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java
index e505696e..99ed744c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java
@@ -83,4 +83,9 @@ public interface WarehouseOutOrderMapper
      * @return 结果
      */
     public int restoreWarehouseOutOrderById(Long outOrderId);
+
+    /*
+    *  根据出库单号查询出库单数据
+    * */
+    WarehouseOutOrder selectWarehouseOutOrderByCode(String outOrderCode);
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml
index 4371525f..728613f3 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml
@@ -89,6 +89,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWarehouseOutOrderVo"/>
         where out_order_id = #{outOrderId}
     </select>
+
+
+    <select id="selectWarehouseOutOrderByCode" parameterType="String" resultMap="WarehouseOutOrderResult">
+        <include refid="selectWarehouseOutOrderVo"/>
+        where out_order_code = #{outOrderCode}
+    </select>
+
+
         
     <insert id="insertWarehouseOutOrder" parameterType="WarehouseOutOrder" useGeneratedKeys="true" keyProperty="outOrderId">
         insert into warehouse_out_order
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
new file mode 100644
index 00000000..03eee16b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
@@ -0,0 +1,35 @@
+<!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-cancelShipping-add">
+        <input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="remark" class="form-control"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/salesShippingInform"
+    $("#form-cancelShipping-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/cancelShipping", $('#form-cancelShipping-add').serialize());
+        }
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html
new file mode 100644
index 00000000..47233d79
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/confirmShipping.html
@@ -0,0 +1,49 @@
+<!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" id="form-confirmShipping-add" th:object="${sysSalesShippingInform}">
+        <input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
+        <div class="form-group">
+            <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>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="remark"  th:field="*{remark}" class="form-control"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/salesShippingInform"
+    $("#form-confirmShipping-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.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
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 20a1664d..37119d4a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -70,6 +70,12 @@
         var removeFlag = [[${@permission.hasPermi('system:salesShippingInform:remove')}]];
         var cancelFlag = [[${@permission.hasPermi('system:salesShippingInform:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('system:salesShippingInform:restore')}]];
+        var confirmShippingFlag = [[${@permission.hasPermi('system:salesShippingInform:confirmShipping')}]];
+
+
+
+
+
         var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
         var warehouseOutTypeDatas = [[${@dict.getType('warehouse_out_type')}]];
         var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
@@ -217,11 +223,8 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.shippingInformId + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        if(row.warehouseOutStatus == '2'){
+                            actions.push('<a class="btn btn-success btn-xs ' + confirmShippingFlag + '" href="javascript:void(0)" onclick="confirmShipping(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>确认发货</a> ');
                         }
                         return actions.join('');
                     }
@@ -229,6 +232,12 @@
             };
             $.table.init(options);
         });
+
+        //确认发货
+        function confirmShipping(shippingInformId){
+            var url = prefix +'/confirmShipping/' + shippingInformId;
+            $.modal.open("确认发货",url);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file

From 6ecdd30021265920a8e97929b97931915c7e0c35 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 11 Jul 2024 13:49:11 +0800
Subject: [PATCH 10/10] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=20=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=8E=BB=E6=8E=89=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=B1=95=E7=A4=BA=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=B1=95=E7=A4=BA=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8F=B7=E5=B7=B2=E9=80=89=E6=8B=A9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E7=9A=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=20=E9=80=89=E6=8B=A9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AFVO=E7=B1=BB=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=20=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWarehouseOutController.java     |  66 ++-
 .../domain/vo/SelectShippingDeviceVO.java     |  20 +
 .../IAftersalesWarehouseOutService.java       |  11 +
 .../AftersalesWarehouseOutServiceImpl.java    |  86 ++++
 .../maintenanceEquipmentOne.html              |   4 +-
 .../maintenanceEquipmentTwo.html              | 405 ++++++++++++++++++
 .../warehouseOutOrder/warehouseOutOrder.html  |  16 +-
 7 files changed, 591 insertions(+), 17 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
index 230b3b2b..4abf6cf3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java
@@ -182,7 +182,6 @@ public class AftersalesWarehouseOutController extends BaseController
     /**
      * 添加出货设备查询物料信息
      */
-    @RequiresPermissions("aftersales:warehouseOutOrder:addShippingDevicesMaterial")
     @PostMapping("/addShippingDevicesMaterial")
     @ResponseBody
     public TableDataInfo optionMaterial(SelectMaterialsVO selectMaterialsVO)
@@ -196,7 +195,6 @@ public class AftersalesWarehouseOutController extends BaseController
     /**
      * 添加出货设备查询出货设备信息
      */
-    @RequiresPermissions("aftersales:warehouseOutOrder:addShippingDevicesOptions")
     @PostMapping("/addShippingDevicesOptions")
     @ResponseBody
     public TableDataInfo addShippingDevicesOptions(SelectMaterialsVO selectMaterialsVO)
@@ -220,9 +218,6 @@ public class AftersalesWarehouseOutController extends BaseController
     }
 
 
-
-
-
     /**
      * 售后第一次维护设备
      */
@@ -263,9 +258,9 @@ public class AftersalesWarehouseOutController extends BaseController
     /**
      * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息
      */
-    @PostMapping("/showAftersalesShippingDeviceList")
+    @PostMapping("/showAftersalesShippingDeviceListOne")
     @ResponseBody
-    public TableDataInfo showAftersalesShippingDeviceList(@RequestParam("materialNo") String materialNo)
+    public TableDataInfo showAftersalesShippingDeviceListOne(@RequestParam("materialNo") String materialNo)
     {
 
         startPage();
@@ -287,14 +282,12 @@ public class AftersalesWarehouseOutController extends BaseController
         return prefix + "/addShippingDevicesOne";
     }
 
-
-
     /**
      * 修改保存售后第一次维护设备 添加出货设备信息
      */
     @ResponseBody
     @PostMapping("/addShippingDevicesOne")
-    public AjaxResult addShippingDevicesOne(@RequestBody WarehouseOutOrderDetail warehouseOutOrderDetail)
+    public AjaxResult addShippingDevicesOneSave(@RequestBody WarehouseOutOrderDetail warehouseOutOrderDetail)
     {
 
        return toAjax(outOrderDetailService.addShippingDevicesOne(warehouseOutOrderDetail));
@@ -330,4 +323,57 @@ public class AftersalesWarehouseOutController extends BaseController
 
 
 
+
+    /**
+     * 售后第二次维护设备
+     */
+    @GetMapping("/maintenanceEquipmentTwo/{outOrderId}")
+    public String maintenanceEquipmentTwo(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap)
+    {
+        WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId);
+        mmap.put("warehouseOutOrder", warehouseOutOrder);
+        return prefix + "/maintenanceEquipmentTwo";
+    }
+
+    /**
+     * 修改保存售后第二次维护设备
+     */
+    @RequiresPermissions("aftersales:warehouseOutOrder:maintenanceEquipmentTwo")
+    @Log(title = "售后维护设备出库", businessType = BusinessType.UPDATE)
+    @PostMapping("/maintenanceEquipmentTwo")
+    @ResponseBody
+    public AjaxResult maintenanceEquipmentTwoSave(@RequestBody WarehouseOutOrder warehouseOutOrder)
+    {
+        return toAjax(warehouseOutOrderService.updateMaintenanceEquipmentTwo(warehouseOutOrder));
+    }
+
+
+    /**
+     * 展示售后第二次维护设备物料信息
+     * */
+    @PostMapping("/getMaintenanceEquipmentTwoMaterials")
+    @ResponseBody
+    public TableDataInfo getMaintenanceEquipmentTwoMaterials(WarehouseOutOrder warehouseOutOrder)
+    {
+
+        startPage();
+        List<WarehouseOutOrderDetail> list = warehouseOutOrderService.selectOutOrderDetailListByCode(warehouseOutOrder);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息
+     */
+    @PostMapping("/showAftersalesShippingDeviceListTwo")
+    @ResponseBody
+    public TableDataInfo showAftersalesShippingDeviceListTwo(@RequestParam("materialNo") String materialNo)
+    {
+
+        startPage();
+        List<SelectShippingDeviceVO> list = warehouseOutOrderService.showAftersalesShippingDeviceListTwo(materialNo);
+        return getDataTable(list);
+    }
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
index f6a0ec33..cc4125b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
@@ -1,5 +1,7 @@
 package com.ruoyi.aftersales.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 /**
  * 添加出货设备时新增出货设备列表
@@ -20,5 +22,23 @@ public class SelectShippingDeviceVO {
 
     private String snCode;
 
+    /** 出厂日期 */
+    private String factoryDate;
+
+    /** 保修期 */
+    private String guaranteePeriod;
+
+    /** 锁机时间 */
+    private String lockDate;
+
+    /** 是否有锁机时间 */
+    private String lockDateFlag;
+
+    /** 损耗品到期时间 */
+    private String wastageExpireDate;
+
+    /** 二次维修后部件质保时间 */
+    private String componentGuaranteeDate;
+
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
index b091fc29..5a16ff02 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java
@@ -129,4 +129,15 @@ public interface IAftersalesWarehouseOutService
      * 修改保存售后第一次维护设备
      */
     int updateMaintenanceEquipmentOne(WarehouseOutOrder warehouseOutOrder);
+
+
+    /**
+     * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息
+     */
+    List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(String materialNo);
+
+    /**
+     * 修改保存售后第二次维护设备
+     */
+    int updateMaintenanceEquipmentTwo(WarehouseOutOrder warehouseOutOrder);
 }
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 e176bfef..ec33f164 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
@@ -290,6 +290,92 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu
         return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
     }
 
+    /**
+     * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息
+     */
+    @Override
+    public List<SelectShippingDeviceVO> showAftersalesShippingDeviceListTwo(String materialNo) {
+
+        List<SelectShippingDeviceVO> selectShippingDeviceVOs = new ArrayList<>();
+        AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+        afterSalesShippingDevice.setMaterialNo(materialNo);
+        List<AfterSalesShippingDevice> afterSalesShippingDevices = shippingDeviceMapper.selectShippingDeviceListByMaterialNo(afterSalesShippingDevice);
+        List<AfterSalesShippingDevice> filterAfterSalesShippingDevices = afterSalesShippingDevices.stream().filter(shippingDevice -> "0".equals(shippingDevice.getAddShippingDeviceFlag())).collect(Collectors.toList());
+        if (!StringUtils.isNotEmpty(filterAfterSalesShippingDevices)) {
+            // 记录日志
+            log.warn("未查找到与物料号关联的出库设备数据, 物料号: {}",materialNo);
+        }
+
+        for (AfterSalesShippingDevice tempAfterSalesShippingDevice : filterAfterSalesShippingDevices) {
+            SelectShippingDeviceVO shippingDeviceVO = new SelectShippingDeviceVO();
+            shippingDeviceVO.setShippingDeviceId(tempAfterSalesShippingDevice.getShippingDeviceId());
+            shippingDeviceVO.setDeviceModelCode(tempAfterSalesShippingDevice.getDeviceModelCode());
+            shippingDeviceVO.setDeviceRunningNumber(tempAfterSalesShippingDevice.getDeviceRunningNumber());
+            shippingDeviceVO.setMakePhotoUrl(tempAfterSalesShippingDevice.getMakePhotourl());
+            shippingDeviceVO.setQuoteId(tempAfterSalesShippingDevice.getSalesOrderCode());
+            shippingDeviceVO.setSnCode(tempAfterSalesShippingDevice.getSnCode());
+            shippingDeviceVO.setFactoryDate(tempAfterSalesShippingDevice.getFactoryDate());
+            shippingDeviceVO.setGuaranteePeriod(tempAfterSalesShippingDevice.getGuaranteePeriod());
+            shippingDeviceVO.setLockDate(tempAfterSalesShippingDevice.getLockDate());
+            shippingDeviceVO.setLockDateFlag(tempAfterSalesShippingDevice.getLockDateFlag());
+            shippingDeviceVO.setWastageExpireDate(tempAfterSalesShippingDevice.getWastageExpireDate());
+            shippingDeviceVO.setComponentGuaranteeDate(tempAfterSalesShippingDevice.getComponentGuaranteeDate());
+            selectShippingDeviceVOs.add(shippingDeviceVO);
+
+        }
+        return selectShippingDeviceVOs;
+    }
+
+    /**
+     * 修改保存售后第二次维护设备
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int updateMaintenanceEquipmentTwo(WarehouseOutOrder warehouseOutOrder) {
+
+        String loginName = ShiroUtils.getLoginName();
+
+        List<SelectShippingDeviceVO> selectShippingDeviceVOList = warehouseOutOrder.getSelectShippingDeviceVOList();
+        for (SelectShippingDeviceVO selectShippingDeviceVO : selectShippingDeviceVOList) {
+            AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice();
+            afterSalesShippingDevice.setShippingDeviceId(selectShippingDeviceVO.getShippingDeviceId());
+            afterSalesShippingDevice.setSnCode(selectShippingDeviceVO.getSnCode());
+            afterSalesShippingDevice.setFactoryDate(selectShippingDeviceVO.getFactoryDate());
+            afterSalesShippingDevice.setGuaranteePeriod(selectShippingDeviceVO.getGuaranteePeriod());
+            afterSalesShippingDevice.setLockDate(selectShippingDeviceVO.getLockDate());
+            afterSalesShippingDevice.setLockDateFlag(selectShippingDeviceVO.getLockDateFlag());
+            afterSalesShippingDevice.setWastageExpireDate(selectShippingDeviceVO.getWastageExpireDate());
+            afterSalesShippingDevice.setComponentGuaranteeDate(selectShippingDeviceVO.getComponentGuaranteeDate());
+            afterSalesShippingDevice.setUpdateBy(loginName);
+            afterSalesShippingDevice.setUpdateTime(new Date());
+            int updateShippingDeviceResult = shippingDeviceMapper.updateAfterSalesShippingDevice(afterSalesShippingDevice);
+            if (updateShippingDeviceResult <= 0){
+                throw new BusinessException("更新出货设备数据失败");
+            }
+
+        }
+
+        //设置出库单为待业务确认发货
+        warehouseOutOrder.setWarehouseOutStatus("4");
+
+        //更新销售管理销售出库的出货状态 待业务确认发货
+        SysSalesShippingInform sysSalesShippingInform = new SysSalesShippingInform();
+        sysSalesShippingInform.setOutOrderCode(warehouseOutOrder.getOutOrderCode());
+        sysSalesShippingInform.setWarehouseOutStatus("4");
+        sysSalesShippingInform.setUpdateBy(loginName);
+        sysSalesShippingInform.setUpdateTime(new Date());
+        int updateShippingInformResult = shippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform);
+        if (updateShippingInformResult <= 0){
+            log.warn("出库单号为空：{}",warehouseOutOrder.getOutOrderCode());
+            throw new BusinessException("更新销售出库单数据失败");
+        }
+
+
+
+        return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
+
+    }
+
     /*
      * 售后第一次维护设备信息根据设备ID删除出货设备信息
      * */
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
index d075be63..7d3b78f4 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-  <th:block th:include="include :: header('修改出库单')" />
+  <th:block th:include="include :: header('售后维护设备1')" />
   <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
@@ -238,7 +238,7 @@
     var childTableId = 'child_table_'+index;
     $detail.html('<table id="'+childTableId+'"></table>');
     $('#'+childTableId).bootstrapTable({
-      url: prefix + "/showAftersalesShippingDeviceList",
+      url: prefix + "/showAftersalesShippingDeviceListOne",
       method: 'post',
       sidePagination: "server",
       contentType: "application/x-www-form-urlencoded",
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html
new file mode 100644
index 00000000..e1f67e66
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html
@@ -0,0 +1,405 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('售后维护设备2')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-editable-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-maintenanceEquipmentTwo-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">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">出库对象：</label>
+            <div class="col-sm-8">
+                <input name="outOrderName" th:field="*{outOrderName}" class="form-control" type="text">
+            </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">
+            </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">
+            </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">
+            </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">
+                    <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">
+            </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">
+            </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">
+            </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">
+            </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">
+            </div>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <h3 class="mb-4">物料信息</h3>
+            <table id="bootstrap-table"></table>
+        </div>
+    </form>
+</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 addFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:addShippingDevices')}]];
+
+    var prefix = ctx + "aftersales/warehouseOutOrder";
+    var warehouseOutOrder = [[${warehouseOutOrder}]];
+
+    $("#form-maintenanceEquipmentTwo-edit").validate({
+        focusCleanup: true
+    });
+
+    $("input[name='deliveryDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    function submitHandler() {
+        // 获取表单数据
+        const shippingDevicesData = $("#form-maintenanceEquipmentTwo-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+
+        // 在需要收集所有子表数据的地方调用此函数
+        var allSubData = getAllSubTablesData();
+
+        // 将表数据转换成与complaintNoticeData格式一致的数组
+        var equipDetailDataList = allSubData.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "shippingDeviceId": item.shippingDeviceId,
+                "deviceModelCode": item.deviceModelCode,
+                "deviceRunningNumber": item.deviceRunningNumber,
+                "makePhotoUrl": item.makePhotoUrl,
+                "snCode": item.snCode,
+                "factoryDate": item.factoryDate,
+                "guaranteePeriod": item.guaranteePeriod,
+                "lockDateFlag": item.lockDateFlag,
+                "lockDate": item.lockDate,
+                "wastageExpireDate": item.wastageExpireDate,
+                "componentGuaranteeDate": item.componentGuaranteeDate
+                // ...其他字段
+            };
+        });
+
+        // 合并表单数据和表格数据
+        const combinedData = Object.assign({}, shippingDevicesData, { selectShippingDeviceVOList: equipDetailDataList });
+
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/maintenanceEquipmentTwo", jsonData);
+    }
+
+
+
+
+    $("input[name='outOrderTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='planDeliveryTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+    $(function() {
+        var options = {
+            id:'bootstrap-table',
+            url: prefix + "/getMaintenanceEquipmentTwoMaterials",
+            modalName: "物料信息",
+            showColumns: false,
+            pagination: false,
+            showToggle: false,
+            showRefresh:false,
+            showSearch:false,
+            queryParams:queryParams,
+            detailView: true,
+            onExpandRow : function(index, row, $detail) {
+                initChildTable(index, row, $detail);
+            },
+            columns: [{
+                checkbox: true
+            },
+
+                {   title:'销售订单号',
+                    field:'quoteId',
+                    visible: false
+                },
+                {
+                    title:'出库单详情Id',
+                    field:'outOrderDetailId',
+                    visible: false
+
+                },
+                {
+                    title: '料号',
+                    field: 'materialNo',
+                },
+                {
+                    title: '图片',
+                    field: 'photoUrl',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '品牌',
+                    field: 'brand',
+                },
+                {
+                    title: '描述',
+                    field: 'describe',
+                },
+                {
+                    title: '订单数量',
+                    field: 'makeNum',
+                },
+                {
+                    title: '已出库数',
+                    field: 'hasOutOrderSum',
+                },
+                {
+                    title: '申请出库数',
+                    field: 'applyOutOrderSum',
+                },
+                {
+                    title: '准备出库数',
+                    field: 'prepareOutOrderSum',
+                },
+            ]
+        };
+        $.table.init(options);
+    })
+
+
+    initChildTable = function(index, row, $detail) {
+        var parentRow = row;
+        var childTableId = 'child_table_'+index;
+        $detail.html('<table id="'+childTableId+'"></table>');
+        $('#'+childTableId).bootstrapTable({
+            url: prefix + "/showAftersalesShippingDeviceListTwo",
+            method: 'post',
+            sidePagination: "server",
+            contentType: "application/x-www-form-urlencoded",
+            queryParams : {
+                // salesOrderCode: warehouseOutOrder.salesOrderCode,
+                materialNo: parentRow.materialNo
+            },
+            columns: [
+                {
+                    title: '出货设备ID',
+                    field: 'shippingDeviceId',
+                },
+                {
+                    title: '设备型号',
+                    field: 'deviceModelCode',
+                },
+                {
+                    title: '流水号',
+                    field: 'deviceRunningNumber',
+                },
+                {
+                    title: '设备SN号',
+                    field: 'snCode',
+                    align: 'center',
+                    editable:true
+                },
+                {
+                    title: '出库日期',
+                    field: 'factoryDate',
+                    align: 'center',
+                    editable:{
+                        type:'date',
+                        title: '出库日期',
+                        clear: false,//隐藏clear按钮
+                        placement: 'center',//居中显示
+                    }
+                },
+                {
+                    title: '保修期',
+                    field: 'guaranteePeriod',
+                    align: 'center',
+                    editable:true
+                },
+                {
+                    title: '是否有锁机时间',
+                    field: 'lockDateFlag',
+                    align: 'center',
+                    editable: {
+                        type: 'select',
+                        title: '是否有锁机时间',
+                        source:[{value:"0",text:"是"},{value:"1",text:"否"}]
+                    }
+                },
+                {
+                    title: '锁机时间',
+                    field: 'lockDate',
+                    align: 'center',
+                    editable:{
+                        type:'date',
+                        title: '锁机时间',
+                        clear: false,//隐藏clear按钮
+                        placement: 'center',//居中显示
+                    }
+                },
+                {
+                    title: '损耗品到期时间',
+                    field: 'wastageExpireDate',
+                    align: 'center',
+                    editable:{
+                        type:'date',
+                        title: '损耗品到期时间',
+                        clear: false,//隐藏clear按钮
+                        placement: 'center',//居中显示
+                    }
+                },
+                {
+                    title: '二次维修后部件质保时间',
+                    field: 'componentGuaranteeDate',
+                    align: 'center',
+                    editable:{
+                        type:'date',
+                        title: '二次维修后部件质保时间',
+                        clear: false,//隐藏clear按钮
+                        placement: 'center',//居中显示
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return '<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="deleteRow(\'' + row.shippingDeviceId + '\')"><i class="fa fa-remove"></i>删除</a>';
+                    }
+                }
+            ],
+        });
+    };
+
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            outOrderCode:  warehouseOutOrder.outOrderCode
+        };
+        return curParams;
+    }
+
+
+    // 获取所有子表数据的函数
+    // 获取所有子表数据的函数
+    function getAllSubTablesData() {
+        var allSubData = [];
+        // 获取所有被展开的行
+        var parentLength = $("#bootstrap-table").bootstrapTable("getData").length;
+        for (let i = 0; i < parentLength; i++) {
+            var sonData =  $('#'+"child_table_" + i).bootstrapTable("getData");
+            //循环获取子表中存在的行数据，每个行数据转换添加到allSubData数组中
+            allSubData = allSubData.concat(sonData);
+        }
+        return allSubData;
+    }
+
+
+    function deleteRow(shippingDeviceId) {
+        // 弹出确认框询问用户是否确定删除
+        if (confirm("确定要删除这条记录吗？")) {
+            // 发送删除请求到服务器
+            $.ajax({
+                url: prefix + "/deleteRow", // 请根据实际API路径调整
+                type: 'POST',
+                data: {
+                    shippingDeviceId: shippingDeviceId, // 传递需要删除的记录的ID
+                },
+                success: function(result) {
+                    if (result.success) { // 假设result是一个对象，包含success属性来表示操作是否成功
+                        // 删除操作成功，从表格中移除这一行
+                        $('#child_table_' + index).bootstrapTable('remove', {
+                            field: 'shippingDeviceId',
+                            values: [shippingDeviceId]
+                        });
+                        toastr.success("删除成功!"); // 显示成功提示信息，这里使用toastr作为示例，确保已引入相关库
+                    } else {
+                        toastr.error("删除失败: " + result.message); // 显示失败原因，同样确保已引入toastr库
+                    }
+                },
+                error: function() {
+                    toastr.error("发生错误，删除失败!"); // 网络错误或后端错误处理
+                }
+            });
+        }
+    };
+
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html
index fcc650d1..998b0854 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html
@@ -66,7 +66,7 @@
         var removeFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:remove')}]];
         var maintenanceEquipmentOneFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:maintenanceEquipmentOne')}]];
 
-
+        var maintenanceEquipmentTwoFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:maintenanceEquipmentTwo')}]];
 
         var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
         var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
@@ -179,6 +179,9 @@
                         if (row.warehouseOutStatus== "1"){
                             actions.push('<a class="btn btn-success btn-xs ' + maintenanceEquipmentOneFlag + '" href="javascript:void(0)" onclick="maintenanceEquipmentOne(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>维护设备</a> ');
                         }
+                        if (row.warehouseOutStatus== "3"){
+                            actions.push('<a class="btn btn-success btn-xs ' + maintenanceEquipmentTwoFlag + '" href="javascript:void(0)" onclick="maintenanceEquipmentTwo(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>维护设备</a> ');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -188,20 +191,23 @@
 
         /*详情*/
         function detail(outOrderId) {
-            // 在这里编写派单操作的逻辑，使用传入的aftersalesOrderId参数
-            // 示例逻辑：
             var url = ctx + 'aftersales/warehouseOutOrder/detail/'+outOrderId;
             $.modal.open("详情",url);
         }
 
         /*售后第一次维护设备*/
         function maintenanceEquipmentOne(outOrderId) {
-            // 在这里编写派单操作的逻辑，使用传入的aftersalesOrderId参数
-            // 示例逻辑：
             var url = ctx + 'aftersales/warehouseOutOrder/maintenanceEquipmentOne/'+outOrderId;
             $.modal.open("售后第一次维护设备",url);
         }
 
+
+        /*售后第二次维护设备*/
+        function maintenanceEquipmentTwo(outOrderId) {
+            var url = ctx + 'aftersales/warehouseOutOrder/maintenanceEquipmentTwo/'+outOrderId;
+            $.modal.open("售后第二次维护设备",url);
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file