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] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=89=8D=E7=AB=AF=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=87=BA=E8=B4=A7=E4=BF=A1=E6=81=AF=20js?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=20?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87ID=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=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=E4=BF=AE=E6=94=B9=20?= =?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?=E5=89=8D=E7=AB=AF=E7=9A=84=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8B=BF=E4=B8=8D=E5=88=B0=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=97=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=20snCode=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=87=BA=E5=BA=93=E5=8D=95=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E5=87=BA=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E=20=E5=87=BA?= =?UTF-8?q?=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E9=9B=86=E5=90=88?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E9=94=80=E5=94=AE=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=8E=E6=96=B0=E5=A2=9E=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=E7=9A=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9A=84=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 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 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 warehouseOutOrderDetailList; + /** 添加出货设备列表*/ + + private List selectShippingDeviceVOList; + + public void setOutOrderId(Long outOrderId) { this.outOrderId = outOrderId; @@ -428,6 +434,14 @@ public class WarehouseOutOrder extends BaseEntity this.warehouseOutOrderDetailList = warehouseOutOrderDetailList; } + public List getSelectShippingDeviceVOList() { + return selectShippingDeviceVOList; + } + + public void setSelectShippingDeviceVOList(List 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} + + + + +
@@ -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("确定要删除这条记录吗？")) {