diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsDetailController.java
deleted file mode 100644
index 222838d3..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsDetailController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.ruoyi.manufacture.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.manufacture.domain.DeliveryGoodsDetail;
-import com.ruoyi.manufacture.service.IDeliveryGoodsDetailService;
-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.*;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import static com.ruoyi.common.core.domain.AjaxResult.Type.SUCCESS;
-
-/**
- * 发货通知单详情Controller
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-@Controller
-@RequestMapping("/manufacture/deliveryGoodsDetail")
-public class DeliveryGoodsDetailController extends BaseController
-{
-    private String prefix = "manufacture/deliveryGoodsDetail";
-
-    @Autowired
-    private IDeliveryGoodsDetailService deliveryGoodsDetailService;
-
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:view")
-    @GetMapping()
-    public String deliveryGoodsDetail()
-    {
-        return prefix + "/deliveryGoodsDetail";
-    }
-
-    /**
-     * 查询发货通知单详情列表
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        startPage();
-        List<DeliveryGoodsDetail> list = deliveryGoodsDetailService.selectDeliveryGoodsDetailList(deliveryGoodsDetail);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出发货通知单详情列表
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:export")
-    @Log(title = "发货通知单详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        List<DeliveryGoodsDetail> list = deliveryGoodsDetailService.selectDeliveryGoodsDetailList(deliveryGoodsDetail);
-        ExcelUtil<DeliveryGoodsDetail> util = new ExcelUtil<DeliveryGoodsDetail>(DeliveryGoodsDetail.class);
-        return util.exportExcel(list, "发货通知单详情数据");
-    }
-
-    /**
-     * 新增发货通知单详情
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存发货通知单详情
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:add")
-    @Log(title = "发货通知单详情", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        return toAjax(deliveryGoodsDetailService.insertDeliveryGoodsDetail(deliveryGoodsDetail));
-    }
-
-    /**
-     * 修改发货通知单详情
-     */
-    @GetMapping("/edit/{deliveryGoodsDetailId}")
-    public String edit(@PathVariable("deliveryGoodsDetailId") Long deliveryGoodsDetailId, ModelMap mmap)
-    {
-        DeliveryGoodsDetail deliveryGoodsDetail = deliveryGoodsDetailService.selectDeliveryGoodsDetailById(deliveryGoodsDetailId);
-        mmap.put("deliveryGoodsDetail", deliveryGoodsDetail);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存发货通知单详情
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:edit")
-    @Log(title = "发货通知单详情", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        return toAjax(deliveryGoodsDetailService.updateDeliveryGoodsDetail(deliveryGoodsDetail));
-    }
-
-    /**
-     * 删除发货通知单详情
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:remove")
-    @Log(title = "发货通知单详情", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(deliveryGoodsDetailService.deleteDeliveryGoodsDetailByIds(ids));
-    }
-
-
-    @RequiresPermissions("manufacture:deliveryGoodsDetail:add")
-    @Log(title = "发货通知单详情", businessType = BusinessType.INSERT)
-    @PostMapping("/addEditSave")
-    @ResponseBody
-    public AjaxResult addEditSave(@RequestParam(value = "data") String data)
-    {
-        //        反序列化
-        List<DeliveryGoodsDetail> deliveryGoodsDetailList = JSONObject.parseArray(data, DeliveryGoodsDetail.class);
-
-
-        for (int i=0;i<deliveryGoodsDetailList.size();i++) {
-
-            String id = String.valueOf(deliveryGoodsDetailService.selectDeliveryGoodsDetailById(deliveryGoodsDetailList.get(i).getDeliveryGoodsDetailId()));
-            if (Objects.equals(id, "null")) {
-                deliveryGoodsDetailService.insertDeliveryGoodsDetail(deliveryGoodsDetailList.get(i));
-            } else {
-                deliveryGoodsDetailService.updateDeliveryGoodsDetail(deliveryGoodsDetailList.get(i));
-            }
-        }
-        return new AjaxResult(SUCCESS, "test done");
-    }
-
-    @PostMapping("/removeSalesFinish")
-    @ResponseBody
-    public AjaxResult removeSalesFinish(@RequestParam(value = "ids") String ids) {
-//        System.out.println(ids);
-        ids=ids.replace("[","").replace("]","");
-        List<String> idList = Arrays.asList(ids.split(","));
-        for (int i=0;i<idList.size();i++) {
-            if (!("null".equals(idList.get(i)))) {
-                deliveryGoodsDetailService.deleteDeliveryGoodsDetailById(Long.valueOf(idList.get(i)));
-            }
-        }
-        return new AjaxResult(SUCCESS, "test done");
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsNoticeController.java
deleted file mode 100644
index 91e966e1..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/DeliveryGoodsNoticeController.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.ruoyi.manufacture.controller;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.util.MapUtils;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.metadata.style.WriteFont;
-import com.ruoyi.ck.utils.Result;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.manufacture.domain.DeliveryGoodsDetail;
-import com.ruoyi.manufacture.domain.DeliveryGoodsNotice;
-import com.ruoyi.manufacture.domain.exportDto.DeliveryGoodsDetailDto;
-import com.ruoyi.manufacture.domain.exportDto.DeliveryGoodsNoticeDto;
-import com.ruoyi.manufacture.service.IDeliveryGoodsDetailService;
-import com.ruoyi.manufacture.service.IDeliveryGoodsNoticeService;
-import com.ruoyi.purchase.domain.exportDto.PurchaseMaterialDto;
-import com.ruoyi.system.domain.SysCustomer;
-import com.ruoyi.system.domain.SysCustomerVo;
-import com.ruoyi.system.service.ISysCustomerService;
-import com.ruoyi.system.utils.CellStyleStrategy;
-import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log;
-
-/**
- * 发货通知单Controller
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-@Controller
-@RequestMapping("/manufacture/deliveryGoodsNotice")
-public class DeliveryGoodsNoticeController extends BaseController
-{
-    private String prefix = "manufacture/deliveryGoodsNotice";
-
-    @Autowired
-    private IDeliveryGoodsNoticeService deliveryGoodsNoticeService;
-    @Autowired
-    private IDeliveryGoodsDetailService deliveryGoodsDetailService;
-    @Autowired
-    private ISysCustomerService sysCustomerService;
-
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:view")
-    @GetMapping()
-    public String deliveryGoodsNotice()
-    {
-        return prefix + "/deliveryGoodsNotice";
-    }
-
-    /**
-     * 查询发货通知单列表
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        startPage();
-        List<DeliveryGoodsNotice> list = deliveryGoodsNoticeService.selectDeliveryGoodsNoticeList(deliveryGoodsNotice);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出发货通知单列表
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:export")
-    @Log(title = "发货通知单", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        List<DeliveryGoodsNotice> list = deliveryGoodsNoticeService.selectDeliveryGoodsNoticeList(deliveryGoodsNotice);
-        ExcelUtil<DeliveryGoodsNotice> util = new ExcelUtil<DeliveryGoodsNotice>(DeliveryGoodsNotice.class);
-        return util.exportExcel(list, "发货通知单数据");
-    }
-
-
-    /**
-     * 新增发货通知单
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存发货通知单
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:add")
-    @Log(title = "发货通知单", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        return toAjax(deliveryGoodsNoticeService.insertDeliveryGoodsNotice(deliveryGoodsNotice));
-    }
-
-    /**
-     * 修改发货通知单
-     */
-    @GetMapping("/edit/{deliveryGoodsNoticeId}")
-    public String edit(@PathVariable("deliveryGoodsNoticeId") Long deliveryGoodsNoticeId, ModelMap mmap)
-    {
-        DeliveryGoodsNotice deliveryGoodsNotice = deliveryGoodsNoticeService.selectDeliveryGoodsNoticeById(deliveryGoodsNoticeId);
-        mmap.put("deliveryGoodsNotice", deliveryGoodsNotice);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存发货通知单
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:edit")
-    @Log(title = "发货通知单", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        return toAjax(deliveryGoodsNoticeService.updateDeliveryGoodsNotice(deliveryGoodsNotice));
-    }
-
-    /**
-     * 删除发货通知单
-     */
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:remove")
-    @Log(title = "发货通知单", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(deliveryGoodsNoticeService.deleteDeliveryGoodsNoticeByIds(ids));
-    }
-
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:remove")
-    @Log(title = "发货通知单", businessType = BusinessType.DELETE)
-    @RequestMapping( "/removeSelected")
-    @ResponseBody
-    public String removeSelected(@RequestParam(value = "ids") String ids) {
-        System.out.println(ids);
-        String[] idsStr = ids.split(",");
-        for (int i = 0; i< idsStr.length; i++) {
-            DeliveryGoodsNotice deliveryGoodsNotice = deliveryGoodsNoticeService.selectDeliveryGoodsNoticeById(Long.valueOf(idsStr[i]));
-            DeliveryGoodsDetail deliveryGoodsDetail = new DeliveryGoodsDetail();
-            deliveryGoodsDetail.setNoticeOrderNumber(deliveryGoodsNotice.getNoticeOrderNumber());
-            List<DeliveryGoodsDetail> list = deliveryGoodsDetailService.selectDeliveryGoodsDetailList(deliveryGoodsDetail);
-            if (list.size()>0) {
-                for (int j=0;j<list.size();j++) {
-                    deliveryGoodsDetailService.deleteDeliveryGoodsDetailById(list.get(j).getDeliveryGoodsDetailId());
-                }
-            }
-        }
-        deliveryGoodsNoticeService.deleteDeliveryGoodsNoticeByIds(ids);
-        return "操作成功！";
-    }
-
-    @PostMapping("/id")
-    @ResponseBody
-    public Result getId() throws Exception {
-        return Result.getSuccessResult(deliveryGoodsNoticeService.getId());
-    }
-
-    @RequiresPermissions("manufacture:deliveryGoodsNotice:export")
-    @Log(title = "发货通知单", businessType = BusinessType.EXPORT)
-    @RequestMapping("/exportSelected/{deliveryGoodsNoticeId}")
-    @ResponseBody
-    public void exportSelected(@PathVariable("deliveryGoodsNoticeId") Long deliveryGoodsNoticeId, HttpServletResponse response) throws IOException {
-//
-
-        System.out.println(deliveryGoodsNoticeId);
-        DeliveryGoodsNotice deliveryGoodsNotice = deliveryGoodsNoticeService.selectDeliveryGoodsNoticeById(deliveryGoodsNoticeId);
-        DeliveryGoodsNoticeDto deliveryGoodsNoticeDto = new DeliveryGoodsNoticeDto();
-        BeanUtils.copyProperties(deliveryGoodsNotice,deliveryGoodsNoticeDto);
-
-        DeliveryGoodsDetail deliveryGoodsDetail = new DeliveryGoodsDetail();
-        deliveryGoodsDetail.setNoticeOrderNumber(deliveryGoodsNotice.getNoticeOrderNumber());
-
-        // 创建列合并工具类对象
-        ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
-
-        List<DeliveryGoodsDetail> deliveryGoodsDetailList = deliveryGoodsDetailService.selectDeliveryGoodsDetailList(deliveryGoodsDetail);
-        List<DeliveryGoodsDetailDto> deliveryGoodsDetailDtoList = new ArrayList<>();
-        double total = 0.00;
-        try {
-            int number = 0;
-            Iterator values= deliveryGoodsDetailList.iterator();
-            while(values.hasNext()) {
-                Object source = values.next();
-                DeliveryGoodsDetailDto target = DeliveryGoodsDetailDto.class.newInstance();
-                BeanUtils.copyProperties(source, target);
-                mergePrevColUtils.add(number+4,1,1);
-                mergePrevColUtils.add(number+4,3,1);
-                total = total + Double.parseDouble(target.getProductQuantity());
-                target.setNumber(++number);
-                deliveryGoodsDetailDtoList.add(target);
-            }
-        }catch (Exception e) {
-            log.error(">>>>>>异常<<<<<<", e);
-        }
-        System.out.println(deliveryGoodsDetailDtoList);
-
-        SysCustomer sysCustomer = new SysCustomer();
-        sysCustomer.setEnterpriseCode(deliveryGoodsNoticeDto.getEnterpriseCode());
-        sysCustomer.setEnterpriseName(deliveryGoodsNoticeDto.getEnterpriseName());
-        List<SysCustomer> sysCustomer1 = sysCustomerService.selectSysCustomerToList();
-        String contactNumber = sysCustomer1.get(0).getContactNumber();
-        String customerFax = sysCustomer1.get(0).getCustomerFax();
-
-        response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("发货通知单", "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-        String templateFileName = "C:\\exportTemplates\\exportDeliveryGoodsNotice.xlsx";
-        try (ExcelWriter excelWriter = EasyExcel
-                .write(response.getOutputStream(), PurchaseMaterialDto.class)
-                .withTemplate(templateFileName)
-                .registerWriteHandler(mergePrevColUtils)
-                //样式注册
-                .registerWriteHandler(horizontalCellStyleStrategyBuilder())
-                .build()) {
-            WriteSheet writeSheet = EasyExcel.writerSheet().build();
-            FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
-            excelWriter.fill(deliveryGoodsDetailDtoList, fillConfig, writeSheet);
-            Map<String, Object> map = MapUtils.newHashMap();
-//            map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
-            map.put("enterpriseName", deliveryGoodsNoticeDto.getEnterpriseName());
-            map.put("deliveryAddress", deliveryGoodsNoticeDto.getDeliveryAddress());
-            map.put("noticeOrderNumber", deliveryGoodsNoticeDto.getNoticeOrderNumber());
-            map.put("deliveryDate", deliveryGoodsNoticeDto.getDeliveryDate());
-            map.put("contactNumber", contactNumber);
-            map.put("customerFax", customerFax);
-            map.put("total", total);
-            excelWriter.fill(map, writeSheet);
-        }
-    }
-
-
-    public CellStyleStrategy horizontalCellStyleStrategyBuilder() {
-        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-        //设置头字体
-        WriteFont headWriteFont = new WriteFont();
-        headWriteFont.setFontHeightInPoints((short) 13);
-        headWriteFont.setBold(true);
-        headWriteCellStyle.setWriteFont(headWriteFont);
-        //设置头居中
-        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-        //内容策略
-        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-        //设置 水平居中
-        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-        //垂直居中
-        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        //单元格边框
-        contentWriteCellStyle.setBorderTop(BorderStyle.DASHED);
-        contentWriteCellStyle.setBorderLeft(BorderStyle.DASHED);
-      contentWriteCellStyle.setBorderRight(BorderStyle.DASHED);
-        contentWriteCellStyle.setBorderBottom(BorderStyle.DASHED);
-
-        return new CellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-    }
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java
deleted file mode 100644
index b6fa105a..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java
+++ /dev/null
@@ -1,485 +0,0 @@
-package com.ruoyi.manufacture.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 发货通知单详情对象 delivery_goods_detail
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-public class DeliveryGoodsDetail extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 发货通知单详情id */
-    private Long deliveryGoodsDetailId;
-
-    /** 出库单号 */
-    @Excel(name = "出库单号")
-    private String noticeOrderNumber;
-
-    @Excel(name = "出库状态")
-    private String deliverStatus;
-
-    /** 业务员 */
-    @Excel(name = "业务员")
-    private String finishProductName;
-
-    /** 关联销售单号 */
-    @Excel(name = "关联销售单号")
-    private String salesOrderNumber;
-
-    /** 出库类型 */
-    @Excel(name = "出库类型")
-    private String outboundType;
-
-    /** 订单类型 */
-    @Excel(name = "订单类型")
-    private String orderType;
-
-    /** 客户代码/ID */
-    @Excel(name = "客户ID")
-    private String enterpriseCode;
-
-    /** 客户公司名称 */
-    @Excel(name = "客户公司名称")
-    private String enterpriseName;
-
-    /** 客户订单 */
-    @Excel(name = "客户订单号")
-    private String customerNumber;
-
-
-    /** 数量 */
-    @Excel(name = "物料总量")
-    private String productQuantity;
-
-    /** 数量合计 */
-    @Excel(name = "数量合计")
-    private String amountMoney;
-
-    /** 不含税总价（RMB） */
-    @Excel(name = "不含税总价")
-    private BigDecimal allPriceExcludingTaxRmb;
-
-    /** 含税总价（RMB） */
-    @Excel(name = "含税总价")
-    private BigDecimal allPriceIncludesTax;
-
-    /** 不含税总价（美元） */
-    @Excel(name = "不含税总价")
-    private BigDecimal allPriceExcludingTaxDollar;
-
-
-    /** 计划交付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date plannedDeliveryTime;
-
-    /** 客户验收时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "客户验收时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date acceptanceTime;
-
-    /** 付款条件 */
-    @Excel(name = "付款条件")
-    private String paymentCondition;
-
-    /** 交付条件 */
-    @Excel(name = "交付条件")
-    private String deliveryCondition;
-
-    /** 收货联系人 */
-    @Excel(name = "收货联系人")
-    private String customerContact;
-
-    /** 联系电话 */
-    @Excel(name = "联系电话")
-    private String contactNumber;
-
-    /** 收货地址 */
-    @Excel(name = "收货地址")
-    private String contactAddress;
-
-    /** 送货日期*/
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deliverTime;
-
-
-
-    /** 成品代码 */
-    private String finishProductCode;
-
-
-
-    /** 规格型号 */
-    private String specificationModel;
-
-
-
-
-
-
-
-
-    /** 机种 */
-    private String typeMachine;
-
-    /** 单位 */
-    private String inventoryUnit;
-
-    /** 币别 */
-    private String commonCurrency;
-
-    /** 单价 */
-    private String processPrice;
-
-
-
-    /** Line# */
-    private String line;
-
-    /** 版本号 */
-    private String versionNumber;
-
-    /** 说明 */
-    private String salesExplain;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-
-
-
-
-    public void setDeliveryGoodsDetailId(Long deliveryGoodsDetailId) 
-    {
-        this.deliveryGoodsDetailId = deliveryGoodsDetailId;
-    }
-
-    public Long getDeliveryGoodsDetailId() 
-    {
-        return deliveryGoodsDetailId;
-    }
-    public void setNoticeOrderNumber(String noticeOrderNumber) 
-    {
-        this.noticeOrderNumber = noticeOrderNumber;
-    }
-
-    public String getNoticeOrderNumber() 
-    {
-        return noticeOrderNumber;
-    }
-    public void setSalesOrderNumber(String salesOrderNumber) 
-    {
-        this.salesOrderNumber = salesOrderNumber;
-    }
-
-    public String getSalesOrderNumber() 
-    {
-        return salesOrderNumber;
-    }
-    public void setEnterpriseCode(String enterpriseCode) 
-    {
-        this.enterpriseCode = enterpriseCode;
-    }
-
-    public String getEnterpriseCode() 
-    {
-        return enterpriseCode;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setFinishProductCode(String finishProductCode) 
-    {
-        this.finishProductCode = finishProductCode;
-    }
-
-    public String getFinishProductCode() 
-    {
-        return finishProductCode;
-    }
-    public void setFinishProductName(String finishProductName) 
-    {
-        this.finishProductName = finishProductName;
-    }
-
-    public String getFinishProductName() 
-    {
-        return finishProductName;
-    }
-    public void setSpecificationModel(String specificationModel) 
-    {
-        this.specificationModel = specificationModel;
-    }
-
-    public String getSpecificationModel() 
-    {
-        return specificationModel;
-    }
-    public void setCustomerNumber(String customerNumber) 
-    {
-        this.customerNumber = customerNumber;
-    }
-
-    public String getCustomerNumber() 
-    {
-        return customerNumber;
-    }
-    public void setTypeMachine(String typeMachine) 
-    {
-        this.typeMachine = typeMachine;
-    }
-
-    public String getTypeMachine() 
-    {
-        return typeMachine;
-    }
-    public void setInventoryUnit(String inventoryUnit) 
-    {
-        this.inventoryUnit = inventoryUnit;
-    }
-
-    public String getInventoryUnit() 
-    {
-        return inventoryUnit;
-    }
-    public void setCommonCurrency(String commonCurrency) 
-    {
-        this.commonCurrency = commonCurrency;
-    }
-
-    public String getCommonCurrency() 
-    {
-        return commonCurrency;
-    }
-    public void setProcessPrice(String processPrice) 
-    {
-        this.processPrice = processPrice;
-    }
-
-    public String getProcessPrice() 
-    {
-        return processPrice;
-    }
-    public void setProductQuantity(String productQuantity) 
-    {
-        this.productQuantity = productQuantity;
-    }
-
-    public String getProductQuantity() 
-    {
-        return productQuantity;
-    }
-    public void setAmountMoney(String amountMoney) 
-    {
-        this.amountMoney = amountMoney;
-    }
-
-    public String getAmountMoney() 
-    {
-        return amountMoney;
-    }
-    public void setLine(String line) 
-    {
-        this.line = line;
-    }
-
-    public String getLine() 
-    {
-        return line;
-    }
-    public void setVersionNumber(String versionNumber) 
-    {
-        this.versionNumber = versionNumber;
-    }
-
-    public String getVersionNumber() 
-    {
-        return versionNumber;
-    }
-    public void setSalesExplain(String salesExplain) 
-    {
-        this.salesExplain = salesExplain;
-    }
-
-    public String getSalesExplain() 
-    {
-        return salesExplain;
-    }
-    public void setStandbyOne(String standbyOne) 
-    {
-        this.standbyOne = standbyOne;
-    }
-
-    public String getStandbyOne() 
-    {
-        return standbyOne;
-    }
-    public void setStandbyTwo(String standbyTwo) 
-    {
-        this.standbyTwo = standbyTwo;
-    }
-
-    public String getStandbyTwo() 
-    {
-        return standbyTwo;
-    }
-
-    public String getDeliverStatus() {
-        return deliverStatus;
-    }
-
-    public void setDeliverStatus(String deliverStatus) {
-        this.deliverStatus = deliverStatus;
-    }
-
-    public String getOutboundType() {
-        return outboundType;
-    }
-
-    public void setOutboundType(String outboundType) {
-        this.outboundType = outboundType;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public BigDecimal getAllPriceExcludingTaxRmb() {
-        return allPriceExcludingTaxRmb;
-    }
-
-    public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) {
-        this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb;
-    }
-
-    public BigDecimal getAllPriceIncludesTax() {
-        return allPriceIncludesTax;
-    }
-
-    public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) {
-        this.allPriceIncludesTax = allPriceIncludesTax;
-    }
-
-    public BigDecimal getAllPriceExcludingTaxDollar() {
-        return allPriceExcludingTaxDollar;
-    }
-
-    public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) {
-        this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar;
-    }
-
-    public Date getPlannedDeliveryTime() {
-        return plannedDeliveryTime;
-    }
-
-    public void setPlannedDeliveryTime(Date plannedDeliveryTime) {
-        this.plannedDeliveryTime = plannedDeliveryTime;
-    }
-
-    public Date getAcceptanceTime() {
-        return acceptanceTime;
-    }
-
-    public void setAcceptanceTime(Date acceptanceTime) {
-        this.acceptanceTime = acceptanceTime;
-    }
-
-    public String getPaymentCondition() {
-        return paymentCondition;
-    }
-
-    public void setPaymentCondition(String paymentCondition) {
-        this.paymentCondition = paymentCondition;
-    }
-
-    public String getDeliveryCondition() {
-        return deliveryCondition;
-    }
-
-    public void setDeliveryCondition(String deliveryCondition) {
-        this.deliveryCondition = deliveryCondition;
-    }
-
-    public String getCustomerContact() {
-        return customerContact;
-    }
-
-    public void setCustomerContact(String customerContact) {
-        this.customerContact = customerContact;
-    }
-
-    public String getContactNumber() {
-        return contactNumber;
-    }
-
-    public void setContactNumber(String contactNumber) {
-        this.contactNumber = contactNumber;
-    }
-
-    public String getContactAddress() {
-        return contactAddress;
-    }
-
-    public void setContactAddress(String contactAddress) {
-        this.contactAddress = contactAddress;
-    }
-
-    public Date getDeliverTime() {
-        return deliverTime;
-    }
-
-    public void setDeliverTime(Date deliverTime) {
-        this.deliverTime = deliverTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deliveryGoodsDetailId", getDeliveryGoodsDetailId())
-            .append("noticeOrderNumber", getNoticeOrderNumber())
-            .append("salesOrderNumber", getSalesOrderNumber())
-            .append("enterpriseCode", getEnterpriseCode())
-            .append("enterpriseName", getEnterpriseName())
-            .append("finishProductCode", getFinishProductCode())
-            .append("finishProductName", getFinishProductName())
-            .append("specificationModel", getSpecificationModel())
-            .append("customerNumber", getCustomerNumber())
-            .append("typeMachine", getTypeMachine())
-            .append("inventoryUnit", getInventoryUnit())
-            .append("commonCurrency", getCommonCurrency())
-            .append("processPrice", getProcessPrice())
-            .append("productQuantity", getProductQuantity())
-            .append("amountMoney", getAmountMoney())
-            .append("line", getLine())
-            .append("versionNumber", getVersionNumber())
-            .append("salesExplain", getSalesExplain())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java
deleted file mode 100644
index d7c9113e..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java
+++ /dev/null
@@ -1,482 +0,0 @@
-package com.ruoyi.manufacture.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 出货资料 delivery_goods_notice
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-public class DeliveryGoodsNotice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 发货通知单id */
-    private Long deliveryGoodsNoticeId;
-
-    /** 出货资料单号 */
-    @Excel(name = "出货资料单号")
-    private String noticeOrderNumber;
-
-    /** 发货日期 */
-    @Excel(name = "发货日期")
-    private String deliveryDate;
-
-    /** 资料类型 */
-    @Excel(name = "资料类型")
-    private String informationType;
-
-    /** 模板类型 */
-    @Excel(name = "模板类型")
-    private String templateType;
-
-    /** 业务人员 */
-    @Excel(name = "业务人员")
-    private String businessMembers;
-
-    /** 关联出库单号 */
-    @Excel(name = "关联出库单号")
-    private String relatedDeliveryNumber;
-
-    /** 订单类型 */
-    @Excel(name = "订单类型")
-    private String orderType;
-
-    /** 客户代码 */
-    @Excel(name = "客户ID")
-    private String enterpriseCode;
-
-    /** 客户名称 */
-    @Excel(name = "客户公司名称")
-    private String enterpriseName;
-
-    /** 客户订单号 */
-    @Excel(name = "客户订单号")
-    private String customerNumber;
-
-
-    /** 物料数量 */
-    @Excel(name = "物料总量")
-    private String productQuantity;
-
-    /** 物料合计 */
-    @Excel(name = "物料合计")
-    private String amountMoney;
-
-    /** 不含税总价（RMB） */
-    @Excel(name = "不含税总价")
-    private BigDecimal allPriceExcludingTaxRmb;
-
-    /** 含税总价（RMB） */
-    @Excel(name = "含税总价")
-    private BigDecimal allPriceIncludesTax;
-
-    /** 不含税总价（美元） */
-    @Excel(name = "不含税总价")
-    private BigDecimal allPriceExcludingTaxDollar;
-
-
-    /** 计划交付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date plannedDeliveryTime;
-
-    /** 客户验收时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "客户验收时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date acceptanceTime;
-
-    /** 付款条件 */
-    @Excel(name = "付款条件")
-    private String paymentCondition;
-
-    /** 交付条件 */
-    @Excel(name = "交付条件")
-    private String deliveryCondition;
-
-    /** 联系人 */
-    @Excel(name = "联系人")
-    private String customerContact;
-
-
-    /** 联系电话 */
-    @Excel(name = "联系电话")
-    private String contactNumber;
-
-    /** 收货 */
-    @Excel(name = "收货地址")
-    private String deliveryAddress;
-
-    /** 送货日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deliverTime;
-
-
-    /** 客户厂区 */
-
-    private String customerFactory;
-
-    /** 内外销 */
-    private String exportSales;
-
-    /** 仓库编号 */
-    private String stockNumber;
-
-    /** 仓库名称 */
-    private String stockName;
-
-    /** 备注 */
-    private String remarks;
-
-    /** 制单人 */
-    private String voucherPreparation;
-
-    /** 发货否 */
-    private String deliveryGoodsFlag;
-
-    /** 录入时间 */
-    @Excel(name = "录入时间")
-    private String firstAddTime;
-
-    /** 修改时间 */
-    @Excel(name = "修改时间")
-    private String updateInfoTime;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-    public void setDeliveryGoodsNoticeId(Long deliveryGoodsNoticeId) 
-    {
-        this.deliveryGoodsNoticeId = deliveryGoodsNoticeId;
-    }
-
-    public Long getDeliveryGoodsNoticeId() 
-    {
-        return deliveryGoodsNoticeId;
-    }
-    public void setNoticeOrderNumber(String noticeOrderNumber) 
-    {
-        this.noticeOrderNumber = noticeOrderNumber;
-    }
-
-    public String getNoticeOrderNumber() 
-    {
-        return noticeOrderNumber;
-    }
-    public void setDeliveryDate(String deliveryDate) 
-    {
-        this.deliveryDate = deliveryDate;
-    }
-
-    public String getDeliveryDate() 
-    {
-        return deliveryDate;
-    }
-    public void setEnterpriseCode(String enterpriseCode) 
-    {
-        this.enterpriseCode = enterpriseCode;
-    }
-
-    public String getEnterpriseCode() 
-    {
-        return enterpriseCode;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setCustomerContact(String customerContact) 
-    {
-        this.customerContact = customerContact;
-    }
-
-    public String getCustomerContact() 
-    {
-        return customerContact;
-    }
-    public void setCustomerFactory(String customerFactory) 
-    {
-        this.customerFactory = customerFactory;
-    }
-
-    public String getCustomerFactory() 
-    {
-        return customerFactory;
-    }
-    public void setDeliveryAddress(String deliveryAddress) 
-    {
-        this.deliveryAddress = deliveryAddress;
-    }
-
-    public String getDeliveryAddress() 
-    {
-        return deliveryAddress;
-    }
-    public void setExportSales(String exportSales) 
-    {
-        this.exportSales = exportSales;
-    }
-
-    public String getExportSales() 
-    {
-        return exportSales;
-    }
-    public void setStockNumber(String stockNumber) 
-    {
-        this.stockNumber = stockNumber;
-    }
-
-    public String getStockNumber() 
-    {
-        return stockNumber;
-    }
-    public void setStockName(String stockName) 
-    {
-        this.stockName = stockName;
-    }
-
-    public String getStockName() 
-    {
-        return stockName;
-    }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-    public void setVoucherPreparation(String voucherPreparation) 
-    {
-        this.voucherPreparation = voucherPreparation;
-    }
-
-    public String getVoucherPreparation() 
-    {
-        return voucherPreparation;
-    }
-    public void setDeliveryGoodsFlag(String deliveryGoodsFlag) 
-    {
-        this.deliveryGoodsFlag = deliveryGoodsFlag;
-    }
-
-    public String getDeliveryGoodsFlag() 
-    {
-        return deliveryGoodsFlag;
-    }
-    public void setFirstAddTime(String firstAddTime)
-    {
-        this.firstAddTime = firstAddTime;
-    }
-
-    public String getFirstAddTime()
-    {
-        return firstAddTime;
-    }
-    public void setUpdateInfoTime(String updateInfoTime)
-    {
-        this.updateInfoTime = updateInfoTime;
-    }
-
-    public String getUpdateInfoTime()
-    {
-        return updateInfoTime;
-    }
-    public void setStandbyOne(String standbyOne) 
-    {
-        this.standbyOne = standbyOne;
-    }
-
-    public String getStandbyOne() 
-    {
-        return standbyOne;
-    }
-    public void setStandbyTwo(String standbyTwo) 
-    {
-        this.standbyTwo = standbyTwo;
-    }
-
-    public String getStandbyTwo() 
-    {
-        return standbyTwo;
-    }
-
-    public String getInformationType() {
-        return informationType;
-    }
-
-    public void setInformationType(String informationType) {
-        this.informationType = informationType;
-    }
-
-    public String getTemplateType() {
-        return templateType;
-    }
-
-    public void setTemplateType(String templateType) {
-        this.templateType = templateType;
-    }
-
-    public String getBusinessMembers() {
-        return businessMembers;
-    }
-
-    public void setBusinessMembers(String businessMembers) {
-        this.businessMembers = businessMembers;
-    }
-
-    public String getRelatedDeliveryNumber() {
-        return relatedDeliveryNumber;
-    }
-
-    public void setRelatedDeliveryNumber(String relatedDeliveryNumber) {
-        this.relatedDeliveryNumber = relatedDeliveryNumber;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getProductQuantity() {
-        return productQuantity;
-    }
-
-    public void setProductQuantity(String productQuantity) {
-        this.productQuantity = productQuantity;
-    }
-
-    public String getAmountMoney() {
-        return amountMoney;
-    }
-
-    public void setAmountMoney(String amountMoney) {
-        this.amountMoney = amountMoney;
-    }
-
-    public BigDecimal getAllPriceExcludingTaxRmb() {
-        return allPriceExcludingTaxRmb;
-    }
-
-    public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) {
-        this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb;
-    }
-
-    public BigDecimal getAllPriceIncludesTax() {
-        return allPriceIncludesTax;
-    }
-
-    public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) {
-        this.allPriceIncludesTax = allPriceIncludesTax;
-    }
-
-    public BigDecimal getAllPriceExcludingTaxDollar() {
-        return allPriceExcludingTaxDollar;
-    }
-
-    public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) {
-        this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar;
-    }
-
-    public Date getPlannedDeliveryTime() {
-        return plannedDeliveryTime;
-    }
-
-    public void setPlannedDeliveryTime(Date plannedDeliveryTime) {
-        this.plannedDeliveryTime = plannedDeliveryTime;
-    }
-
-    public Date getAcceptanceTime() {
-        return acceptanceTime;
-    }
-
-    public void setAcceptanceTime(Date acceptanceTime) {
-        this.acceptanceTime = acceptanceTime;
-    }
-
-    public String getPaymentCondition() {
-        return paymentCondition;
-    }
-
-    public void setPaymentCondition(String paymentCondition) {
-        this.paymentCondition = paymentCondition;
-    }
-
-    public String getDeliveryCondition() {
-        return deliveryCondition;
-    }
-
-    public void setDeliveryCondition(String deliveryCondition) {
-        this.deliveryCondition = deliveryCondition;
-    }
-
-    public String getCustomerNumber() {
-        return customerNumber;
-    }
-
-    public void setCustomerNumber(String customerNumber) {
-        this.customerNumber = customerNumber;
-    }
-
-    public Date getDeliverTime() {
-        return deliverTime;
-    }
-
-    public void setDeliverTime(Date deliverTime) {
-        this.deliverTime = deliverTime;
-    }
-
-    public String getContactNumber() {
-        return contactNumber;
-    }
-
-    public void setContactNumber(String contactNumber) {
-        this.contactNumber = contactNumber;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deliveryGoodsNoticeId", getDeliveryGoodsNoticeId())
-            .append("noticeOrderNumber", getNoticeOrderNumber())
-            .append("deliveryDate", getDeliveryDate())
-            .append("enterpriseCode", getEnterpriseCode())
-            .append("enterpriseName", getEnterpriseName())
-            .append("customerContact", getCustomerContact())
-            .append("customerFactory", getCustomerFactory())
-            .append("deliveryAddress", getDeliveryAddress())
-            .append("exportSales", getExportSales())
-            .append("stockNumber", getStockNumber())
-            .append("stockName", getStockName())
-            .append("remarks", getRemarks())
-            .append("voucherPreparation", getVoucherPreparation())
-            .append("deliveryGoodsFlag", getDeliveryGoodsFlag())
-            .append("firstAddTime", getFirstAddTime())
-            .append("updateInfoTime", getUpdateInfoTime())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsDetailDto.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsDetailDto.java
deleted file mode 100644
index 86c3a942..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsDetailDto.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package com.ruoyi.manufacture.domain.exportDto;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 发货通知单详情对象 delivery_goods_detail
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-public class DeliveryGoodsDetailDto extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    private Integer number;
-
-    /** 发货通知单详情id */
-    private Long deliveryGoodsDetailId;
-
-    /** 通知单号 */
-    @ExcelProperty("通知单号")
-    private String noticeOrderNumber;
-
-    /** 订单号码 */
-    @ExcelProperty("订单号码")
-    private String salesOrderNumber;
-
-    /** 客户代码 */
-    @ExcelProperty("客户代码")
-    private String enterpriseCode;
-
-    /** 客户名称 */
-    @ExcelProperty("客户名称")
-    private String enterpriseName;
-
-    /** 成品代码 */
-    @ExcelProperty("成品代码")
-    private String finishProductCode;
-
-    /** 成品名称 */
-    @ExcelProperty("成品名称")
-    private String finishProductName;
-
-    /** 规格型号 */
-    @ExcelProperty("规格型号")
-    private String specificationModel;
-
-    /** 客户料号 */
-    @ExcelProperty("客户料号")
-    private String customerNumber;
-
-    /** 机种 */
-    @ExcelProperty("机种")
-    private String typeMachine;
-
-    /** 单位 */
-    @ExcelProperty("单位")
-    private String inventoryUnit;
-
-    /** 币别 */
-    @ExcelProperty("币别")
-    private String commonCurrency;
-
-    /** 单价 */
-    @ExcelProperty("单价")
-    private String processPrice;
-
-    /** 数量 */
-    @ExcelProperty("数量")
-    private String productQuantity;
-
-    /** 金额 */
-    @ExcelProperty("金额")
-    private String amountMoney;
-
-    /** Line# */
-    @ExcelProperty("Line#")
-    private String line;
-
-    /** 版本号 */
-    @ExcelProperty("版本号")
-    private String versionNumber;
-
-    /** 说明 */
-    @ExcelProperty("说明")
-    private String salesExplain;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public void setDeliveryGoodsDetailId(Long deliveryGoodsDetailId)
-    {
-        this.deliveryGoodsDetailId = deliveryGoodsDetailId;
-    }
-
-    public Long getDeliveryGoodsDetailId() 
-    {
-        return deliveryGoodsDetailId;
-    }
-    public void setNoticeOrderNumber(String noticeOrderNumber) 
-    {
-        this.noticeOrderNumber = noticeOrderNumber;
-    }
-
-    public String getNoticeOrderNumber() 
-    {
-        return noticeOrderNumber;
-    }
-    public void setSalesOrderNumber(String salesOrderNumber) 
-    {
-        this.salesOrderNumber = salesOrderNumber;
-    }
-
-    public String getSalesOrderNumber() 
-    {
-        return salesOrderNumber;
-    }
-    public void setEnterpriseCode(String enterpriseCode) 
-    {
-        this.enterpriseCode = enterpriseCode;
-    }
-
-    public String getEnterpriseCode() 
-    {
-        return enterpriseCode;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setFinishProductCode(String finishProductCode) 
-    {
-        this.finishProductCode = finishProductCode;
-    }
-
-    public String getFinishProductCode() 
-    {
-        return finishProductCode;
-    }
-    public void setFinishProductName(String finishProductName) 
-    {
-        this.finishProductName = finishProductName;
-    }
-
-    public String getFinishProductName() 
-    {
-        return finishProductName;
-    }
-    public void setSpecificationModel(String specificationModel) 
-    {
-        this.specificationModel = specificationModel;
-    }
-
-    public String getSpecificationModel() 
-    {
-        return specificationModel;
-    }
-    public void setCustomerNumber(String customerNumber) 
-    {
-        this.customerNumber = customerNumber;
-    }
-
-    public String getCustomerNumber() 
-    {
-        return customerNumber;
-    }
-    public void setTypeMachine(String typeMachine) 
-    {
-        this.typeMachine = typeMachine;
-    }
-
-    public String getTypeMachine() 
-    {
-        return typeMachine;
-    }
-    public void setInventoryUnit(String inventoryUnit) 
-    {
-        this.inventoryUnit = inventoryUnit;
-    }
-
-    public String getInventoryUnit() 
-    {
-        return inventoryUnit;
-    }
-    public void setCommonCurrency(String commonCurrency) 
-    {
-        this.commonCurrency = commonCurrency;
-    }
-
-    public String getCommonCurrency() 
-    {
-        return commonCurrency;
-    }
-    public void setProcessPrice(String processPrice) 
-    {
-        this.processPrice = processPrice;
-    }
-
-    public String getProcessPrice() 
-    {
-        return processPrice;
-    }
-    public void setProductQuantity(String productQuantity) 
-    {
-        this.productQuantity = productQuantity;
-    }
-
-    public String getProductQuantity() 
-    {
-        return productQuantity;
-    }
-    public void setAmountMoney(String amountMoney) 
-    {
-        this.amountMoney = amountMoney;
-    }
-
-    public String getAmountMoney() 
-    {
-        return amountMoney;
-    }
-    public void setLine(String line) 
-    {
-        this.line = line;
-    }
-
-    public String getLine() 
-    {
-        return line;
-    }
-    public void setVersionNumber(String versionNumber) 
-    {
-        this.versionNumber = versionNumber;
-    }
-
-    public String getVersionNumber() 
-    {
-        return versionNumber;
-    }
-    public void setSalesExplain(String salesExplain) 
-    {
-        this.salesExplain = salesExplain;
-    }
-
-    public String getSalesExplain() 
-    {
-        return salesExplain;
-    }
-    public void setStandbyOne(String standbyOne) 
-    {
-        this.standbyOne = standbyOne;
-    }
-
-    public String getStandbyOne() 
-    {
-        return standbyOne;
-    }
-    public void setStandbyTwo(String standbyTwo) 
-    {
-        this.standbyTwo = standbyTwo;
-    }
-
-    public String getStandbyTwo() 
-    {
-        return standbyTwo;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("number", getNumber())
-            .append("deliveryGoodsDetailId", getDeliveryGoodsDetailId())
-            .append("noticeOrderNumber", getNoticeOrderNumber())
-            .append("salesOrderNumber", getSalesOrderNumber())
-            .append("enterpriseCode", getEnterpriseCode())
-            .append("enterpriseName", getEnterpriseName())
-            .append("finishProductCode", getFinishProductCode())
-            .append("finishProductName", getFinishProductName())
-            .append("specificationModel", getSpecificationModel())
-            .append("customerNumber", getCustomerNumber())
-            .append("typeMachine", getTypeMachine())
-            .append("inventoryUnit", getInventoryUnit())
-            .append("commonCurrency", getCommonCurrency())
-            .append("processPrice", getProcessPrice())
-            .append("productQuantity", getProductQuantity())
-            .append("amountMoney", getAmountMoney())
-            .append("line", getLine())
-            .append("versionNumber", getVersionNumber())
-            .append("salesExplain", getSalesExplain())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsNoticeDto.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsNoticeDto.java
deleted file mode 100644
index e130a9dc..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/DeliveryGoodsNoticeDto.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.ruoyi.manufacture.domain.exportDto;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 发货通知单对象 delivery_goods_notice
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-public class DeliveryGoodsNoticeDto extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 发货通知单id */
-    private Long deliveryGoodsNoticeId;
-
-    /** 通知单号 */
-    @ExcelProperty("通知单号")
-    private String noticeOrderNumber;
-
-    /** 发货日期 */
-    @ExcelProperty("发货日期")
-    private String deliveryDate;
-
-    /** 客户代码 */
-    @ExcelProperty("客户代码")
-    private String enterpriseCode;
-
-    /** 客户名称 */
-    @ExcelProperty("客户名称")
-    private String enterpriseName;
-
-    /** 联系人 */
-    @ExcelProperty("联系人")
-    private String customerContact;
-
-    /** 客户厂区 */
-    @ExcelProperty("客户厂区")
-    private String customerFactory;
-
-    /** 送货地址 */
-    @ExcelProperty("送货地址")
-    private String deliveryAddress;
-
-    /** 内外销 */
-    @ExcelProperty("内外销")
-    private String exportSales;
-
-    /** 仓库编号 */
-    @ExcelProperty("仓库编号")
-    private String stockNumber;
-
-    /** 仓库名称 */
-    @ExcelProperty("仓库名称")
-    private String stockName;
-
-    /** 备注 */
-    @ExcelProperty("备注")
-    private String remarks;
-
-    /** 制单人 */
-    @ExcelProperty("制单人")
-    private String voucherPreparation;
-
-    /** 发货否 */
-    @ExcelProperty("发货否")
-    private String deliveryGoodsFlag;
-
-    /** 录入时间 */
-    @ExcelProperty("录入时间")
-    private String firstAddTime;
-
-    /** 修改时间 */
-    @ExcelProperty("修改时间")
-    private String updateInfoTime;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-    public void setDeliveryGoodsNoticeId(Long deliveryGoodsNoticeId) 
-    {
-        this.deliveryGoodsNoticeId = deliveryGoodsNoticeId;
-    }
-
-    public Long getDeliveryGoodsNoticeId() 
-    {
-        return deliveryGoodsNoticeId;
-    }
-    public void setNoticeOrderNumber(String noticeOrderNumber) 
-    {
-        this.noticeOrderNumber = noticeOrderNumber;
-    }
-
-    public String getNoticeOrderNumber() 
-    {
-        return noticeOrderNumber;
-    }
-    public void setDeliveryDate(String deliveryDate) 
-    {
-        this.deliveryDate = deliveryDate;
-    }
-
-    public String getDeliveryDate() 
-    {
-        return deliveryDate;
-    }
-    public void setEnterpriseCode(String enterpriseCode) 
-    {
-        this.enterpriseCode = enterpriseCode;
-    }
-
-    public String getEnterpriseCode() 
-    {
-        return enterpriseCode;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setCustomerContact(String customerContact) 
-    {
-        this.customerContact = customerContact;
-    }
-
-    public String getCustomerContact() 
-    {
-        return customerContact;
-    }
-    public void setCustomerFactory(String customerFactory) 
-    {
-        this.customerFactory = customerFactory;
-    }
-
-    public String getCustomerFactory() 
-    {
-        return customerFactory;
-    }
-    public void setDeliveryAddress(String deliveryAddress) 
-    {
-        this.deliveryAddress = deliveryAddress;
-    }
-
-    public String getDeliveryAddress() 
-    {
-        return deliveryAddress;
-    }
-    public void setExportSales(String exportSales) 
-    {
-        this.exportSales = exportSales;
-    }
-
-    public String getExportSales() 
-    {
-        return exportSales;
-    }
-    public void setStockNumber(String stockNumber) 
-    {
-        this.stockNumber = stockNumber;
-    }
-
-    public String getStockNumber() 
-    {
-        return stockNumber;
-    }
-    public void setStockName(String stockName) 
-    {
-        this.stockName = stockName;
-    }
-
-    public String getStockName() 
-    {
-        return stockName;
-    }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-    public void setVoucherPreparation(String voucherPreparation) 
-    {
-        this.voucherPreparation = voucherPreparation;
-    }
-
-    public String getVoucherPreparation() 
-    {
-        return voucherPreparation;
-    }
-    public void setDeliveryGoodsFlag(String deliveryGoodsFlag) 
-    {
-        this.deliveryGoodsFlag = deliveryGoodsFlag;
-    }
-
-    public String getDeliveryGoodsFlag() 
-    {
-        return deliveryGoodsFlag;
-    }
-    public void setFirstAddTime(String firstAddTime) 
-    {
-        this.firstAddTime = firstAddTime;
-    }
-
-    public String getFirstAddTime() 
-    {
-        return firstAddTime;
-    }
-    public void setUpdateInfoTime(String updateInfoTime) 
-    {
-        this.updateInfoTime = updateInfoTime;
-    }
-
-    public String getUpdateInfoTime() 
-    {
-        return updateInfoTime;
-    }
-    public void setStandbyOne(String standbyOne) 
-    {
-        this.standbyOne = standbyOne;
-    }
-
-    public String getStandbyOne() 
-    {
-        return standbyOne;
-    }
-    public void setStandbyTwo(String standbyTwo) 
-    {
-        this.standbyTwo = standbyTwo;
-    }
-
-    public String getStandbyTwo() 
-    {
-        return standbyTwo;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deliveryGoodsNoticeId", getDeliveryGoodsNoticeId())
-            .append("noticeOrderNumber", getNoticeOrderNumber())
-            .append("deliveryDate", getDeliveryDate())
-            .append("enterpriseCode", getEnterpriseCode())
-            .append("enterpriseName", getEnterpriseName())
-            .append("customerContact", getCustomerContact())
-            .append("customerFactory", getCustomerFactory())
-            .append("deliveryAddress", getDeliveryAddress())
-            .append("exportSales", getExportSales())
-            .append("stockNumber", getStockNumber())
-            .append("stockName", getStockName())
-            .append("remarks", getRemarks())
-            .append("voucherPreparation", getVoucherPreparation())
-            .append("deliveryGoodsFlag", getDeliveryGoodsFlag())
-            .append("firstAddTime", getFirstAddTime())
-            .append("updateInfoTime", getUpdateInfoTime())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsDetailMapper.java
deleted file mode 100644
index 64b53713..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsDetailMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.manufacture.mapper;
-
-import java.util.List;
-import com.ruoyi.manufacture.domain.DeliveryGoodsDetail;
-
-/**
- * 发货通知单详情Mapper接口
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-public interface DeliveryGoodsDetailMapper 
-{
-    /**
-     * 查询发货通知单详情
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 发货通知单详情
-     */
-    public DeliveryGoodsDetail selectDeliveryGoodsDetailById(Long deliveryGoodsDetailId);
-
-    /**
-     * 查询发货通知单详情列表
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 发货通知单详情集合
-     */
-    public List<DeliveryGoodsDetail> selectDeliveryGoodsDetailList(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 新增发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    public int insertDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 修改发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    public int updateDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 删除发货通知单详情
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsDetailById(Long deliveryGoodsDetailId);
-
-    /**
-     * 批量删除发货通知单详情
-     * 
-     * @param deliveryGoodsDetailIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsDetailByIds(String[] deliveryGoodsDetailIds);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsNoticeMapper.java
deleted file mode 100644
index ad2e59e7..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/DeliveryGoodsNoticeMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ruoyi.manufacture.mapper;
-
-import com.ruoyi.manufacture.domain.DeliveryGoodsNotice;
-
-import java.util.List;
-
-/**
- * 发货通知单Mapper接口
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-public interface DeliveryGoodsNoticeMapper 
-{
-    /**
-     * 查询发货通知单
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 发货通知单
-     */
-    public DeliveryGoodsNotice selectDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId);
-
-    /**
-     * 查询发货通知单列表
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 发货通知单集合
-     */
-    public List<DeliveryGoodsNotice> selectDeliveryGoodsNoticeList(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 新增发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    public int insertDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 修改发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    public int updateDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 删除发货通知单
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId);
-
-    /**
-     * 批量删除发货通知单
-     * 
-     * @param deliveryGoodsNoticeIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsNoticeByIds(String[] deliveryGoodsNoticeIds);
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsDetailService.java
deleted file mode 100644
index d3fc621d..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsDetailService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.manufacture.service;
-
-import java.util.List;
-import com.ruoyi.manufacture.domain.DeliveryGoodsDetail;
-
-/**
- * 发货通知单详情Service接口
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-public interface IDeliveryGoodsDetailService 
-{
-    /**
-     * 查询发货通知单详情
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 发货通知单详情
-     */
-    public DeliveryGoodsDetail selectDeliveryGoodsDetailById(Long deliveryGoodsDetailId);
-
-    /**
-     * 查询发货通知单详情列表
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 发货通知单详情集合
-     */
-    public List<DeliveryGoodsDetail> selectDeliveryGoodsDetailList(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 新增发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    public int insertDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 修改发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    public int updateDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail);
-
-    /**
-     * 批量删除发货通知单详情
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsDetailByIds(String ids);
-
-    /**
-     * 删除发货通知单详情信息
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsDetailById(Long deliveryGoodsDetailId);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsNoticeService.java
deleted file mode 100644
index d89accc1..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IDeliveryGoodsNoticeService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ruoyi.manufacture.service;
-
-import com.ruoyi.manufacture.domain.DeliveryGoodsNotice;
-
-import java.util.List;
-
-/**
- * 发货通知单Service接口
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-public interface IDeliveryGoodsNoticeService 
-{
-    /**
-     * 查询发货通知单
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 发货通知单
-     */
-    public DeliveryGoodsNotice selectDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId);
-
-    /**
-     * 查询发货通知单列表
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 发货通知单集合
-     */
-    public List<DeliveryGoodsNotice> selectDeliveryGoodsNoticeList(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 新增发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    public int insertDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 修改发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    public int updateDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice);
-
-    /**
-     * 批量删除发货通知单
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsNoticeByIds(String ids);
-
-    /**
-     * 删除发货通知单信息
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 结果
-     */
-    public int deleteDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId);
-
-    public String getId();
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsDetailServiceImpl.java
deleted file mode 100644
index 3d8395b3..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsDetailServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.manufacture.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.manufacture.mapper.DeliveryGoodsDetailMapper;
-import com.ruoyi.manufacture.domain.DeliveryGoodsDetail;
-import com.ruoyi.manufacture.service.IDeliveryGoodsDetailService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 发货通知单详情Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-04-12
- */
-@Service
-public class DeliveryGoodsDetailServiceImpl implements IDeliveryGoodsDetailService 
-{
-    @Autowired
-    private DeliveryGoodsDetailMapper deliveryGoodsDetailMapper;
-
-    /**
-     * 查询发货通知单详情
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 发货通知单详情
-     */
-    @Override
-    public DeliveryGoodsDetail selectDeliveryGoodsDetailById(Long deliveryGoodsDetailId)
-    {
-        return deliveryGoodsDetailMapper.selectDeliveryGoodsDetailById(deliveryGoodsDetailId);
-    }
-
-    /**
-     * 查询发货通知单详情列表
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 发货通知单详情
-     */
-    @Override
-    public List<DeliveryGoodsDetail> selectDeliveryGoodsDetailList(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        return deliveryGoodsDetailMapper.selectDeliveryGoodsDetailList(deliveryGoodsDetail);
-    }
-
-    /**
-     * 新增发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    @Override
-    public int insertDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        return deliveryGoodsDetailMapper.insertDeliveryGoodsDetail(deliveryGoodsDetail);
-    }
-
-    /**
-     * 修改发货通知单详情
-     * 
-     * @param deliveryGoodsDetail 发货通知单详情
-     * @return 结果
-     */
-    @Override
-    public int updateDeliveryGoodsDetail(DeliveryGoodsDetail deliveryGoodsDetail)
-    {
-        return deliveryGoodsDetailMapper.updateDeliveryGoodsDetail(deliveryGoodsDetail);
-    }
-
-    /**
-     * 删除发货通知单详情对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDeliveryGoodsDetailByIds(String ids)
-    {
-        return deliveryGoodsDetailMapper.deleteDeliveryGoodsDetailByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除发货通知单详情信息
-     * 
-     * @param deliveryGoodsDetailId 发货通知单详情ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDeliveryGoodsDetailById(Long deliveryGoodsDetailId)
-    {
-        return deliveryGoodsDetailMapper.deleteDeliveryGoodsDetailById(deliveryGoodsDetailId);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java
deleted file mode 100644
index 4d34e3e6..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.manufacture.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.manufacture.domain.DeliveryGoodsNotice;
-import com.ruoyi.manufacture.mapper.DeliveryGoodsNoticeMapper;
-import com.ruoyi.manufacture.service.IDeliveryGoodsNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-/**
- * 发货通知单Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-04-11
- */
-@Service
-public class DeliveryGoodsNoticeServiceImpl implements IDeliveryGoodsNoticeService 
-{
-    @Autowired
-    private DeliveryGoodsNoticeMapper deliveryGoodsNoticeMapper;
-
-    /**
-     * 查询发货通知单
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 发货通知单
-     */
-    @Override
-    public DeliveryGoodsNotice selectDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId)
-    {
-        return deliveryGoodsNoticeMapper.selectDeliveryGoodsNoticeById(deliveryGoodsNoticeId);
-    }
-
-    /**
-     * 查询发货通知单列表
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 发货通知单
-     */
-    @Override
-    public List<DeliveryGoodsNotice> selectDeliveryGoodsNoticeList(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        return deliveryGoodsNoticeMapper.selectDeliveryGoodsNoticeList(deliveryGoodsNotice);
-    }
-
-    /**
-     * 新增发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    @Override
-    public int insertDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        return deliveryGoodsNoticeMapper.insertDeliveryGoodsNotice(deliveryGoodsNotice);
-    }
-
-    /**
-     * 修改发货通知单
-     * 
-     * @param deliveryGoodsNotice 发货通知单
-     * @return 结果
-     */
-    @Override
-    public int updateDeliveryGoodsNotice(DeliveryGoodsNotice deliveryGoodsNotice)
-    {
-        return deliveryGoodsNoticeMapper.updateDeliveryGoodsNotice(deliveryGoodsNotice);
-    }
-
-    /**
-     * 删除发货通知单对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDeliveryGoodsNoticeByIds(String ids)
-    {
-        return deliveryGoodsNoticeMapper.deleteDeliveryGoodsNoticeByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除发货通知单信息
-     * 
-     * @param deliveryGoodsNoticeId 发货通知单ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDeliveryGoodsNoticeById(Long deliveryGoodsNoticeId)
-    {
-        return deliveryGoodsNoticeMapper.deleteDeliveryGoodsNoticeById(deliveryGoodsNoticeId);
-    }
-
-    @Override
-    public String getId() {
-        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
-        return "SCP" + time.substring(2);
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml
deleted file mode 100644
index 916ed7da..00000000
--- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.manufacture.mapper.DeliveryGoodsDetailMapper">
-    
-    <resultMap type="DeliveryGoodsDetail" id="DeliveryGoodsDetailResult">
-        <result property="deliveryGoodsDetailId"    column="delivery_goods_detail_id"    />
-        <result property="noticeOrderNumber"    column="notice_order_number"    />
-        <result property="salesOrderNumber"    column="sales_order_number"    />
-        <result property="enterpriseCode"    column="enterprise_code"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="finishProductCode"    column="finish_product_code"    />
-        <result property="finishProductName"    column="finish_product_name"    />
-        <result property="specificationModel"    column="specification_model"    />
-        <result property="customerNumber"    column="customer_number"    />
-        <result property="typeMachine"    column="type_machine"    />
-        <result property="inventoryUnit"    column="inventory_unit"    />
-        <result property="commonCurrency"    column="common_currency"    />
-        <result property="processPrice"    column="process_price"    />
-        <result property="productQuantity"    column="product_quantity"    />
-        <result property="amountMoney"    column="amount_money"    />
-        <result property="line"    column="line"    />
-        <result property="versionNumber"    column="version_number"    />
-        <result property="salesExplain"    column="sales_explain"    />
-        <result property="standbyOne"    column="standby_one"    />
-        <result property="standbyTwo"    column="standby_two"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="deliverStatus"    column="deliver_status"    />
-        <result property="outboundType"    column="outbound_type"    />
-        <result property="orderType"    column="order_type"    />
-        <result property="contactAddress"    column="contact_address"    />
-        <result property="customerContact"    column="customer_contact"    />
-        <result property="contactNumber"    column="contact_number"    />
-        <result property="allPriceExcludingTaxRmb"    column="all_price_excluding_tax_rmb"    />
-        <result property="allPriceExcludingTaxDollar"    column="all_price_excluding_tax_dollar"    />
-        <result property="allPriceIncludesTax"    column="all_price_includes_tax"    />
-        <result property="plannedDeliveryTime"    column="planned_delivery_time"    />
-        <result property="acceptanceTime"    column="acceptance_time"    />
-        <result property="paymentCondition"    column="payment_condition"    />
-        <result property="deliveryCondition"    column="delivery_condition"    />
-        <result property="deliverTime"    column="deliver_time"    />
-    </resultMap>
-
-<!--    <sql id="selectDeliveryGoodsDetailVo">-->
-<!--        select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two,create_by, create_time, update_by, update_time, remark from delivery_goods_detail-->
-<!--    </sql>-->
-
-    <sql id="selectDeliveryGoodsDetailVo">
-        select delivery_goods_detail_id, deliver_status,deliver_time,notice_order_number, sales_order_number, enterprise_code, enterprise_name, outbound_type, order_type, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, sales_explain, contact_address, customer_contact, contact_number, create_time, create_by, update_by, update_time, remark, all_price_excluding_tax_rmb, all_price_excluding_tax_dollar, all_price_includes_tax, planned_delivery_time, acceptance_time, payment_condition, delivery_condition from delivery_goods_detail
-    </sql>
-    <select id="selectDeliveryGoodsDetailList" parameterType="DeliveryGoodsDetail" resultMap="DeliveryGoodsDetailResult">
-        <include refid="selectDeliveryGoodsDetailVo"/>
-        <where>  
-            <if test="noticeOrderNumber != null  and noticeOrderNumber != ''"> and notice_order_number like concat('%', #{noticeOrderNumber}, '%')</if>
-            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
-            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="finishProductCode != null  and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
-            <if test="finishProductName != null  and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectDeliveryGoodsDetailById" parameterType="Long" resultMap="DeliveryGoodsDetailResult">
-        <include refid="selectDeliveryGoodsDetailVo"/>
-        where delivery_goods_detail_id = #{deliveryGoodsDetailId}
-    </select>
-        
-    <insert id="insertDeliveryGoodsDetail" parameterType="DeliveryGoodsDetail">
-        insert into delivery_goods_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deliveryGoodsDetailId != null">delivery_goods_detail_id,</if>
-            <if test="noticeOrderNumber != null">notice_order_number,</if>
-            <if test="salesOrderNumber != null">sales_order_number,</if>
-            <if test="enterpriseCode != null">enterprise_code,</if>
-            <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="finishProductCode != null">finish_product_code,</if>
-            <if test="finishProductName != null">finish_product_name,</if>
-            <if test="specificationModel != null">specification_model,</if>
-            <if test="customerNumber != null">customer_number,</if>
-            <if test="typeMachine != null">type_machine,</if>
-            <if test="inventoryUnit != null">inventory_unit,</if>
-            <if test="commonCurrency != null">common_currency,</if>
-            <if test="processPrice != null">process_price,</if>
-            <if test="productQuantity != null">product_quantity,</if>
-            <if test="amountMoney != null">amount_money,</if>
-            <if test="line != null">line,</if>
-            <if test="versionNumber != null">version_number,</if>
-            <if test="salesExplain != null">sales_explain,</if>
-            <if test="standbyOne != null">standby_one,</if>
-            <if test="standbyTwo != null">standby_two,</if>
-            <if test="createBy != null">create_by,</if>
-            create_time
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deliveryGoodsDetailId != null">#{deliveryGoodsDetailId},</if>
-            <if test="noticeOrderNumber != null">#{noticeOrderNumber},</if>
-            <if test="salesOrderNumber != null">#{salesOrderNumber},</if>
-            <if test="enterpriseCode != null">#{enterpriseCode},</if>
-            <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="finishProductCode != null">#{finishProductCode},</if>
-            <if test="finishProductName != null">#{finishProductName},</if>
-            <if test="specificationModel != null">#{specificationModel},</if>
-            <if test="customerNumber != null">#{customerNumber},</if>
-            <if test="typeMachine != null">#{typeMachine},</if>
-            <if test="inventoryUnit != null">#{inventoryUnit},</if>
-            <if test="commonCurrency != null">#{commonCurrency},</if>
-            <if test="processPrice != null">#{processPrice},</if>
-            <if test="productQuantity != null">#{productQuantity},</if>
-            <if test="amountMoney != null">#{amountMoney},</if>
-            <if test="line != null">#{line},</if>
-            <if test="versionNumber != null">#{versionNumber},</if>
-            <if test="salesExplain != null">#{salesExplain},</if>
-            <if test="standbyOne != null">#{standbyOne},</if>
-            <if test="standbyTwo != null">#{standbyTwo},</if>
-            <if test="createBy != null">#{createBy},</if>
-            now()
-         </trim>
-    </insert>
-
-    <update id="updateDeliveryGoodsDetail" parameterType="DeliveryGoodsDetail">
-        update delivery_goods_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="noticeOrderNumber != null">notice_order_number = #{noticeOrderNumber},</if>
-            <if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
-            <if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
-            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
-            <if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
-            <if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
-            <if test="specificationModel != null">specification_model = #{specificationModel},</if>
-            <if test="customerNumber != null">customer_number = #{customerNumber},</if>
-            <if test="typeMachine != null">type_machine = #{typeMachine},</if>
-            <if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
-            <if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
-            <if test="processPrice != null">process_price = #{processPrice},</if>
-            <if test="productQuantity != null">product_quantity = #{productQuantity},</if>
-            <if test="amountMoney != null">amount_money = #{amountMoney},</if>
-            <if test="line != null">line = #{line},</if>
-            <if test="versionNumber != null">version_number = #{versionNumber},</if>
-            <if test="salesExplain != null">sales_explain = #{salesExplain},</if>
-            <if test="standbyOne != null">standby_one = #{standbyOne},</if>
-            <if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            update_time = CONCAT_WS(',',NOW(),update_time),
-        </trim>
-        where delivery_goods_detail_id = #{deliveryGoodsDetailId}
-    </update>
-
-    <delete id="deleteDeliveryGoodsDetailById" parameterType="Long">
-        delete from delivery_goods_detail where delivery_goods_detail_id = #{deliveryGoodsDetailId}
-    </delete>
-
-    <delete id="deleteDeliveryGoodsDetailByIds" parameterType="String">
-        delete from delivery_goods_detail where delivery_goods_detail_id in 
-        <foreach item="deliveryGoodsDetailId" collection="array" open="(" separator="," close=")">
-            #{deliveryGoodsDetailId}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
deleted file mode 100644
index 49727d9b..00000000
--- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.manufacture.mapper.DeliveryGoodsNoticeMapper">
-    
-<!--    <resultMap type="DeliveryGoodsNotice" id="DeliveryGoodsNoticeResult">-->
-<!--        <result property="deliveryGoodsNoticeId"    column="delivery_goods_notice_id"    />-->
-<!--        <result property="noticeOrderNumber"    column="notice_order_number"    />-->
-<!--        <result property="deliveryDate"    column="delivery_date"    />-->
-<!--        <result property="enterpriseCode"    column="enterprise_code"    />-->
-<!--        <result property="enterpriseName"    column="enterprise_name"    />-->
-<!--        <result property="customerContact"    column="customer_contact"    />-->
-<!--        <result property="customerFactory"    column="customer_factory"    />-->
-<!--        <result property="deliveryAddress"    column="delivery_address"    />-->
-<!--        <result property="exportSales"    column="export_sales"    />-->
-<!--        <result property="stockNumber"    column="stock_number"    />-->
-<!--        <result property="stockName"    column="stock_name"    />-->
-<!--        <result property="remarks"    column="remarks"    />-->
-<!--        <result property="voucherPreparation"    column="voucher_preparation"    />-->
-<!--        <result property="deliveryGoodsFlag"    column="delivery_goods_flag"    />-->
-<!--        <result property="firstAddTime"    column="first_add_time"    />-->
-<!--        <result property="updateInfoTime"    column="update_info_time"    />-->
-<!--        <result property="standbyOne"    column="standby_one"    />-->
-<!--        <result property="standbyTwo"    column="standby_two"    />-->
-<!--        <result property="createBy"    column="create_by"    />-->
-<!--        <result property="createTime"    column="create_time"    />-->
-<!--        <result property="updateBy"    column="update_by"    />-->
-<!--        <result property="updateTime"    column="update_time"    />-->
-<!--    </resultMap>-->
-
-    <resultMap type="DeliveryGoodsNotice" id="DeliveryGoodsNoticeResult">
-        <result property="deliveryGoodsNoticeId"    column="delivery_goods_notice_id"    />
-        <result property="noticeOrderNumber"    column="notice_order_number"    />
-        <result property="deliveryDate"    column="delivery_date"    />
-        <result property="informationType"    column="information_type"    />
-        <result property="templateType"    column="template_type"    />
-        <result property="enterpriseCode"    column="enterprise_code"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="businessMembers"    column="business_members"    />
-        <result property="relatedDeliveryNumber"    column="related_delivery_number"    />
-        <result property="customerContact"    column="customer_contact"    />
-        <result property="contactNumber"    column="contact_number"    />
-        <result property="customerNumber"    column="customer_number"    />
-        <result property="customerFactory"    column="customer_factory"    />
-        <result property="orderType"    column="order_type"    />
-        <result property="deliveryAddress"    column="delivery_address"    />
-        <result property="exportSales"    column="export_sales"    />
-        <result property="stockNumber"    column="stock_number"    />
-        <result property="stockName"    column="stock_name"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="productQuantity"    column="product_quantity"    />
-        <result property="voucherPreparation"    column="voucher_preparation"    />
-        <result property="amountMoney"    column="amount_money"    />
-        <result property="deliveryGoodsFlag"    column="delivery_goods_flag"    />
-        <result property="allPriceExcludingTaxRmb"    column="all_price_excluding_tax_rmb"    />
-        <result property="firstAddTime"    column="first_add_time"    />
-        <result property="allPriceExcludingTaxDollar"    column="all_price_excluding_tax_dollar"    />
-        <result property="updateInfoTime"    column="update_info_time"    />
-        <result property="allPriceIncludesTax"    column="all_price_includes_tax"    />
-        <result property="plannedDeliveryTime"    column="planned_delivery_time"    />
-        <result property="acceptanceTime"    column="acceptance_time"    />
-        <result property="paymentCondition"    column="payment_condition"    />
-        <result property="deliveryCondition"    column="delivery_condition"    />
-        <result property="deliverTime"    column="deliver_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-
-<!--    <sql id="selectDeliveryGoodsNoticeVo">-->
-<!--        select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two, create_by, create_time, update_by, update_time from delivery_goods_notice-->
-<!--    </sql>-->
-
-    <sql id="selectDeliveryGoodsNoticeVo">
-        select delivery_goods_notice_id, notice_order_number, delivery_date, information_type, template_type, enterprise_code, enterprise_name, business_members, related_delivery_number, customer_contact, customer_factory, order_type, delivery_address, export_sales, stock_number, customer_number, contact_number,stock_name, remarks, product_quantity, voucher_preparation, amount_money, delivery_goods_flag, all_price_excluding_tax_rmb, first_add_time, all_price_excluding_tax_dollar, update_info_time, all_price_includes_tax, planned_delivery_time, acceptance_time, payment_condition, delivery_condition, deliver_time, create_time, create_by, update_by, update_time from delivery_goods_notice
-    </sql>
-
-    <select id="selectDeliveryGoodsNoticeList" parameterType="DeliveryGoodsNotice" resultMap="DeliveryGoodsNoticeResult">
-        <include refid="selectDeliveryGoodsNoticeVo"/>
-        <where>  
-            <if test="noticeOrderNumber != null  and noticeOrderNumber != ''"> and notice_order_number like concat('%', #{noticeOrderNumber}, '%')</if>
-            <if test="deliveryDate != null  and deliveryDate != ''"> and delivery_date like concat('%', #{deliveryDate}, '%')</if>
-            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="exportSales != null  and exportSales != ''"> and export_sales = #{exportSales}</if>
-            <if test="deliveryGoodsFlag != null  and deliveryGoodsFlag != ''"> and delivery_goods_flag = #{deliveryGoodsFlag}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectDeliveryGoodsNoticeById" parameterType="Long" resultMap="DeliveryGoodsNoticeResult">
-        <include refid="selectDeliveryGoodsNoticeVo"/>
-        where delivery_goods_notice_id = #{deliveryGoodsNoticeId}
-    </select>
-        
-    <insert id="insertDeliveryGoodsNotice" parameterType="DeliveryGoodsNotice" useGeneratedKeys="true" keyProperty="deliveryGoodsNoticeId">
-        insert into delivery_goods_notice
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="noticeOrderNumber != null and noticeOrderNumber != ''">notice_order_number,</if>
-            <if test="deliveryDate != null">delivery_date,</if>
-            <if test="enterpriseCode != null and enterpriseCode != ''">enterprise_code,</if>
-            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
-            <if test="customerContact != null">customer_contact,</if>
-            <if test="customerFactory != null">customer_factory,</if>
-            <if test="deliveryAddress != null">delivery_address,</if>
-            <if test="exportSales != null">export_sales,</if>
-            <if test="stockNumber != null">stock_number,</if>
-            <if test="stockName != null">stock_name,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="voucherPreparation != null">voucher_preparation,</if>
-            <if test="deliveryGoodsFlag != null">delivery_goods_flag,</if>
-            <if test="standbyOne != null">standby_one,</if>
-            <if test="standbyTwo != null">standby_two,</if>
-            <if test="createBy != null">create_by,</if>
-            first_add_time,
-            create_time,
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="noticeOrderNumber != null and noticeOrderNumber != ''">#{noticeOrderNumber},</if>
-            <if test="deliveryDate != null">#{deliveryDate},</if>
-            <if test="enterpriseCode != null and enterpriseCode != ''">#{enterpriseCode},</if>
-            <if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
-            <if test="customerContact != null">#{customerContact},</if>
-            <if test="customerFactory != null">#{customerFactory},</if>
-            <if test="deliveryAddress != null">#{deliveryAddress},</if>
-            <if test="exportSales != null">#{exportSales},</if>
-            <if test="stockNumber != null">#{stockNumber},</if>
-            <if test="stockName != null">#{stockName},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="voucherPreparation != null">#{voucherPreparation},</if>
-            <if test="deliveryGoodsFlag != null">#{deliveryGoodsFlag},</if>
-            <if test="standbyOne != null">#{standbyOne},</if>
-            <if test="standbyTwo != null">#{standbyTwo},</if>
-            <if test="createBy != null">#{createBy},</if>
-            NOW(),
-            NOW(),
-         </trim>
-    </insert>
-
-    <update id="updateDeliveryGoodsNotice" parameterType="DeliveryGoodsNotice">
-        update delivery_goods_notice
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="noticeOrderNumber != null and noticeOrderNumber != ''">notice_order_number = #{noticeOrderNumber},</if>
-            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
-            <if test="enterpriseCode != null and enterpriseCode != ''">enterprise_code = #{enterpriseCode},</if>
-            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
-            <if test="customerContact != null">customer_contact = #{customerContact},</if>
-            <if test="customerFactory != null">customer_factory = #{customerFactory},</if>
-            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
-            <if test="exportSales != null">export_sales = #{exportSales},</if>
-            <if test="stockNumber != null">stock_number = #{stockNumber},</if>
-            <if test="stockName != null">stock_name = #{stockName},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="voucherPreparation != null">voucher_preparation = #{voucherPreparation},</if>
-            <if test="deliveryGoodsFlag != null">delivery_goods_flag = #{deliveryGoodsFlag},</if>
-            <if test="standbyOne != null">standby_one = #{standbyOne},</if>
-            <if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
-            update_info_time = CONCAT_WS(',',NOW(),update_info_time),
-            update_time = CONCAT_WS(',',NOW(),update_time),
-        </trim>
-        where delivery_goods_notice_id = #{deliveryGoodsNoticeId}
-    </update>
-
-    <delete id="deleteDeliveryGoodsNoticeById" parameterType="Long">
-        delete from delivery_goods_notice where delivery_goods_notice_id = #{deliveryGoodsNoticeId}
-    </delete>
-
-    <delete id="deleteDeliveryGoodsNoticeByIds" parameterType="String">
-        delete from delivery_goods_notice where delivery_goods_notice_id in 
-        <foreach item="deliveryGoodsNoticeId" collection="array" open="(" separator="," close=")">
-            #{deliveryGoodsNoticeId}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/add.html
deleted file mode 100644
index f548679d..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/add.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增发货通知单详情')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-deliveryGoodsDetail-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">通知单号：</label>
-                <div class="col-sm-8">
-                    <input name="noticeOrderNumber" 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="salesOrderNumber" 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="enterpriseCode" 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="enterpriseName" 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="finishProductCode" 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="finishProductName" 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="specificationModel" 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="customerNumber" 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="typeMachine" 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="inventoryUnit" 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="commonCurrency" 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="processPrice" 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="productQuantity" 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="amountMoney" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">Line#：</label>
-                <div class="col-sm-8">
-                    <input name="line" 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="versionNumber" 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="salesExplain" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "manufacture/deliveryGoodsDetail"
-        $("#form-deliveryGoodsDetail-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-deliveryGoodsDetail-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
deleted file mode 100644
index d08d774f..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('发货通知单详情列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>通知单号：</label>
-                                <input type="text" name="noticeOrderNumber"/>
-                            </li>
-                            <li>
-                                <label>订单号码：</label>
-                                <input type="text" name="salesOrderNumber"/>
-                            </li>
-                            <li>
-                                <label>客户代码：</label>
-                                <input type="text" name="enterpriseCode"/>
-                            </li>
-                            <li>
-                                <label>客户名称：</label>
-                                <input type="text" name="enterpriseName"/>
-                            </li>
-                            <li>
-                                <label>成品代码：</label>
-                                <input type="text" name="finishProductCode"/>
-                            </li>
-                            <li>
-                                <label>成品名称：</label>
-                                <input type="text" name="finishProductName"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsDetail:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:deliveryGoodsDetail:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manufacture:deliveryGoodsDetail:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>  -->
-                <a class="btn btn-success blue" onclick="$.table.exportExcel()" shiro:hasPermission="manufacture:deliveryGoodsDetail:export">
-                    <i class="fa fa-download"></i> 导出文件
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('manufacture:deliveryGoodsDetail:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('manufacture:deliveryGoodsDetail:remove')}]];
-        var prefix = ctx + "manufacture/deliveryGoodsDetail";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "出货通知单列表",
-                fixedColumns:true,
-                fixedRightNumber:1,
-                columns: [
-                    {checkbox: true},
-                    {field: 'deliveryGoodsDetailId',title: '发货通知单详情id',  visible: false},
-                    {title: '出库单号',field: 'noticeOrderNumber'},
-                    // {title: '出货状态',field: 'deliveryGoodsFlag',
-                    //     formatter: function(value, row, index) {
-                    //         return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
-                    //     }
-                    // },
-                    {title: '出货状态',field: 'deliverStatus'},
-                    {title: '业务员',field: 'finishProductName'},
-                    {title: '关联销售单号',field: 'salesOrderNumber',},
-                    {title: '员工ID',field: 'staffNo',visible: false},
-                    {title: '订单类型',field: 'outboundType',},
-                    {title: '出库类型',field: 'orderType',},
-                    {title: '客户ID',field: 'enterpriseCode'},
-                    {title: '客户公司名称',field: 'enterpriseName'},
-                    {title: '客户订单号',field: 'customerNumber',},
-                    {title: '物料总量',field: 'productQuantity'},
-                    {title: '数量合计',field: 'amountMoney'},
-                    {title: '不含税总价(RMB)',field: 'allPriceExcludingTaxRmb'},
-                    {title: '含税总价(RMB)',field: 'allPriceIncludesTax'},
-                    {title: '不含税总价(美元)',field: 'allPriceExcludingTaxDollar'},
-                    {title: '计划交付时间',field: 'plannedDeliveryTime'},
-                    {title: '客户验收时间',field: 'acceptanceTime'},
-                    {title: '付款条件',field: 'paymentCondition'},
-                    {title: '交付条件',field: 'deliveryCondition'},
-                    {title: '收货联系人',field: 'customerContact'},
-                    {title: '联系电话',field: 'contactNumber'},
-                    {title: '收货地址',field: 'contactAddress'},
-                    {title: '送货日期',field: 'deliverTime'},
-                    {title: '录入时间',field: 'createTime'},
-                    {title: '更新人',field: 'updateBy'},
-                    {title: '上次更新时间',field: 'updateTime'},
-                    {
-                        title: '操作',
-                        align: 'center',
-                        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.deliveryGoodsDetailId + '\')"><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.deliveryGoodsDetailId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                            return actions.join('');
-                        }
-                    }
-                ]
-            };
-            $.table.init(options);
-        });
-
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/edit.html
deleted file mode 100644
index cba3c4e7..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/edit.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改发货通知单详情')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-deliveryGoodsDetail-edit" th:object="${deliveryGoodsDetail}">
-            <input name="deliveryGoodsDetailId" th:field="*{deliveryGoodsDetailId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">通知单号：</label>
-                <div class="col-sm-8">
-                    <input name="noticeOrderNumber" th:field="*{noticeOrderNumber}" 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="salesOrderNumber" th:field="*{salesOrderNumber}" 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="enterpriseCode" th:field="*{enterpriseCode}" 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="enterpriseName" th:field="*{enterpriseName}" 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="finishProductCode" th:field="*{finishProductCode}" 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="finishProductName" th:field="*{finishProductName}" 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="specificationModel" th:field="*{specificationModel}" 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="customerNumber" th:field="*{customerNumber}" 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="typeMachine" th:field="*{typeMachine}" 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="inventoryUnit" th:field="*{inventoryUnit}" 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="commonCurrency" th:field="*{commonCurrency}" 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="processPrice" th:field="*{processPrice}" 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="productQuantity" th:field="*{productQuantity}" 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="amountMoney" th:field="*{amountMoney}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">Line#：</label>
-                <div class="col-sm-8">
-                    <input name="line" th:field="*{line}" 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="versionNumber" th:field="*{versionNumber}" 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="salesExplain" th:field="*{salesExplain}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "manufacture/deliveryGoodsDetail";
-        $("#form-deliveryGoodsDetail-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-deliveryGoodsDetail-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/add.html
deleted file mode 100644
index dd9153ba..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/add.html
+++ /dev/null
@@ -1,698 +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"/>
-    <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-deliveryGoodsNotice-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">通知单号：</label>
-                <div class="col-sm-8">
-                    <input name="noticeOrderNumber" class="form-control" type="text" required readonly>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">发货日期：</label>
-                <div class="col-sm-8">
-<!--                    <input name="deliveryDate" class="form-control" type="text">-->
-                    <div class="input-group date">
-                        <input name="deliveryDate" 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 is-required">客户代码：</label>
-                <div class="col-sm-8">
-<!--                    <input name="enterpriseCode" class="form-control" type="text" required>-->
-                    <select name="enterpriseCode" class="form-control m-b" required>
-                        <option value="">请选择客户代码</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">客户名称：</label>
-                <div class="col-sm-8">
-                    <input name="enterpriseName" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人：</label>
-                <div class="col-sm-8">
-                    <input name="customerContact" 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="customerFactory" class="form-control" type="text">-->
-                    <select name="customerFactory" class="form-control m-b">
-                        <option value="">请选择客户厂区</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">送货地址：</label>
-                <div class="col-sm-8">
-                    <input name="deliveryAddress" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group"  style="display: none">
-                <label class="col-sm-3 control-label">内外销：</label>
-                <div class="col-sm-8">
-                    <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-                    <select name="stockName" class="form-control m-b">
-                        <option value="">请选择仓库名称</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库编号：</label>
-                <div class="col-sm-8">
-                    <input name="stockNumber" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <textarea name="remarks" class="form-control" type="text"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">制单人：</label>
-                <div class="col-sm-8">
-<!--                    <input name="voucherPreparation" class="form-control" type="text">-->
-                    <select name="voucherPreparation" class="form-control m-b">
-                        <option value="">请选择制单人</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group" style="display: none">
-                <label class="col-sm-3 control-label">发货否：</label>
-                <div class="col-sm-8">
-                    <select name="deliveryGoodsFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <!--<div class="form-group">
-                <label class="col-sm-3 control-label">备用一：</label>
-                <div class="col-sm-8">
-                    <input name="standbyOne" 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="standbyTwo" class="form-control" type="text">
-                </div>
-            </div>-->
-        </form>
-    </div>
-    <div class="other-container">
-        <div class="other">
-            <br><hr>
-            <h4>订单信息</h4>
-            <a class="btn btn-primary" onclick="showOrderDetailModal()"><i class="fa fa-plus"></i>&nbsp;订单信息</a>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="addSalesFinishTable" style="white-space:nowrap"></table>
-            </div>
-        </div>
-        <div class="modal inmodal" id="salesFinishModal"
-             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="salesFinishFormId">
-                                        <div class="select-list">
-                                            <ul>
-                                                <li>
-                                                    <label>订单号码：</label>
-                                                    <input type="text" name="salesOrderNumber"/>
-                                                </li>
-                                                <li>
-                                                    <label>成品代码：</label>
-                                                    <input type="text" name="finishProductCode"/>
-                                                </li>
-                                                <li>
-                                                    <label>成品名称：</label>
-                                                    <input type="text" name="finishProductName"/>
-                                                </li>
-<!--                                                <li>-->
-<!--                                                    <label>客户代码：</label>-->
-<!--                                                    <input type="text" name="enterpriseCode"/>-->
-<!--                                                </li>-->
-<!--                                                <li>-->
-<!--                                                    <label>客户名称：</label>-->
-<!--                                                    <input type="text" name="enterpriseName"/>-->
-<!--                                                </li>-->
-                                                <li>
-                                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('salesFinishFormId','salesFinishTable')"><i
-                                                            class="fa fa-search"></i>&nbsp;搜索</a>
-                                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('salesFinishFormId','salesFinishTable')"><i
-                                                            class="fa fa-refresh"></i>&nbsp;重置</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </form>
-                                </div>
-                                <div class="col-sm-12 select-table table-striped">
-                                    <table id="salesFinishTable" style="white-space:nowrap"></table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <a class="btn btn-warning btn-rounded" onclick="addSalesFinishToTable()">确认添加</a>
-                        <a class="btn btn-primary btn-rounded" onclick="closeSalesFinishModal()">关闭</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 prefix = ctx + "manufacture/deliveryGoodsNotice"
-        var prefixDetail = ctx + "manufacture/deliveryGoodsDetail"
-        var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
-        $("#form-deliveryGoodsNotice-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            var getData = $("#addSalesFinishTable").bootstrapTable("getData");
-            if(getData.length > 0){
-                if ($.validate.form()) {
-                    //确认添加选中的物料数据
-                    confirmSalesFinish();
-                    $.operate.save(prefix + "/add", $('#form-deliveryGoodsNotice-add').serialize());
-                }
-            } else {
-                $.modal.alertWarning("未选择订单，请选择！")
-            }
-
-        }
-
-        $("input[name='deliveryDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true,
-            todayBtn: true
-        });
-        $("input[name='deliveryDate']").datetimepicker("setDate", new Date())
-
-        //获取单号
-        $.ajax({
-            url: prefix + "/id",
-            type: "post",
-            dateType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    $("input[name='noticeOrderNumber']").val(resp.data);
-                } else {
-                    $.modal.msgError("失败啦");
-                }
-            },
-            error: function () {
-                $.modal.msgError("后台出错啦！");
-            }
-        });
-
-        //获取仓库信息
-        $.ajax({
-            url: ctx + "stock/stockInfo/list",
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let stockData = res.rows;
-                    for (let i in stockData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-add select[name='stockName']").append("<option value='" + stockData[i].stockname + "'>" + stockData[i].stockname + "</option>");
-                        $("#form-deliveryGoodsNotice-add select[name='stockName']").change(function () {
-                            var stockName = $(this).val();
-                            for (let i=0;i<stockData.length;i++) {
-                                if (stockData[i].stockname == stockName) {
-                                    $("#form-deliveryGoodsNotice-add input[name='stockNumber']").val(stockData[i].stockNO);
-                                }
-                            }
-                        })
-                    }
-                }
-            }
-        })
-
-        //获取客户信息
-        $.ajax({
-            url: ctx + 'system/customer/customerList',
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let customerData = res.rows;
-                    for (let i in customerData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-add select[name='enterpriseCode']").append("<option value='" + customerData[i].enterpriseCode + "'>" + customerData[i].enterpriseCode + "</option>");
-                        $("#form-deliveryGoodsNotice-add select[name='enterpriseCode']").change(function () {
-                            var enterpriseCode = $(this).val();
-                            for (let i=0;i<customerData.length;i++) {
-                                if (customerData[i].enterpriseCode == enterpriseCode) {
-                                    $("#form-deliveryGoodsNotice-add input[name='enterpriseName']").val(customerData[i].enterpriseName);
-                                    $("#form-deliveryGoodsNotice-add input[name='customerContact']").val(customerData[i].customerContact);
-                                    $("#form-deliveryGoodsNotice-add input[name='deliveryAddress']").val(customerData[i].deliveryAddress);
-                                    $("#form-deliveryGoodsNotice-add select[name='exportSales']").val(customerData[i].exportSales).trigger("change");
-                                    $.ajax({
-                                        url: ctx + "system/shippingaddress/list",
-                                        type: 'post',
-                                        data: {
-                                            enterpriseCode: enterpriseCode
-                                        },
-                                        success: function (res) {
-                                            // console.log(res)
-                                            $("select[name='customerFactory']").empty();
-                                            var data = res.rows;
-                                            $("select[name='customerFactory']").append("<option value=''>请选择客户厂区</option>");
-                                            for (let i in data) {
-                                                // console.log(data[i].plantArea)
-                                                if (data[i].plantArea!=="") {
-                                                    // console.log(data[i].plantArea!=="")
-                                                    $("select[name='customerFactory']").append("<option value='" + data[i].plantArea + "'>" + data[i].plantArea + "</option>");
-                                                }
-                                            }
-
-                                        }
-                                    })
-                                }
-                            }
-                        })
-                    }
-                }
-            }
-        })
-
-        //获取制单人
-        $.ajax({
-            url: ctx + "system/user/list",
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let userData = res.rows;
-                    for (let i in userData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-add select[name='voucherPreparation']").append("<option value='" + userData[i].userName + "'>" + userData[i].userName + "</option>");
-                    }
-                    let userName = [[${@permission.getPrincipalProperty('userName')}]];
-                    $("#form-deliveryGoodsNotice-add select[name='voucherPreparation']").val(userName).trigger("change")
-                }
-
-            }
-        })
-
-        //初始化添加材料表
-        $('#addSalesFinishTable').bootstrapTable({
-            pagination: true,
-            pageNumber: 1,
-            pageSize: 10,
-            showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-            cardView: false, // 是否显示详细视图
-            detailView: false, // 是否显示父子表
-            smartDisplay: false, // 加了这个才显示每页显示的行数
-            showExport: false, // 是否显示导出按钮
-            clickToSelect: true,//点击行选中
-            paginationDetailHAlign: ' hiddenDetailInfo',
-            height: 250,
-            uniqueId: 'finishProductCode',
-            queryParams: function (params) {
-                //console.log("123");
-                var curParams = {
-                    // 传递参数查询参数
-                    pageSize: params.limit,
-                    pageNum: params.offset / params.limit + 1,
-                    // enterpriseCode: data[0].enterpriseCode
-
-                };
-                // console.log(data[0].enterpriseCode)
-                return curParams
-            },
-            columns: [
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeSalesFinish(\'' + row.finishProductCode + '\')" ><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                },
-                {
-                    field: 'deliveryGoodsDetailId',
-                    title: '发货通知单详情id',
-                    visible: false
-                },
-                {
-                    field: 'noticeOrderNumber',
-                    title: '通知单号',
-                    visible: false
-                },
-                {
-                    field: 'salesOrderNumber',
-                    title: '订单号码'
-                },
-                {
-                    field: 'enterpriseCode',
-                    title: '客户代码',
-                    visible: false
-                },
-                {
-                    field: 'enterpriseName',
-                    title: '客户名称',
-                    visible: false
-                },
-                {
-                    field: 'finishProductCode',
-                    title: '成品代码'
-                },
-                {
-                    field: 'finishProductName',
-                    title: '成品名称'
-                },
-                {
-                    field: 'specificationModel',
-                    title: '规格型号'
-                },
-                {
-                    field: 'customerNumber',
-                    title: '客户料号'
-                },
-                {
-                    field: 'typeMachine',
-                    title: '机种'
-                },
-                {
-                    field: 'inventoryUnit',
-                    title: '单位'
-                },
-                {
-                    field: 'commonCurrency',
-                    title: '币别',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(commonCurrencyDatas, value);
-                    }
-                },
-                {
-                    field: 'processPrice',
-                    title: '单价'
-                },
-                {
-                    field: 'productQuantity',
-                    title: '数量'
-                },
-                {
-                    field: 'amountMoney',
-                    title: '金额'
-                },
-                {
-                    field: 'line',
-                    title: '订单项次',
-                    editable: {
-                        type: 'text',
-                        title: '订单项次',
-                        emptytext: '订单项次',
-                        validate: function (value) {
-
-                        }
-                    }
-                },
-                {
-                    field: 'versionNumber',
-                    title: '版本号',
-                    editable: {
-                        type: 'text',
-                        title: '版本号',
-                        emptytext: '版本号',
-                        validate: function (value) {
-
-                        }
-                    }
-                },
-                {
-                    field: 'salesExplain',
-                    title: '说明',
-                    editable: {
-                        type: 'text',
-                        title: '说明',
-                        emptytext: '说明',
-                        validate: function (value) {
-
-                        }
-                    }
-                }]
-        })
-
-        //选择订单
-        function showOrderDetailModal() {
-            if ($.validate.form()) {
-                $("#salesFinishModal").modal("show");
-                var enterpriseCode = $("#form-deliveryGoodsNotice-add select[name='enterpriseCode']").val()
-                // console.log(enterpriseCode)
-                // var enterpriseName = $("#form-deliveryGoodsNotice-add input[name='enterpriseName']").val()
-                // console.log(enterpriseName)
-                $("#salesFinishTable").bootstrapTable("destroy")
-                var options = {
-                    id: 'salesFinishTable',
-                    url: ctx + "system/salesFinish/list",
-                    modalName: "销售产品",
-                    showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-                    cardView: false, // 是否显示详细视图
-                    detailView: false, // 是否显示父子表
-                    smartDisplay: false, // 加了这个才显示每页显示的行数
-                    showExport: false, // 是否显示导出按钮
-                    clickToSelect: true,//点击行选中
-                    queryParams: function (params) {
-                        var curParams = {
-                            // 传递参数查询参数
-                            pageSize: params.limit,
-                            pageNum: params.offset / params.limit + 1,
-                            enterpriseCode: enterpriseCode
-                        };
-                        let json = $.extend(curParams, $.common.formToJSON("salesFinishFormId"));
-                        return json;
-                    },
-                    columns: [{
-                        checkbox: true
-                    },
-                        {
-                            field: 'salesFinishId',
-                            title: '订单id',
-                            visible: false
-                        },
-                        {
-                            field: 'salesOrderCode',
-                            title: '订单编号'
-                        },
-                        {
-                            field: 'salesOrderNumber',
-                            title: '订单号码'
-                        },
-                        {
-                            field: 'enterpriseCode',
-                            title: '客户代码'
-                        },
-                        {
-                            field: 'enterpriseName',
-                            title: '客户名称'
-                        },
-                        {
-                            field: 'finishProductCode',
-                            title: '成品代码'
-                        },
-                        {
-                            field: 'finishProductName',
-                            title: '成品名称'
-                        },
-                        {
-                            field: 'customerNumber',
-                            title: '客户料号'
-                        },
-                        {
-                            field: 'specificationModel',
-                            title: '规格型号'
-                        },
-                        {
-                            field: 'typeMachine',
-                            title: '机种'
-                        },
-                        {
-                            field: 'inventoryUnit',
-                            title: '单位'
-                        },
-                        {
-                            field: 'stockUnitWeight',
-                            title: '重量'
-                        },
-                        {
-                            field: 'commonCurrency',
-                            title: '币别',
-                            formatter: function (value, row, index) {
-                                return $.table.selectDictLabel(commonCurrencyDatas, value);
-                            }
-                        },
-                        {
-                            field: 'processPrice',
-                            title: '单价'
-                        },
-                        {
-                            field: 'productQuantity',
-                            title: '数量'
-                        },
-                        {
-                            field: 'amountMoney',
-                            title: '金额'
-                        },
-                        {
-                            field: 'deliveryTime',
-                            title: '交期'
-                        },
-                        {
-                            field: 'line',
-                            title: 'Line#'
-                        },
-                        {
-                            field: 'versionNumber',
-                            title: '版本号'
-                        },
-                        {
-                            field: 'salesExplain',
-                            title: '说明'
-                        }]
-                };
-                $.table.init(options);
-            } else {
-                $.modal.alertWarning("请先填写必填项！")
-            }
-        }
-
-        //关闭订单框
-        function closeSalesFinishModal() {
-            $("#salesFinishModal").modal("hide");
-        }
-
-        //表中添加选中的订单信息
-        function addSalesFinishToTable() {
-            var data = $("#salesFinishTable").bootstrapTable("getSelections");
-            var count = $('#addSalesFinishTable').bootstrapTable('getData').length;
-            var noticeOrderNumber = $("input[name='noticeOrderNumber']").val();
-            // console.log(materialType)
-            for (i = 0; i < data.length; i++) {
-                let finishProduct = $('#addSalesFinishTable').bootstrapTable('getRowByUniqueId', data[i].finishProductCode);
-                if (finishProduct != null) {
-                    alert(finishProduct.finishProductName + "已存在，不可重复添加!");
-                    continue;
-                }
-                $("#addSalesFinishTable").bootstrapTable('insertRow', {
-                    index: count + i,
-                    row: {
-                        noticeOrderNumber: noticeOrderNumber,
-                        salesOrderNumber: data[i].salesOrderNumber,
-                        enterpriseCode: data[i].enterpriseCode,
-                        enterpriseName: data[i].enterpriseName,
-                        finishProductCode: data[i].finishProductCode,
-                        finishProductName: data[i].finishProductName,
-                        specificationModel: data[i].specificationModel,
-                        customerNumber: data[i].customerNumber,
-                        typeMachine: data[i].typeMachine,
-                        inventoryUnit: data[i].inventoryUnit,
-                        commonCurrency: data[i].commonCurrency,
-                        processPrice: data[i].processPrice,
-                        productQuantity: data[i].productQuantity,
-                        amountMoney: data[i].amountMoney,
-                        line: data[i].line,
-                        versionNumber: data[i].versionNumber,
-                        salesExplain: data[i].salesExplain
-                    }
-                });
-            }
-            $("#salesFinishTable").bootstrapTable("uncheckAll");
-            closeSalesFinishModal();
-        }
-
-        //确认材料信息
-        function confirmSalesFinish() {
-            var data = $("#addSalesFinishTable").bootstrapTable("getData");
-            // console.log(data)
-            $.ajax({
-                url: prefixDetail + '/addEditSave',
-                type: "POST",
-                data: {
-                    data: JSON.stringify(data)
-                },
-                dataType: "json",
-                success: function (resp) {
-                    // console.log(data)
-                    console.log(resp)
-                },
-
-            })
-        }
-
-        //删除表内材料信息
-        function removeSalesFinish(finishProductCode) {
-            var ids = [];
-            ids.push(finishProductCode);
-            $('#addSalesFinishTable').bootstrapTable("remove",{
-                field:'finishProductCode',
-                values:ids
-            })
-            $("#addSalesFinishTable").bootstrapTable('refresh');
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
deleted file mode 100644
index 3971990f..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('出货资料列表')" />
-    <th:block th:include="include :: datetimepicker-css"/>
-    <script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
-</head>
-<body class="gray-bg">
-    <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>出货资料单号 ：</label>
-                                <input type="text" name="noticeOrderNumber"/>
-                            </li>
-                            <li>
-                                <label>出货资料类型 ：</label>
-                                <input type="text" name=""/>
-                            </li>
-                            <li>
-                                <label>模版类型 ：</label>
-                                <input type="text" name=""/>
-                            </li>
-                            <li>
-                                <label>业务员：</label>
-                                <input type="text"/>
-                            </li>
-                            <li>
-                                <label>仓库员 ：</label>
-                                <input type="text"/>
-                            </li>
-                            <li>
-                                <label>关联订单号 ：</label>
-                                <input type="text" name=""/>
-                            </li>
-                            <li>
-                                <label>订单类型 ：</label>
-                                <input type="text" name=""/>
-                            </li>
-                            <li class="select-time">
-                                <label>录入时间 ：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsNotice:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:deliveryGoodsNotice:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="removeSelected()" shiro:hasPermission="manufacture:deliveryGoodsNotice:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a> -->
-                <a class="btn btn-success blue single disabled" onclick="exportNotice()" shiro:hasPermission="manufacture:deliveryGoodsNotice:export">
-                    <i class="fa fa-download"></i> 导出文件
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table" style="white-space: nowrap"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('manufacture:deliveryGoodsNotice:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('manufacture:deliveryGoodsNotice:remove')}]];
-        var exportSalesDatas = [[${@dict.getType('sys_export_sales')}]];
-        var deliveryGoodsFlagDatas = [[${@dict.getType('sys_whether')}]];
-        var prefix = ctx + "manufacture/deliveryGoodsNotice";
-        var prefixDetail = ctx + "manufacture/deliveryGoodsDetail";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                clickToSelect: true,
-                modalName: "出货资料列表",
-                columns: [
-                    {checkbox: true},
-                    {field: 'deliveryGoodsNoticeId',title: '出货通知单Id',visible: false},
-                    {
-                        title: '出货资料单单号',
-                        field: 'noticeOrderNumber',
-                    },
-                    {
-                        title: '资料类型',
-                        field: 'informationType',
-                    },
-                    {
-                        title: '模板类型',
-                        field: 'templateType',
-                    },
-                    {
-                        title: '业务员',
-                        field: 'businessMembers',
-                    },
-                    {
-                        title: '关联出库单号',
-                        field: 'relatedDeliveryNumber',
-                    },
-                    {
-                        title: '客户ID',
-                        field: 'enterpriseCode',
-                    },
-                    {
-                        title: '客户公司名称',
-                        field: 'enterpriseName',
-                    },
-                    {
-                        title: '客户订单号',
-                        field: 'customerNumber',
-                    },
-                    {
-                        title: '物料数量',
-                        field: 'productQuantity',
-                    },
-                    {
-                        title: '物料合计',
-                        field: 'amountMoney',
-                    },
-                    {
-                        title: '订单类型',
-                        field: 'orderType',
-                    },
-                    {
-                        title: '不含税总价(RMB)',
-                        field: 'allPriceExcludingTaxRmb',
-                    },
-                    {
-                        title: '含税总价(RMB)',
-                        field: 'allPriceIncludesTax',
-                    },
-                    {
-                        title: '不含税总价(美元)',
-                        field: 'allPriceExcludingTaxDollar',
-                    },
-                    {
-                        title: '计划交付时间',
-                        field: 'plannedDeliveryTime',
-                    },
-                    {
-                        title: '客户验收时间',
-                        field: 'acceptanceTime',
-                    },
-                    {
-                        title: '付款条件',
-                        field: 'paymentCondition',
-                    },
-                    {
-                        title: '交付条件',
-                        field: 'deliveryCondition',
-                    },
-                    {
-                        title: '联系人',
-                        field: 'customerContact',
-                    },
-                    {
-                        title: '联系电话',
-                        field: 'contactNumber',
-                    },
-
-                    {
-                        title: '收货地址',
-                        field: 'deliveryAddress',
-                    },
-                    {
-                        title: '送货日期',
-                        field: 'deliverTime',
-                    },
-                    {
-                        title: '录入时间',
-                        field: 'firstAddTime',
-                    },
-                    {title: '更新人',field: 'updateBy'},
-
-                    {title: '上次更新时间',field: 'updateTime',
-                        formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(',');return vArr[0];}}
-                    },
-                ]
-            };
-            $.table.init(options);
-        });
-
-        //删除
-        function removeSelected() {
-            var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-            console.log(rows)
-            if (rows.length > 0) {
-                $.modal.confirm("是否删除选中的"+ rows.length +"条发货通知单？", function () {
-                    $.ajax({
-                        url: prefix + '/removeSelected',
-                        type: 'post',
-                        data: {
-                            ids : rows.join()
-                        },
-                        success: function (res) {
-                            // console.log(res)
-                            $("#bootstrap-table").bootstrapTable("refresh");
-                            $.modal.msgSuccess("删除成功！")
-                        },
-                        error: function (res) {
-                            $.modal.msgError(res.error())
-                        }
-                    })
-                })
-            } else {
-                $.modal.msgWarning("请选择一条数据")
-            }
-        }
-
-        //导出
-        function exportNotice() {
-            var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-            var data = $("#bootstrap-table").bootstrapTable("getSelections")
-
-            if (rows.length !== 1) {
-                $.modal.alert("请选择一条记录");
-                return;
-            } else {
-                // rows为选中行的id
-                // console.log(rows);
-                // console.log(data);
-                // console.log(data[0].orderNumber)
-                $.modal.confirm("是否确认要导出本条发货通知单？", function (){
-                    axios({
-                        url: prefix + '/exportSelected/'+data[0].deliveryGoodsNoticeId,
-                        method: 'POST',
-                        responseType: 'blob'
-                    }).then(response => {
-                        // console.log(response)
-                        const URL = window.URL.createObjectURL(response.data)
-                        // 创建隐藏<a>标签进行下载
-                        const tempLink = document.createElement('a')
-                        tempLink.style.display = 'none'
-                        tempLink.href = URL
-                        let time = new Date().toLocaleString()
-                        tempLink.setAttribute('download', time + "发货通知单.xlsx")
-                        if (typeof tempLink.download === 'undefined') {
-                            tempLink.setAttribute('target', '_blank')
-                        }
-                        document.body.appendChild(tempLink)
-                        tempLink.click()
-                        document.body.removeChild(tempLink)// 移除dom元素
-                        window.URL.revokeObjectURL(URL)//释放内存
-                    })
-                });
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html
deleted file mode 100644
index 87d3187f..00000000
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html
+++ /dev/null
@@ -1,713 +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"/>
-    <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-deliveryGoodsNotice-edit" th:object="${deliveryGoodsNotice}">
-            <input name="deliveryGoodsNoticeId" th:field="*{deliveryGoodsNoticeId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">通知单号：</label>
-                <div class="col-sm-8">
-                    <input name="noticeOrderNumber" th:field="*{noticeOrderNumber}" class="form-control" type="text" required readonly>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">发货日期：</label>
-                <div class="col-sm-8">
-<!--                    <input name="deliveryDate" th:field="*{deliveryDate}" class="form-control" type="text">-->
-                    <div class="input-group date">
-                        <input name="deliveryDate" class="form-control" th:field="*{deliveryDate}" 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 is-required">客户代码：</label>
-                <div class="col-sm-8">
-<!--                    <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" required>-->
-                    <select name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control m-b" required disabled>
-                        <option value="">请选择客户代码</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">客户名称：</label>
-                <div class="col-sm-8">
-                    <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required readonly>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人：</label>
-                <div class="col-sm-8">
-                    <input name="customerContact" th:field="*{customerContact}" 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="customerFactory" th:field="*{customerFactory}" class="form-control" type="text">-->
-                    <select name="customerFactory" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                </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="form-group" style="display: none">
-                <label class="col-sm-3 control-label">内外销：</label>
-                <div class="col-sm-8">
-                    <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{exportSales}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-<!--                    <input name="stockName" th:field="*{stockName}" class="form-control" type="text">-->
-                    <select name="stockName" class="form-control m-b" th:field="*{stockName}">
-                        <option value="">请选择仓库名称</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">仓库编号：</label>
-                <div class="col-sm-8">
-                    <input name="stockNumber" th:field="*{stockNumber}" 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="remarks" th:field="*{remarks}" 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="voucherPreparation" th:field="*{voucherPreparation}" class="form-control" type="text">-->
-                    <select name="voucherPreparation" class="form-control m-b" th:field="*{voucherPreparation}">
-                        <option value="">请选择制单人</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group" style="display: none">
-                <label class="col-sm-3 control-label">发货否：</label>
-                <div class="col-sm-8">
-                    <select name="deliveryGoodsFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{deliveryGoodsFlag}"></option>
-                    </select>
-                </div>
-            </div>
-<!--            <div class="form-group">
-                <label class="col-sm-3 control-label">备用一：</label>
-                <div class="col-sm-8">
-                    <input name="standbyOne" th:field="*{standbyOne}" 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="standbyTwo" th:field="*{standbyTwo}" class="form-control" type="text">
-                </div>
-            </div>-->
-        </form>
-    </div>
-
-    <div class="other-container">
-        <div class="other">
-            <br><hr>
-            <h4>订单信息</h4>
-            <a class="btn btn-primary" onclick="showOrderDetailModal()"><i class="fa fa-plus"></i>&nbsp;订单信息</a>
-            <a class="btn btn-danger" onclick="removeOrderDetail()"><i class="fa fa-plus"></i>&nbsp;删除订单</a>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="addSalesFinishTable" style="white-space:nowrap"></table>
-            </div>
-        </div>
-        <div class="modal inmodal" id="salesFinishModal"
-             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="salesFinishFormId">
-                                        <div class="select-list">
-                                            <ul>
-                                                <li>
-                                                    <label>订单号码：</label>
-                                                    <input type="text" name="salesOrderNumber"/>
-                                                </li>
-                                                <li>
-                                                    <label>成品代码：</label>
-                                                    <input type="text" name="finishProductCode"/>
-                                                </li>
-                                                <li>
-                                                    <label>成品名称：</label>
-                                                    <input type="text" name="finishProductName"/>
-                                                </li>
-<!--                                                <li>-->
-<!--                                                    <label>客户代码：</label>-->
-<!--                                                    <input type="text" name="enterpriseCode"/>-->
-<!--                                                </li>-->
-<!--                                                <li>-->
-<!--                                                    <label>客户名称：</label>-->
-<!--                                                    <input type="text" name="enterpriseName"/>-->
-<!--                                                </li>-->
-                                                <li>
-                                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('salesFinishFormId','salesFinishTable')"><i
-                                                            class="fa fa-search"></i>&nbsp;搜索</a>
-                                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('salesFinishFormId','salesFinishTable')"><i
-                                                            class="fa fa-refresh"></i>&nbsp;重置</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </form>
-                                </div>
-                                <div class="col-sm-12 select-table table-striped">
-                                    <table id="salesFinishTable" style="white-space:nowrap"></table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <a class="btn btn-warning btn-rounded" onclick="addSalesFinishToTable()">确认添加</a>
-                        <a class="btn btn-primary btn-rounded" onclick="closeSalesFinishModal()">关闭</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 = [[${deliveryGoodsNotice}]]
-
-        var prefix = ctx + "manufacture/deliveryGoodsNotice"
-        var prefixDetail = ctx + "manufacture/deliveryGoodsDetail"
-        var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
-
-        $("#form-deliveryGoodsNotice-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            var getData = $("#addSalesFinishTable").bootstrapTable("getData");
-            if(getData.length > 0){
-                if ($.validate.form()) {
-                    //确认添加选中的物料数据
-                    confirmSalesFinish();
-                    $.operate.save(prefix + "/edit", $('#form-deliveryGoodsNotice-edit').serialize());
-                }
-            } else {
-                $.modal.alertWarning("未选择订单，请选择！")
-            }
-        }
-
-        $("input[name='deliveryDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true,
-            todayBtn: true
-        });
-        //获取仓库信息
-        $.ajax({
-            url: ctx + "stock/stockInfo/list",
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let stockData = res.rows;
-                    for (let i in stockData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-edit select[name='stockName']").append("<option value='" + stockData[i].stockname + "'>" + stockData[i].stockname + "</option>");
-                        $("#form-deliveryGoodsNotice-edit select[name='stockName']").val(getData.stockName).trigger("change")
-                        $("#form-deliveryGoodsNotice-edit select[name='stockName']").change(function () {
-                            var stockName = $(this).val();
-                            for (let i=0;i<stockData.length;i++) {
-                                if (stockData[i].stockname == stockName) {
-                                    $("#form-deliveryGoodsNotice-edit input[name='stockNumber']").val(stockData[i].stockNO);
-                                }
-                            }
-                        })
-                    }
-                }
-            }
-        })
-
-        //获取客户信息
-        $.ajax({
-            url: ctx + 'system/customer/list',
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let customerData = res.rows;
-                    for (let i in customerData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-edit select[name='enterpriseCode']").append("<option value='" + customerData[i].enterpriseCode + "'>" + customerData[i].enterpriseCode + "</option>");
-                        $("#form-deliveryGoodsNotice-edit select[name='enterpriseCode']").val(getData.enterpriseCode).trigger("change")
-                        $("#form-deliveryGoodsNotice-edit select[name='exportSales']").val(getData.exportSales).trigger("change")
-                        $("#form-deliveryGoodsNotice-edit select[name='customerFactory']").val(getData.customerFactory).trigger("change");
-                        $("#form-deliveryGoodsNotice-edit select[name='enterpriseCode']").change(function () {
-                            var enterpriseCode = $(this).val();
-                            for (let i=0;i<customerData.length;i++) {
-                                if (customerData[i].enterpriseCode == enterpriseCode) {
-                                    $("#form-deliveryGoodsNotice-edit input[name='enterpriseName']").val(customerData[i].enterpriseName);
-                                    $("#form-deliveryGoodsNotice-edit input[name='customerContact']").val(customerData[i].customerContact);
-                                    $("#form-deliveryGoodsNotice-edit input[name='deliveryAddress']").val(customerData[i].deliveryAddress);
-                                    $("#form-deliveryGoodsNotice-edit select[name='exportSales']").val(customerData[i].exportSales).trigger("change");
-                                    $.ajax({
-                                        url: ctx + "system/shippingaddress/list",
-                                        type: 'post',
-                                        data: {
-                                            enterpriseCode: enterpriseCode
-                                        },
-                                        success: function (res) {
-                                            $("select[name='customerFactory']").empty();
-                                            var data = res.rows;
-                                            $("select[name='customerFactory']").append("<option value=''>请选择客户厂区</option>");
-                                            for (let i in data) {
-                                                // console.log(data[i].plantArea)
-                                                if (data[i].plantArea!=="") {
-                                                    // console.log(data[i].plantArea!=="")
-                                                    $("select[name='customerFactory']").append("<option value='" + data[i].plantArea + "'>" + data[i].plantArea + "</option>");
-                                                }
-                                            }
-                                            $("select[name='customerFactory']").val(getData.customerFactory).trigger("change");
-                                        }
-                                    })
-                                }
-                            }
-                        })
-                    }
-                }
-            }
-        })
-
-        //获取制单人
-        $.ajax({
-            url: ctx + "system/user/list",
-            type: "post",
-            success: function (res) {
-                // console.log(res)
-                if (res.rows.length > 0) {
-                    let userData = res.rows;
-                    for (let i in userData) {
-                        // console.log(finishProductData[i].finishProductCode)
-                        $("#form-deliveryGoodsNotice-edit select[name='voucherPreparation']").append("<option value='" + userData[i].userName + "'>" + userData[i].userName + "</option>");
-                    }
-                    $("#form-deliveryGoodsNotice-edit select[name='voucherPreparation']").val(getData.voucherPreparation).trigger("change")
-                } else {
-                    $.modal.msgError(res.msg);
-                }
-
-            }
-        })
-
-        //初始化添加材料表
-        $('#addSalesFinishTable').bootstrapTable({
-            url: prefixDetail + '/list',
-            pagination: true,
-            pageNumber: 1,
-            pageSize: 10,
-            pageList: [10, 25, 50, 100],
-            showRefresh: false,
-            method: "post",
-            contentType: "application/x-www-form-urlencoded",
-            striped: true, // 是否显示行间隔色
-            cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-            sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-            clickToSelect: true, // 是否启用点击选中行
-            showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-            cardView: false, // 是否显示详细视图
-            detailView: false, // 是否显示父子表
-            smartDisplay: false, // 加了这个才显示每页显示的行数
-            showExport: false, // 是否显示导出按钮
-            // singleSelect: true,
-            paginationDetailHAlign: ' hiddenDetailInfo',
-            height: 250,
-            uniqueId: 'finishProductCode',
-            queryParams: function (params) {
-                //console.log("123");
-                var curParams = {
-                    // 传递参数查询参数
-                    pageSize: params.limit,
-                    pageNum: params.offset / params.limit + 1,
-                    noticeOrderNumber: getData.noticeOrderNumber
-                };
-                // console.log(data[0].enterpriseCode)
-                return curParams
-            },
-            columns: [
-                {
-                    checkbox: true
-                },
-                {
-                    field: 'deliveryGoodsDetailId',
-                    title: '发货通知单详情id',
-                    visible: false
-                },
-                {
-                    field: 'noticeOrderNumber',
-                    title: '通知单号',
-                    visible: false
-                },
-                {
-                    field: 'salesOrderNumber',
-                    title: '订单号码'
-                },
-                {
-                    field: 'enterpriseCode',
-                    title: '客户代码',
-                    visible: false
-                },
-                {
-                    field: 'enterpriseName',
-                    title: '客户名称',
-                    visible: false
-                },
-                {
-                    field: 'finishProductCode',
-                    title: '成品代码'
-                },
-                {
-                    field: 'finishProductName',
-                    title: '成品名称'
-                },
-                {
-                    field: 'specificationModel',
-                    title: '规格型号'
-                },
-                {
-                    field: 'customerNumber',
-                    title: '客户料号'
-                },
-                {
-                    field: 'typeMachine',
-                    title: '机种'
-                },
-                {
-                    field: 'inventoryUnit',
-                    title: '单位'
-                },
-                {
-                    field: 'commonCurrency',
-                    title: '币别',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(commonCurrencyDatas, value);
-                    }
-                },
-                {
-                    field: 'processPrice',
-                    title: '单价'
-                },
-                {
-                    field: 'productQuantity',
-                    title: '数量'
-                },
-                {
-                    field: 'amountMoney',
-                    title: '金额'
-                },
-                {
-                    field: 'line',
-                    title: '订单项次',
-                    editable: {
-                        type: 'text',
-                        title: '订单项次',
-                        emptytext: '订单项次',
-                        validate: function (value) {
-
-                        }
-                    }
-                },
-                {
-                    field: 'versionNumber',
-                    title: '版本号',
-                    editable: {
-                        type: 'text',
-                        title: '版本号',
-                        emptytext: '版本号',
-                        validate: function (value) {
-
-                        }
-                    }
-                },
-                {
-                    field: 'salesExplain',
-                    title: '说明',
-                    editable: {
-                        type: 'text',
-                        title: '说明',
-                        emptytext: '说明',
-                        validate: function (value) {
-
-                        }
-                    }
-                }]
-        })
-
-        //选择订单
-        function showOrderDetailModal() {
-            if ($.validate.form()) {
-                $("#salesFinishModal").modal("show");
-                var enterpriseCode = $("#form-deliveryGoodsNotice-edit select[name='enterpriseCode']").val()
-                // var enterpriseName = $("#form-deliveryGoodsNotice-add input[name='enterpriseName']").val()
-                $("#salesFinishTable").bootstrapTable("destroy")
-                var options = {
-                    id: 'salesFinishTable',
-                    url: ctx + "system/salesFinish/list",
-                    modalName: "销售产品",
-                    showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-                    cardView: false, // 是否显示详细视图
-                    detailView: false, // 是否显示父子表
-                    smartDisplay: false, // 加了这个才显示每页显示的行数
-                    showExport: false, // 是否显示导出按钮
-                    clickToSelect: true,//点击行选中
-                    queryParams: function (params) {
-                        var curParams = {
-                            // 传递参数查询参数
-                            pageSize: params.limit,
-                            pageNum: params.offset / params.limit + 1,
-                            enterpriseCode: enterpriseCode
-                        };
-                        let json = $.extend(curParams, $.common.formToJSON("salesFinishFormId"));
-                        return json;
-                    },
-                    columns: [{
-                        checkbox: true
-                    },
-                        {
-                            field: 'salesFinishId',
-                            title: '订单id',
-                            visible: false
-                        },
-                        {
-                            field: 'salesOrderCode',
-                            title: '订单编号'
-                        },
-                        {
-                            field: 'salesOrderNumber',
-                            title: '订单号码'
-                        },
-                        {
-                            field: 'enterpriseCode',
-                            title: '客户代码'
-                        },
-                        {
-                            field: 'enterpriseName',
-                            title: '客户名称'
-                        },
-                        {
-                            field: 'finishProductCode',
-                            title: '成品代码'
-                        },
-                        {
-                            field: 'finishProductName',
-                            title: '成品名称'
-                        },
-                        {
-                            field: 'customerNumber',
-                            title: '客户料号'
-                        },
-                        {
-                            field: 'specificationModel',
-                            title: '规格型号'
-                        },
-                        {
-                            field: 'typeMachine',
-                            title: '机种'
-                        },
-                        {
-                            field: 'inventoryUnit',
-                            title: '单位'
-                        },
-                        {
-                            field: 'stockUnitWeight',
-                            title: '重量'
-                        },
-                        {
-                            field: 'commonCurrency',
-                            title: '币别',
-                            formatter: function (value, row, index) {
-                                return $.table.selectDictLabel(commonCurrencyDatas, value);
-                            }
-                        },
-                        {
-                            field: 'processPrice',
-                            title: '单价'
-                        },
-                        {
-                            field: 'productQuantity',
-                            title: '数量'
-                        },
-                        {
-                            field: 'amountMoney',
-                            title: '金额'
-                        },
-                        {
-                            field: 'deliveryTime',
-                            title: '交期'
-                        },
-                        {
-                            field: 'line',
-                            title: 'Line#'
-                        },
-                        {
-                            field: 'versionNumber',
-                            title: '版本号'
-                        },
-                        {
-                            field: 'salesExplain',
-                            title: '说明'
-                        }]
-                };
-                $.table.init(options);
-            } else {
-                $.modal.alertWarning("请先填写必填项！")
-            }
-        }
-
-        //关闭订单框
-        function closeSalesFinishModal() {
-            $("#salesFinishModal").modal("hide");
-        }
-
-        //表中添加选中的订单信息
-        function addSalesFinishToTable() {
-            var data = $("#salesFinishTable").bootstrapTable("getSelections");
-            var count = $('#addSalesFinishTable').bootstrapTable('getData').length;
-            var noticeOrderNumber = $("input[name='noticeOrderNumber']").val();
-            // console.log(materialType)
-            for (i = 0; i < data.length; i++) {
-                let finishProduct = $('#addSalesFinishTable').bootstrapTable('getRowByUniqueId', data[i].finishProductCode);
-                if (finishProduct != null) {
-                    alert(finishProduct.finishProductName + "已存在，不可重复添加!");
-                    continue;
-                }
-                $("#addSalesFinishTable").bootstrapTable('insertRow', {
-                    index: count + i,
-                    row: {
-                        noticeOrderNumber: noticeOrderNumber,
-                        salesOrderNumber: data[i].salesOrderNumber,
-                        enterpriseCode: data[i].enterpriseCode,
-                        enterpriseName: data[i].enterpriseName,
-                        finishProductCode: data[i].finishProductCode,
-                        finishProductName: data[i].finishProductName,
-                        specificationModel: data[i].specificationModel,
-                        customerNumber: data[i].customerNumber,
-                        typeMachine: data[i].typeMachine,
-                        inventoryUnit: data[i].inventoryUnit,
-                        commonCurrency: data[i].commonCurrency,
-                        processPrice: data[i].processPrice,
-                        productQuantity: data[i].productQuantity,
-                        amountMoney: data[i].amountMoney,
-                        line: data[i].line,
-                        versionNumber: data[i].versionNumber,
-                        salesExplain: data[i].salesExplain
-                    }
-                });
-            }
-            $("#salesFinishTable").bootstrapTable("uncheckAll");
-            closeSalesFinishModal();
-        }
-
-        //确认材料信息
-        function confirmSalesFinish() {
-            var data = $("#addSalesFinishTable").bootstrapTable("getData");
-            // console.log(data)
-            $.ajax({
-                url: prefixDetail + '/addEditSave',
-                type: "POST",
-                data: {
-                    data: JSON.stringify(data)
-                },
-                dataType: "json",
-                success: function (resp) {
-                    // console.log(data)
-                    console.log(resp)
-                },
-
-            })
-        }
-
-        //删除订单信息
-        function removeOrderDetail() {
-            var addSalesFinishTableData = $("#addSalesFinishTable").bootstrapTable("getSelections");
-            var ids = [];
-            var finishProductCodes=[];
-            for (let i = 0;i < addSalesFinishTableData.length;i++) {
-                ids.push(addSalesFinishTableData[i].deliveryGoodsDetailId)
-                finishProductCodes.push(addSalesFinishTableData[i].finishProductCode)
-            }
-            // console.log(ids)
-            if (addSalesFinishTableData.length > 0) {
-                $.modal.confirm("是否确认要删除选中的物料？", function (){
-                    $.ajax({
-                        url: prefixDetail + "/removeSalesFinish",
-                        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');
-                            $("#addSalesFinishTable").bootstrapTable ('remove', { field: 'finishProductCode', values: finishProductCodes })
-                        }
-                    })
-                })
-
-            } else {
-                alert("请选择需要删除的数据")
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file