diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceHeadController.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceHeadController.java
deleted file mode 100644
index a317f690..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceHeadController.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.ruoyi.invoice.controller;
-
-import com.alibaba.druid.util.StringUtils;
-import com.alibaba.fastjson.JSONObject;
-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.invoice.domain.PoInvoiceChooseItem;
-import com.ruoyi.invoice.domain.PoInvoiceHead;
-import com.ruoyi.invoice.domain.PoInvoiceHeadWithList;
-import com.ruoyi.invoice.domain.PoInvoiceList;
-import com.ruoyi.invoice.service.IPoInvoiceHeadService;
-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.math.BigDecimal;
-import java.util.List;
-
-/**
- * 税发票列表Controller
- *
- * @author ruoyi
- * @date 2021-11-16
- */
-@Controller
-@RequestMapping("/invoice/poinvoicehead")
-public class PoInvoiceHeadController extends BaseController {
-    private String prefix = "invoice/poinvoicehead";
-
-    @Autowired
-    private IPoInvoiceHeadService poInvoiceHeadService;
-
-    @RequiresPermissions("invoice:poinvoicehead:view")
-    @GetMapping()
-    public String poinvoicehead() {
-        return prefix + "/poinvoicehead";
-    }
-
-    @RequiresPermissions("invoice:poinvoicehead:view")
-    @GetMapping("/view")
-    public String poinvoicehead2() {
-        return "invoice/poInvoicePay/poInvoiceHead2";
-    }
-
-    /**
-     * 查询税发票列表列表
-     */
-    @RequiresPermissions("invoice:poinvoicehead:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(PoInvoiceHead poInvoiceHead) {
-        System.out.println(poInvoiceHead);
-        startPage();
-        List<PoInvoiceHead> list = poInvoiceHeadService.selectPoInvoiceHeadList(poInvoiceHead);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出税发票列表列表
-     */
-//    @RequiresPermissions("invoice:poinvoicehead:export")
-    @Log(title = "税发票列表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(PoInvoiceHead poInvoiceHead) {
-        List<PoInvoiceHead> list = poInvoiceHeadService.selectPoInvoiceHeadList(poInvoiceHead);
-        ExcelUtil<PoInvoiceHead> util = new ExcelUtil<PoInvoiceHead>(PoInvoiceHead.class);
-        return util.exportExcel(list, "税发票列表数据");
-    }
-
-    /**
-     * 新增税发票列表
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存税发票列表
-     */
-//    @RequiresPermissions("invoice:poinvoicehead:add")
-    @Log(title = "税发票列表", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public Result addSave(String jsonStr) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        PoInvoiceHead poInvoiceHead = jsonObject.toJavaObject(PoInvoiceHead.class);
-        if ("-1".equals(poInvoiceHead.getpName())) {
-            return Result.getFailResult("请选择供应商！", null);
-        }
-        if (StringUtils.isEmpty(poInvoiceHead.getInvoiceno())) {
-            return Result.getFailResult("请输入发票号码！", null);
-        }
-        if (StringUtils.isEmpty(poInvoiceHead.getTaxInvoiceNo())) {
-            return Result.getFailResult("请输入国税发票编号！", null);
-        }
-        Long boxNum = poInvoiceHead.getBoxNum();
-        if (boxNum != null) {
-            if (boxNum.toString().length() > 10) {
-                return Result.getFailResult("件数(箱数)不能大于十亿！", null);
-            }
-        }
-        BigDecimal totalMoney = new BigDecimal("0");
-        int totalNum = 0;
-        List<PoInvoiceList> poInvoiceListList = poInvoiceHead.getPoInvoiceListList();
-        for (PoInvoiceList each : poInvoiceListList) {
-            if (each.getAmt().compareTo(BigDecimal.ZERO) <= 0) {
-                return Result.getFailResult("金额不能小于0！", null);
-            } else {
-                totalMoney = totalMoney.add(each.getAmt());
-                totalNum += each.getQty();
-            }
-        }
-        poInvoiceHead.setTotalamt(totalMoney + "");
-        poInvoiceHead.setTotalqty(totalNum + "");
-        int i = poInvoiceHeadService.insertPoInvoiceHead(poInvoiceHead);
-        return Result.getSuccessResult(i);
-    }
-
-    /**
-     * 修改税发票列表
-     */
-    @GetMapping("/edit/{invoiceid}")
-    public String edit(@PathVariable("invoiceid") String invoiceid, ModelMap mmap) {
-        PoInvoiceHead poInvoiceHead = poInvoiceHeadService.selectPoInvoiceHeadById(invoiceid);
-        mmap.put("poInvoiceHead", poInvoiceHead);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存税发票列表
-     */
-//    @RequiresPermissions("invoice:poinvoicehead:edit")
-    @Log(title = "税发票列表", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public Result editSave(String jsonStr) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        PoInvoiceHead poInvoiceHead = jsonObject.toJavaObject(PoInvoiceHead.class);
-        if ("-1".equals(poInvoiceHead.getpName())) {
-            return Result.getFailResult("请选择供应商！", null);
-        }
-        if (StringUtils.isEmpty(poInvoiceHead.getInvoiceno())) {
-            return Result.getFailResult("请输入发票号码！", null);
-        }
-        if (StringUtils.isEmpty(poInvoiceHead.getTaxInvoiceNo())) {
-            return Result.getFailResult("请输入国税发票编号！", null);
-        }
-        Long boxNum = poInvoiceHead.getBoxNum();
-        if (boxNum != null) {
-            if (boxNum.toString().length() > 10) {
-                return Result.getFailResult("件数(箱数)不能大于十亿！", null);
-            }
-        }
-        System.out.println("poInvoiceHead" + poInvoiceHead);
-        List<PoInvoiceList> poInvoiceListList = poInvoiceHead.getPoInvoiceListList();
-        for (PoInvoiceList each : poInvoiceListList) {
-            if (each.getAmt().compareTo(BigDecimal.ZERO) <= 0) {
-                return Result.getFailResult("金额不能小于0！", null);
-            }
-        }
-        int i = poInvoiceHeadService.updatePoInvoiceHead(poInvoiceHead);
-        return Result.getSuccessResult(i);
-    }
-
-    /**
-     * 删除税发票列表
-     */
-    @RequiresPermissions("invoice:poinvoicehead:remove")
-    @Log(title = "税发票列表", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids) {
-        return toAjax(poInvoiceHeadService.deletePoInvoiceHeadByIds(ids));
-    }
-
-    //    @RequiresPermissions("invoice:poinvoicehead:list")
-    @ResponseBody
-    @PostMapping("/list2")
-    public TableDataInfo getHeadWithListList(PoInvoiceHeadWithList poInvoiceHeadWithList) {
-        //System.out.println(poInvoiceHeadWithList);
-        startPage();
-        List<PoInvoiceHeadWithList> list = poInvoiceHeadService.findPoInvoiceHeadWithList(poInvoiceHeadWithList);
-        return getDataTable(list);
-    }
-
-    //    @RequiresPermissions("invoice:poinvoicehead:list")
-    @ResponseBody
-    @PostMapping("/poInvoiceHeadWithList")
-    public TableDataInfo getChooseItemList(PoInvoiceChooseItem poInvoiceChooseItem) {
-        //System.out.println(poInvoiceChooseItem);
-        startPage();
-        List<PoInvoiceChooseItem> list = poInvoiceHeadService.findPoInvoiceChooseItem(poInvoiceChooseItem);
-        return getDataTable(list);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceListController.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceListController.java
deleted file mode 100644
index 0b1fdba4..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoiceListController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.ruoyi.invoice.controller;
-
-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.invoice.domain.PoInvoiceList;
-import com.ruoyi.invoice.service.IPoInvoiceListService;
-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.List;
-
-/**
- * 税发票列表Controller
- *
- * @author ruoyi
- * @date 2021-11-16
- */
-@Controller
-@RequestMapping("/invoice/poinvoicelist")
-public class PoInvoiceListController extends BaseController {
-    private String prefix = "invoice/poinvoicelist";
-
-    @Autowired
-    private IPoInvoiceListService poInvoiceListService;
-
-    @RequiresPermissions("invoice:poinvoicelist:view")
-    @GetMapping()
-    public String poinvoicelist() {
-        return prefix + "/poinvoicelist";
-    }
-
-    /**
-     * 查询税发票列表列表
-     */
-    @RequiresPermissions("invoice:poinvoicelist:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(PoInvoiceList poInvoiceList) {
-        startPage();
-        List<PoInvoiceList> list = poInvoiceListService.selectPoInvoiceListList(poInvoiceList);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出税发票列表列表
-     */
-    @RequiresPermissions("invoice:poinvoicelist:export")
-    @Log(title = "税发票列表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(PoInvoiceList poInvoiceList) {
-        List<PoInvoiceList> list = poInvoiceListService.selectPoInvoiceListList(poInvoiceList);
-        ExcelUtil<PoInvoiceList> util = new ExcelUtil<PoInvoiceList>(PoInvoiceList.class);
-        return util.exportExcel(list, "税发票列表数据");
-    }
-
-    /**
-     * 新增税发票列表
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存税发票列表
-     */
-    @RequiresPermissions("invoice:poinvoicelist:add")
-    @Log(title = "税发票列表", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(PoInvoiceList poInvoiceList) {
-        return toAjax(poInvoiceListService.insertPoInvoiceList(poInvoiceList));
-    }
-
-    /**
-     * 修改税发票列表
-     */
-    @GetMapping("/edit/{invoiceid}")
-    public String edit(@PathVariable("invoiceid") String invoiceid, ModelMap mmap) {
-        PoInvoiceList poInvoiceList = poInvoiceListService.selectPoInvoiceListById(invoiceid);
-        mmap.put("poInvoiceList", poInvoiceList);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存税发票列表
-     */
-    @RequiresPermissions("invoice:poinvoicelist:edit")
-    @Log(title = "税发票列表", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(PoInvoiceList poInvoiceList) {
-        return toAjax(poInvoiceListService.updatePoInvoiceList(poInvoiceList));
-    }
-
-    /**
-     * 删除税发票列表
-     */
-    @RequiresPermissions("invoice:poinvoicelist:remove")
-    @Log(title = "税发票列表", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids) {
-        return toAjax(poInvoiceListService.deletePoInvoiceListByIds(ids));
-    }
-
-
-    @ResponseBody
-    @PostMapping("/getList")
-    public Result list2(PoInvoiceList poInvoiceList) throws Exception {
-        List<PoInvoiceList> poInvoiceLists = poInvoiceListService.selectPoInvoiceListList(poInvoiceList);
-        return Result.getSuccessResult(poInvoiceLists);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoicePayController.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoicePayController.java
deleted file mode 100644
index 37473a67..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/controller/PoInvoicePayController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ruoyi.invoice.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.ck.service.IProviderService;
-import com.ruoyi.ck.utils.Result;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.invoice.domain.PoInvoiceHead;
-import com.ruoyi.invoice.service.IPoInvoiceHeadService;
-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.math.BigDecimal;
-
-/**
- * @author ：pyy
- * @date ：Created in 2021/11/23 16:00
- * @description：
- * @modified By：
- * @version: $
- */
-@Controller
-@RequestMapping("/invoice/poInvoicePay")
-public class PoInvoicePayController extends BaseController {
-
-    private String prefix = "invoice/poInvoicePay";
-
-    @Autowired
-    private IPoInvoiceHeadService poInvoiceHeadService;
-
-    @Autowired
-    private IProviderService providerService;
-
-    /**
-     * 修改税发票列表
-     */
-    @GetMapping("/edit/{Invoiceno}")
-    public String edit(@PathVariable("Invoiceno") String Invoiceno, ModelMap mmap) {
-        PoInvoiceHead poInvoiceHead1 = new PoInvoiceHead();
-        poInvoiceHead1.setInvoiceno(Invoiceno);
-        PoInvoiceHead poInvoiceHead = poInvoiceHeadService.selectPoInvoiceHeadList(poInvoiceHead1).get(0);
-        mmap.put("poInvoiceHead", poInvoiceHead);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存税发票列表
-     */
-//    @RequiresPermissions("invoice:poinvoicehead:edit")
-    @Log(title = "税发票列表", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public Result editSave(String jsonStr) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        PoInvoiceHead poInvoiceHead = jsonObject.toJavaObject(PoInvoiceHead.class);
-        if (poInvoiceHead.getGetmoney().compareTo(BigDecimal.ZERO) <= 0) {
-            return Result.getFailResult("请输入有效金额！", null);
-        }
-        PoInvoiceHead findPoInvoiceHead = new PoInvoiceHead();
-        findPoInvoiceHead.setInvoiceno(poInvoiceHead.getInvoiceno());
-        findPoInvoiceHead = poInvoiceHeadService.selectPoInvoiceHeadList(findPoInvoiceHead).get(0);
-        BigDecimal getMoney = findPoInvoiceHead.getGetmoney();
-        if (getMoney == null) {
-            getMoney = BigDecimal.ZERO;
-        }
-        poInvoiceHead.setGetmoney(poInvoiceHead.getGetmoney().add(getMoney));
-        int i = poInvoiceHeadService.updatePoInvoiceHead(poInvoiceHead);
-        return Result.getSuccessResult(i);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHead.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHead.java
deleted file mode 100644
index c706ae56..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHead.java
+++ /dev/null
@@ -1,570 +0,0 @@
-package com.ruoyi.invoice.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 税发票列表对象 poinvoicehead
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public class PoInvoiceHead extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 发票编号 */
-    @Excel(name = "发票编号")
-    private String invoiceid;
-
-    /** 发票号 */
-    @Excel(name = "发票号")
-    private String Invoiceno;
-
-    /** 厂商名 */
-    @Excel(name = "厂商名")
-    private String pCode;
-
-    /** 厂商名称 */
-    @Excel(name = "厂商名称")
-    private String pName;
-
-    /** 合同号 */
-    @Excel(name = "合同号")
-    private String HTNO;
-
-    /** 付款条件 */
-    @Excel(name = "付款条件")
-    private String PAYWAY;
-
-    /** 开票日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开票日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date invoicedate;
-
-    /** 发送公司 */
-    @Excel(name = "发送公司")
-    private String sendcompany;
-
-    /** 收到公司 */
-    @Excel(name = "收到公司")
-    private String getcompany;
-
-    /** 出口海关 */
-    @Excel(name = "出口海关")
-    private String swater;
-
-    /** 指运港 */
-    @Excel(name = "指运港")
-    private String dwater;
-
-    /** 总数 */
-    @Excel(name = "总数")
-    private String totalqty;
-
-    /** 总价 */
-    @Excel(name = "总价")
-    private String totalamt;
-
-    /** 中文总价 */
-    @Excel(name = "中文总价")
-    private String allenamt;
-
-    /**  */
-    @Excel(name = "")
-    private String opman;
-
-    /** 件数(箱数) */
-    @Excel(name = "件数(箱数)")
-    private Long boxNum;
-
-    /** 运输方式 */
-    @Excel(name = "运输方式")
-    private String sendway;
-
-    /** 运输工具名称 */
-    @Excel(name = "运输工具名称")
-    private String sendtool;
-
-    /** 离境日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "离境日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date leavechinaDate;
-
-    /**  */
-    @Excel(name = "")
-    private String getFormNo;
-
-    /** 抵运国 */
-    @Excel(name = "抵运国")
-    private String ciqName;
-
-    /** 提运单号 */
-    @Excel(name = "提运单号")
-    private String CPSendID;
-
-    /** 币别 */
-    @Excel(name = "币别")
-    private String crlName;
-
-    /** 收款否 */
-    @Excel(name = "收款否")
-    private Long getmoneyFlag;
-
-    /** 扣款数 */
-    @Excel(name = "扣款数")
-    private BigDecimal koukuanAmt;
-
-    /** 扣款备注 */
-    @Excel(name = "扣款备注")
-    private String koukuanMemotext;
-
-    /** 收款备注 */
-    @Excel(name = "收款备注")
-    private String getmoneyMemotext;
-
-    /** 收款日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "收款日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date getmoneyDate;
-
-    /** 收款人 */
-    @Excel(name = "收款人")
-    private String getmoneyMan;
-
-    /** 收款数 */
-    @Excel(name = "收款数")
-    private BigDecimal getmoney;
-
-    /** 国税发票编号 */
-    @Excel(name = "国税发票编号")
-    private String taxInvoiceNo;
-
-    /** 发票印字版本 */
-    @Excel(name = "发票印字版本")
-    private String taxPrintVersion;
-
-    /**  */
-    @Excel(name = "")
-    private String payall;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String MemoText;
-
-    /** 到票日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "到票日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date ShouldPayDate;
-
-    /** 使用的钱 */
-    @Excel(name = "使用的钱")
-    private BigDecimal haveAppAmt;
-
-    private List<PoInvoiceList> poInvoiceListList;
-
-    //剩余交期
-    private String surplusPayDay;
-
-    //是否全款
-    private String isAllPay;
-
-    public List<PoInvoiceList> getPoInvoiceListList() {
-        return poInvoiceListList;
-    }
-
-    public void setPoInvoiceListList(List<PoInvoiceList> poInvoiceListList) {
-        this.poInvoiceListList = poInvoiceListList;
-    }
-
-    public String getSurplusPayDay() {
-        return surplusPayDay;
-    }
-
-    public void setSurplusPayDay(String surplusPayDay) {
-        this.surplusPayDay = surplusPayDay;
-    }
-
-    public String getIsAllPay() {
-        return isAllPay;
-    }
-
-    public void setIsAllPay(String isAllPay) {
-        this.isAllPay = isAllPay;
-    }
-
-    public void setInvoiceid(String invoiceid)
-    {
-        this.invoiceid = invoiceid;
-    }
-
-    public String getInvoiceid() 
-    {
-        return invoiceid;
-    }
-    public void setInvoiceno(String Invoiceno) 
-    {
-        this.Invoiceno = Invoiceno;
-    }
-
-    public String getInvoiceno() 
-    {
-        return Invoiceno;
-    }
-    public void setpCode(String pCode) 
-    {
-        this.pCode = pCode;
-    }
-
-    public String getpCode() 
-    {
-        return pCode;
-    }
-    public void setpName(String pName) 
-    {
-        this.pName = pName;
-    }
-
-    public String getpName() 
-    {
-        return pName;
-    }
-    public void setHTNO(String HTNO) 
-    {
-        this.HTNO = HTNO;
-    }
-
-    public String getHTNO() 
-    {
-        return HTNO;
-    }
-    public void setPAYWAY(String PAYWAY) 
-    {
-        this.PAYWAY = PAYWAY;
-    }
-
-    public String getPAYWAY() 
-    {
-        return PAYWAY;
-    }
-    public void setInvoicedate(Date invoicedate) 
-    {
-        this.invoicedate = invoicedate;
-    }
-
-    public Date getInvoicedate() 
-    {
-        return invoicedate;
-    }
-    public void setSendcompany(String sendcompany) 
-    {
-        this.sendcompany = sendcompany;
-    }
-
-    public String getSendcompany() 
-    {
-        return sendcompany;
-    }
-    public void setGetcompany(String getcompany) 
-    {
-        this.getcompany = getcompany;
-    }
-
-    public String getGetcompany() 
-    {
-        return getcompany;
-    }
-    public void setSwater(String swater) 
-    {
-        this.swater = swater;
-    }
-
-    public String getSwater() 
-    {
-        return swater;
-    }
-    public void setDwater(String dwater) 
-    {
-        this.dwater = dwater;
-    }
-
-    public String getDwater() 
-    {
-        return dwater;
-    }
-    public void setTotalqty(String totalqty) 
-    {
-        this.totalqty = totalqty;
-    }
-
-    public String getTotalqty() 
-    {
-        return totalqty;
-    }
-    public void setTotalamt(String totalamt) 
-    {
-        this.totalamt = totalamt;
-    }
-
-    public String getTotalamt() 
-    {
-        return totalamt;
-    }
-    public void setAllenamt(String allenamt) 
-    {
-        this.allenamt = allenamt;
-    }
-
-    public String getAllenamt() 
-    {
-        return allenamt;
-    }
-    public void setOpman(String opman) 
-    {
-        this.opman = opman;
-    }
-
-    public String getOpman() 
-    {
-        return opman;
-    }
-    public void setBoxNum(Long boxNum) 
-    {
-        this.boxNum = boxNum;
-    }
-
-    public Long getBoxNum() 
-    {
-        return boxNum;
-    }
-    public void setSendway(String sendway) 
-    {
-        this.sendway = sendway;
-    }
-
-    public String getSendway() 
-    {
-        return sendway;
-    }
-    public void setSendtool(String sendtool) 
-    {
-        this.sendtool = sendtool;
-    }
-
-    public String getSendtool() 
-    {
-        return sendtool;
-    }
-    public void setLeavechinaDate(Date leavechinaDate) 
-    {
-        this.leavechinaDate = leavechinaDate;
-    }
-
-    public Date getLeavechinaDate() 
-    {
-        return leavechinaDate;
-    }
-    public void setGetFormNo(String getFormNo) 
-    {
-        this.getFormNo = getFormNo;
-    }
-
-    public String getGetFormNo() 
-    {
-        return getFormNo;
-    }
-    public void setCiqName(String ciqName) 
-    {
-        this.ciqName = ciqName;
-    }
-
-    public String getCiqName() 
-    {
-        return ciqName;
-    }
-    public void setCPSendID(String CPSendID) 
-    {
-        this.CPSendID = CPSendID;
-    }
-
-    public String getCPSendID() 
-    {
-        return CPSendID;
-    }
-    public void setCrlName(String crlName) 
-    {
-        this.crlName = crlName;
-    }
-
-    public String getCrlName() 
-    {
-        return crlName;
-    }
-    public void setGetmoneyFlag(Long getmoneyFlag) 
-    {
-        this.getmoneyFlag = getmoneyFlag;
-    }
-
-    public Long getGetmoneyFlag() 
-    {
-        return getmoneyFlag;
-    }
-    public void setKoukuanAmt(BigDecimal koukuanAmt) 
-    {
-        this.koukuanAmt = koukuanAmt;
-    }
-
-    public BigDecimal getKoukuanAmt() 
-    {
-        return koukuanAmt;
-    }
-    public void setKoukuanMemotext(String koukuanMemotext) 
-    {
-        this.koukuanMemotext = koukuanMemotext;
-    }
-
-    public String getKoukuanMemotext() 
-    {
-        return koukuanMemotext;
-    }
-    public void setGetmoneyMemotext(String getmoneyMemotext) 
-    {
-        this.getmoneyMemotext = getmoneyMemotext;
-    }
-
-    public String getGetmoneyMemotext() 
-    {
-        return getmoneyMemotext;
-    }
-    public void setGetmoneyDate(Date getmoneyDate) 
-    {
-        this.getmoneyDate = getmoneyDate;
-    }
-
-    public Date getGetmoneyDate() 
-    {
-        return getmoneyDate;
-    }
-    public void setGetmoneyMan(String getmoneyMan) 
-    {
-        this.getmoneyMan = getmoneyMan;
-    }
-
-    public String getGetmoneyMan() 
-    {
-        return getmoneyMan;
-    }
-    public void setGetmoney(BigDecimal getmoney) 
-    {
-        this.getmoney = getmoney;
-    }
-
-    public BigDecimal getGetmoney() 
-    {
-        return getmoney;
-    }
-    public void setTaxInvoiceNo(String taxInvoiceNo) 
-    {
-        this.taxInvoiceNo = taxInvoiceNo;
-    }
-
-    public String getTaxInvoiceNo() 
-    {
-        return taxInvoiceNo;
-    }
-    public void setTaxPrintVersion(String taxPrintVersion) 
-    {
-        this.taxPrintVersion = taxPrintVersion;
-    }
-
-    public String getTaxPrintVersion() 
-    {
-        return taxPrintVersion;
-    }
-    public void setPayall(String payall) 
-    {
-        this.payall = payall;
-    }
-
-    public String getPayall() 
-    {
-        return payall;
-    }
-    public void setMemoText(String MemoText) 
-    {
-        this.MemoText = MemoText;
-    }
-
-    public String getMemoText() 
-    {
-        return MemoText;
-    }
-    public void setShouldPayDate(Date ShouldPayDate) 
-    {
-        this.ShouldPayDate = ShouldPayDate;
-    }
-
-    public Date getShouldPayDate() 
-    {
-        return ShouldPayDate;
-    }
-    public void setHaveAppAmt(BigDecimal haveAppAmt) 
-    {
-        this.haveAppAmt = haveAppAmt;
-    }
-
-    public BigDecimal getHaveAppAmt() 
-    {
-        return haveAppAmt;
-    }
-
-    @Override
-    public String toString() {
-        return "PoInvoiceHead{" +
-                "invoiceid='" + invoiceid + '\'' +
-                ", Invoiceno='" + Invoiceno + '\'' +
-                ", pCode='" + pCode + '\'' +
-                ", pName='" + pName + '\'' +
-                ", HTNO='" + HTNO + '\'' +
-                ", PAYWAY='" + PAYWAY + '\'' +
-                ", invoicedate=" + invoicedate +
-                ", sendcompany='" + sendcompany + '\'' +
-                ", getcompany='" + getcompany + '\'' +
-                ", swater='" + swater + '\'' +
-                ", dwater='" + dwater + '\'' +
-                ", totalqty='" + totalqty + '\'' +
-                ", totalamt='" + totalamt + '\'' +
-                ", allenamt='" + allenamt + '\'' +
-                ", opman='" + opman + '\'' +
-                ", boxNum=" + boxNum +
-                ", sendway='" + sendway + '\'' +
-                ", sendtool='" + sendtool + '\'' +
-                ", leavechinaDate=" + leavechinaDate +
-                ", getFormNo='" + getFormNo + '\'' +
-                ", ciqName='" + ciqName + '\'' +
-                ", CPSendID='" + CPSendID + '\'' +
-                ", crlName='" + crlName + '\'' +
-                ", getmoneyFlag=" + getmoneyFlag +
-                ", koukuanAmt=" + koukuanAmt +
-                ", koukuanMemotext='" + koukuanMemotext + '\'' +
-                ", getmoneyMemotext='" + getmoneyMemotext + '\'' +
-                ", getmoneyDate=" + getmoneyDate +
-                ", getmoneyMan='" + getmoneyMan + '\'' +
-                ", getmoney=" + getmoney +
-                ", taxInvoiceNo='" + taxInvoiceNo + '\'' +
-                ", taxPrintVersion='" + taxPrintVersion + '\'' +
-                ", payall='" + payall + '\'' +
-                ", MemoText='" + MemoText + '\'' +
-                ", ShouldPayDate=" + ShouldPayDate +
-                ", haveAppAmt=" + haveAppAmt +
-                ", poInvoiceListList=" + poInvoiceListList +
-                ", surplusPayDay='" + surplusPayDay + '\'' +
-                ", isAllPay='" + isAllPay + '\'' +
-                '}';
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHeadWithList.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHeadWithList.java
deleted file mode 100644
index 8bcf5a06..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceHeadWithList.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.ruoyi.invoice.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import java.util.Date;
-
-/**
- * @author ：pyy
- * @date ：Created in 2021/11/16 15:12
- * @description：税发票主子表联结查询
- * @modified By：
- * @version: 1.0.0$
- */
-public class PoInvoiceHeadWithList extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @Excel(name = "发票编号")
-    private String invoiceId;
-
-    @Excel(name = "发票号")
-    private String invoiceNo;
-
-    @Excel(name = "厂商名")
-    private String pCode;
-
-    @Excel(name = "厂商名称")
-    private String pName;
-
-    @Excel(name = "合同号")
-    private String HTNo;
-
-    @Excel(name = "付款条件")
-    private String payWay;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开票日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date invoiceDate;
-
-    @Excel(name = "规格型号")
-    private String orderNo;
-
-    @Excel(name = "物料代码")
-    private String wlCode;
-
-    @Excel(name = "物料名称")
-    private String itemName;
-
-    @Excel(name = "单位")
-    private String stockDw;
-
-    @Excel(name = "币别")
-    private String crlName;
-
-    @Excel(name = "数量")
-    private String qty;
-
-    @Excel(name = "单价")
-    private String price;
-
-    @Excel(name = "金额")
-    private String amt;
-
-    @Excel(name = "国税发票编号")
-    private String taxInvoiceNo;
-
-    @Excel(name = "发票印字版本")
-    private String taxPriceVersion;
-
-    @Excel(name = "收款否")
-    private String getMoneyFlag;
-
-    public String getInvoiceId() {
-        return invoiceId;
-    }
-
-    public void setInvoiceId(String invoiceId) {
-        this.invoiceId = invoiceId;
-    }
-
-    public String getInvoiceNo() {
-        return invoiceNo;
-    }
-
-    public void setInvoiceNo(String invoiceNo) {
-        this.invoiceNo = invoiceNo;
-    }
-
-    public String getpCode() {
-        return pCode;
-    }
-
-    public void setpCode(String pCode) {
-        this.pCode = pCode;
-    }
-
-    public String getpName() {
-        return pName;
-    }
-
-    public void setpName(String pName) {
-        this.pName = pName;
-    }
-
-    public String getHTNo() {
-        return HTNo;
-    }
-
-    public void setHTNo(String HTNo) {
-        this.HTNo = HTNo;
-    }
-
-    public String getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(String payWay) {
-        this.payWay = payWay;
-    }
-
-    public Date getInvoiceDate() {
-        return invoiceDate;
-    }
-
-    public void setInvoiceDate(Date invoiceDate) {
-        this.invoiceDate = invoiceDate;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getWlCode() {
-        return wlCode;
-    }
-
-    public void setWlCode(String wlCode) {
-        this.wlCode = wlCode;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    public String getStockDw() {
-        return stockDw;
-    }
-
-    public void setStockDw(String stockDw) {
-        this.stockDw = stockDw;
-    }
-
-    public String getCrlName() {
-        return crlName;
-    }
-
-    public void setCrlName(String crlName) {
-        this.crlName = crlName;
-    }
-
-    public String getQty() {
-        return qty;
-    }
-
-    public void setQty(String qty) {
-        this.qty = qty;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getAmt() {
-        return amt;
-    }
-
-    public void setAmt(String amt) {
-        this.amt = amt;
-    }
-
-    public String getTaxInvoiceNo() {
-        return taxInvoiceNo;
-    }
-
-    public void setTaxInvoiceNo(String taxInvoiceNo) {
-        this.taxInvoiceNo = taxInvoiceNo;
-    }
-
-    public String getTaxPriceVersion() {
-        return taxPriceVersion;
-    }
-
-    public void setTaxPriceVersion(String taxPriceVersion) {
-        this.taxPriceVersion = taxPriceVersion;
-    }
-
-    public String getGetMoneyFlag() {
-        return getMoneyFlag;
-    }
-
-    public void setGetMoneyFlag(String getMoneyFlag) {
-        this.getMoneyFlag = getMoneyFlag;
-    }
-
-    @Override
-    public String toString() {
-        return "PoInvoiceHeadWithList{" +
-                "invoiceId='" + invoiceId + '\'' +
-                ", invoiceNo='" + invoiceNo + '\'' +
-                ", pCode='" + pCode + '\'' +
-                ", pName='" + pName + '\'' +
-                ", HTNo='" + HTNo + '\'' +
-                ", payWay='" + payWay + '\'' +
-                ", invoiceDate=" + invoiceDate +
-                ", orderNo='" + orderNo + '\'' +
-                ", wlCode='" + wlCode + '\'' +
-                ", itemName='" + itemName + '\'' +
-                ", stockDw='" + stockDw + '\'' +
-                ", crlName='" + crlName + '\'' +
-                ", qty='" + qty + '\'' +
-                ", price='" + price + '\'' +
-                ", amt='" + amt + '\'' +
-                ", taxInvoiceNo='" + taxInvoiceNo + '\'' +
-                ", taxPriceVersion='" + taxPriceVersion + '\'' +
-                ", getMoneyFlag='" + getMoneyFlag + '\'' +
-                '}';
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceList.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceList.java
deleted file mode 100644
index 8ef71094..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/domain/PoInvoiceList.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.ruoyi.invoice.domain;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-
-/**
- * 税发票列表对象 poinvoicelist
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public class PoInvoiceList extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 发票编号 */
-    @Excel(name = "发票编号")
-    private String invoiceid;
-
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String orderno;
-
-    /** 物料代码· */
-    @Excel(name = "物料代码")
-    private String wlCode;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String itemname;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String stockDw;
-
-    /** 币别 */
-    @Excel(name = "币别")
-    private String crlName;
-
-    /** 数量 */
-    @Excel(name = "数量")
-    private Long qty;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private BigDecimal price;
-
-    /** 金额 */
-    @Excel(name = "金额")
-    private BigDecimal amt;
-
-    /**  */
-    @Excel(name = "")
-    private String PNO;
-
-    /**  */
-    @Excel(name = "")
-    private String FPH;
-
-    public void setInvoiceid(String invoiceid) 
-    {
-        this.invoiceid = invoiceid;
-    }
-
-    public String getInvoiceid() 
-    {
-        return invoiceid;
-    }
-    public void setOrderno(String orderno) 
-    {
-        this.orderno = orderno;
-    }
-
-    public String getOrderno() 
-    {
-        return orderno;
-    }
-    public void setWlCode(String wlCode) 
-    {
-        this.wlCode = wlCode;
-    }
-
-    public String getWlCode() 
-    {
-        return wlCode;
-    }
-    public void setItemname(String itemname) 
-    {
-        this.itemname = itemname;
-    }
-
-    public String getItemname() 
-    {
-        return itemname;
-    }
-    public void setStockDw(String stockDw) 
-    {
-        this.stockDw = stockDw;
-    }
-
-    public String getStockDw() 
-    {
-        return stockDw;
-    }
-    public void setCrlName(String crlName) 
-    {
-        this.crlName = crlName;
-    }
-
-    public String getCrlName() 
-    {
-        return crlName;
-    }
-    public void setQty(Long qty) 
-    {
-        this.qty = qty;
-    }
-
-    public Long getQty() 
-    {
-        return qty;
-    }
-    public void setPrice(BigDecimal price) 
-    {
-        this.price = price;
-    }
-
-    public BigDecimal getPrice() 
-    {
-        return price;
-    }
-    public void setAmt(BigDecimal amt) 
-    {
-        this.amt = amt;
-    }
-
-    public BigDecimal getAmt() 
-    {
-        return amt;
-    }
-    public void setPNO(String PNO) 
-    {
-        this.PNO = PNO;
-    }
-
-    public String getPNO() 
-    {
-        return PNO;
-    }
-    public void setFPH(String FPH) 
-    {
-        this.FPH = FPH;
-    }
-
-    public String getFPH() 
-    {
-        return FPH;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("invoiceid", getInvoiceid())
-            .append("orderno", getOrderno())
-            .append("wlCode", getWlCode())
-            .append("itemname", getItemname())
-            .append("stockDw", getStockDw())
-            .append("crlName", getCrlName())
-            .append("qty", getQty())
-            .append("price", getPrice())
-            .append("amt", getAmt())
-            .append("PNO", getPNO())
-            .append("FPH", getFPH())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadMapper.java
deleted file mode 100644
index 4c8ed234..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadMapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.invoice.mapper;
-
-import com.ruoyi.invoice.domain.PoInvoiceHead;
-
-import java.util.List;
-
-/**
- * 税发票列表Mapper接口
- *
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface PoInvoiceHeadMapper {
-    /**
-     * 查询税发票列表
-     *
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    public PoInvoiceHead selectPoInvoiceHeadById(String invoiceid);
-
-    /**
-     * 查询税发票列表列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 税发票列表集合
-     */
-    public List<PoInvoiceHead> selectPoInvoiceHeadList(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 新增税发票列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    public int insertPoInvoiceHead(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 修改税发票列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    public int updatePoInvoiceHead(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 删除税发票列表
-     *
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    public int deletePoInvoiceHeadById(String invoiceid);
-
-    /**
-     * 批量删除税发票列表
-     *
-     * @param invoiceids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deletePoInvoiceHeadByIds(String[] invoiceids);
-
-    /**
-     * @throws
-     * @title selectCountByDay
-     * @description
-     * @author pyy
-     * @updateTime 2021/11/18 17:21
-     * @return: java.lang.Integer
-     */
-    public Integer selectCountByDay();
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadWithListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadWithListMapper.java
deleted file mode 100644
index 1a3a3b5b..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceHeadWithListMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.ruoyi.invoice.mapper;
-
-import com.ruoyi.invoice.domain.PoInvoiceHeadWithList;
-
-import java.util.List;
-
-/**
- * @author ：pyy
- * @date ：Created in 2021/11/16 16:27
- * @description：税发票联结查询mapper
- * @modified By：
- * @version: 1.0.0$
- */
-public interface PoInvoiceHeadWithListMapper {
-
-    public List<PoInvoiceHeadWithList> selectPoInvoiceHeadWithList(PoInvoiceHeadWithList poInvoiceHeadWithList);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceListMapper.java
deleted file mode 100644
index d766533c..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/mapper/PoInvoiceListMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.invoice.mapper;
-
-import com.ruoyi.invoice.domain.PoInvoiceList;
-
-import java.util.List;
-
-/**
- * 税发票列表Mapper接口
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface PoInvoiceListMapper 
-{
-    /**
-     * 查询税发票列表
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    public PoInvoiceList selectPoInvoiceListById(String invoiceid);
-
-    /**
-     * 查询税发票列表列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 税发票列表集合
-     */
-    public List<PoInvoiceList> selectPoInvoiceListList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 新增税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    public int insertPoInvoiceList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 修改税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    public int updatePoInvoiceList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 删除税发票列表
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    public int deletePoInvoiceListById(String invoiceid);
-
-    /**
-     * 批量删除税发票列表
-     * 
-     * @param invoiceids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deletePoInvoiceListByIds(String[] invoiceids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceHeadService.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceHeadService.java
deleted file mode 100644
index 47ed6d5c..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceHeadService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.invoice.service;
-
-import com.ruoyi.invoice.domain.PoInvoiceChooseItem;
-import com.ruoyi.invoice.domain.PoInvoiceHead;
-import com.ruoyi.invoice.domain.PoInvoiceHeadWithList;
-
-import java.util.List;
-
-/**
- * 税发票列表Service接口
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface IPoInvoiceHeadService 
-{
-    /**
-     * 查询税发票列表
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    public PoInvoiceHead selectPoInvoiceHeadById(String invoiceid);
-
-    /**
-     * 查询税发票列表列表
-     * 
-     * @param poInvoiceHead 税发票列表
-     * @return 税发票列表集合
-     */
-    public List<PoInvoiceHead> selectPoInvoiceHeadList(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 新增税发票列表
-     * 
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    public int insertPoInvoiceHead(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 修改税发票列表
-     * 
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    public int updatePoInvoiceHead(PoInvoiceHead poInvoiceHead);
-
-    /**
-     * 批量删除税发票列表
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deletePoInvoiceHeadByIds(String ids);
-
-    /**
-     * 删除税发票列表信息
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    public int deletePoInvoiceHeadById(String invoiceid);
-
-    public List<PoInvoiceHeadWithList> findPoInvoiceHeadWithList(PoInvoiceHeadWithList poInvoiceHeadWithList);
-
-    public List<PoInvoiceChooseItem> findPoInvoiceChooseItem(PoInvoiceChooseItem poInvoiceChooseItem);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceListService.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceListService.java
deleted file mode 100644
index 2a13e892..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/IPoInvoiceListService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.invoice.service;
-
-import com.ruoyi.invoice.domain.PoInvoiceList;
-
-import java.util.List;
-
-/**
- * 税发票列表Service接口
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface IPoInvoiceListService 
-{
-    /**
-     * 查询税发票列表
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    public PoInvoiceList selectPoInvoiceListById(String invoiceid);
-
-    /**
-     * 查询税发票列表列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 税发票列表集合
-     */
-    public List<PoInvoiceList> selectPoInvoiceListList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 新增税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    public int insertPoInvoiceList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 修改税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    public int updatePoInvoiceList(PoInvoiceList poInvoiceList);
-
-    /**
-     * 批量删除税发票列表
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deletePoInvoiceListByIds(String ids);
-
-    /**
-     * 删除税发票列表信息
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    public int deletePoInvoiceListById(String invoiceid);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceHeadServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceHeadServiceImpl.java
deleted file mode 100644
index e3f29451..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceHeadServiceImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.ruoyi.invoice.service.impl;
-
-import com.alibaba.druid.util.StringUtils;
-import com.ruoyi.ck.domain.Provider;
-import com.ruoyi.ck.mapper.ProviderMapper;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.invoice.domain.PoInvoiceChooseItem;
-import com.ruoyi.invoice.domain.PoInvoiceHead;
-import com.ruoyi.invoice.domain.PoInvoiceHeadWithList;
-import com.ruoyi.invoice.domain.PoInvoiceList;
-import com.ruoyi.invoice.mapper.PoInvoiceChooseItemMapper;
-import com.ruoyi.invoice.mapper.PoInvoiceHeadMapper;
-import com.ruoyi.invoice.mapper.PoInvoiceHeadWithListMapper;
-import com.ruoyi.invoice.mapper.PoInvoiceListMapper;
-import com.ruoyi.invoice.service.IPoInvoiceHeadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 税发票列表Service业务层处理
- *
- * @author ruoyi
- * @date 2021-11-16
- */
-@Service
-public class PoInvoiceHeadServiceImpl implements IPoInvoiceHeadService {
-    @Autowired
-    private PoInvoiceHeadMapper poInvoiceHeadMapper;
-
-    @Autowired
-    private PoInvoiceHeadWithListMapper poInvoiceHeadWithListMapper;
-
-    @Autowired
-    private PoInvoiceListMapper poInvoiceListMapper;
-
-    @Autowired
-    private ProviderMapper providerMapper;
-
-    @Autowired
-    private PoInvoiceChooseItemMapper poInvoiceChooseItemMapper;
-
-    private static final int TEN = 10;
-
-    private static final int HUNDRED = 100;
-
-    /**
-     * 查询税发票列表
-     *
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    @Override
-    public PoInvoiceHead selectPoInvoiceHeadById(String invoiceid) {
-        return poInvoiceHeadMapper.selectPoInvoiceHeadById(invoiceid);
-    }
-
-    /**
-     * 查询税发票列表列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 税发票列表
-     */
-    @Override
-    public List<PoInvoiceHead> selectPoInvoiceHeadList(PoInvoiceHead poInvoiceHead) {
-        List<PoInvoiceHead> poInvoiceHeads = poInvoiceHeadMapper.selectPoInvoiceHeadList(poInvoiceHead);
-        String totalAmt;
-        for (PoInvoiceHead each : poInvoiceHeads) {
-            totalAmt = each.getTotalamt();
-            if (totalAmt != null) {
-                if (totalAmt.startsWith("R") || totalAmt.startsWith("U")) {
-                    each.setTotalamt(totalAmt.substring(3));
-                }
-            }
-        }
-        return poInvoiceHeads;
-    }
-
-    /**
-     * 新增税发票列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    @Override
-    public int insertPoInvoiceHead(PoInvoiceHead poInvoiceHead) {
-        Integer findCountByDay = poInvoiceHeadMapper.selectCountByDay();
-        String today = LocalDate.now().toString().replaceAll("-", "");
-        String id = "POFP_" + today;
-        if (findCountByDay < TEN) {
-            id += "00" + findCountByDay;
-        } else if (findCountByDay < HUNDRED) {
-            id += "0" + findCountByDay;
-        } else {
-            id += findCountByDay;
-        }
-        Provider provider = new Provider();
-        provider.setpName(poInvoiceHead.getpName());
-        List<Provider> providers = providerMapper.selectByItem(provider);
-        poInvoiceHead.setpCode(providers.get(0).getpCode());
-        Date date = new Date();
-        poInvoiceHead.setInvoicedate(date);
-        poInvoiceHead.setInvoiceid(id);
-        //poInvoiceHead.setSendcompany("Kens Electronics Technology CO.LTD.");
-        List<PoInvoiceList> poInvoiceListList = poInvoiceHead.getPoInvoiceListList();
-        for (PoInvoiceList each : poInvoiceListList) {
-            each.setInvoiceid(id);
-            if (StringUtils.isEmpty(each.getCrlName())) {
-                each.setCrlName("RMB");
-            }
-            poInvoiceListMapper.insertPoInvoiceList(each);
-        }
-        return poInvoiceHeadMapper.insertPoInvoiceHead(poInvoiceHead);
-    }
-
-    /**
-     * 修改税发票列表
-     *
-     * @param poInvoiceHead 税发票列表
-     * @return 结果
-     */
-    @Override
-    public int updatePoInvoiceHead(PoInvoiceHead poInvoiceHead) {
-        Provider provider = new Provider();
-        provider.setpName(poInvoiceHead.getpName());
-        List<Provider> providers = providerMapper.selectByItem(provider);
-        poInvoiceHead.setpCode(providers.get(0).getpCode());
-        String invoiceid = poInvoiceHead.getInvoiceid();
-        poInvoiceListMapper.deletePoInvoiceListById(invoiceid);
-        List<PoInvoiceList> poInvoiceListList = poInvoiceHead.getPoInvoiceListList();
-        if (poInvoiceListList != null) {
-            for (PoInvoiceList each : poInvoiceListList) {
-                each.setInvoiceid(invoiceid);
-                if (StringUtils.isEmpty(each.getCrlName())) {
-                    each.setCrlName("RMB");
-                }
-                poInvoiceListMapper.insertPoInvoiceList(each);
-
-            }
-        }
-        return poInvoiceHeadMapper.updatePoInvoiceHead(poInvoiceHead);
-    }
-
-    /**
-     * 删除税发票列表对象
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deletePoInvoiceHeadByIds(String ids) {
-        return poInvoiceHeadMapper.deletePoInvoiceHeadByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除税发票列表信息
-     *
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    @Override
-    public int deletePoInvoiceHeadById(String invoiceid) {
-        return poInvoiceHeadMapper.deletePoInvoiceHeadById(invoiceid);
-    }
-
-    @Override
-    public List<PoInvoiceHeadWithList> findPoInvoiceHeadWithList(PoInvoiceHeadWithList poInvoiceHeadWithList) {
-        return poInvoiceHeadWithListMapper.selectPoInvoiceHeadWithList(poInvoiceHeadWithList);
-    }
-
-    @Override
-    public List<PoInvoiceChooseItem> findPoInvoiceChooseItem(PoInvoiceChooseItem poInvoiceChooseItem) {
-        return poInvoiceChooseItemMapper.selectPoInvoiceChooseItemList(poInvoiceChooseItem);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceListServiceImpl.java
deleted file mode 100644
index a0bd859c..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/invoice/service/impl/PoInvoiceListServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.invoice.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.invoice.domain.PoInvoiceList;
-import com.ruoyi.invoice.mapper.PoInvoiceListMapper;
-import com.ruoyi.invoice.service.IPoInvoiceListService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 税发票列表Service业务层处理
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-@Service
-public class PoInvoiceListServiceImpl implements IPoInvoiceListService 
-{
-    @Autowired
-    private PoInvoiceListMapper poInvoiceListMapper;
-
-    /**
-     * 查询税发票列表
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 税发票列表
-     */
-    @Override
-    public PoInvoiceList selectPoInvoiceListById(String invoiceid)
-    {
-        return poInvoiceListMapper.selectPoInvoiceListById(invoiceid);
-    }
-
-    /**
-     * 查询税发票列表列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 税发票列表
-     */
-    @Override
-    public List<PoInvoiceList> selectPoInvoiceListList(PoInvoiceList poInvoiceList)
-    {
-        return poInvoiceListMapper.selectPoInvoiceListList(poInvoiceList);
-    }
-
-    /**
-     * 新增税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    @Override
-    public int insertPoInvoiceList(PoInvoiceList poInvoiceList)
-    {
-        return poInvoiceListMapper.insertPoInvoiceList(poInvoiceList);
-    }
-
-    /**
-     * 修改税发票列表
-     * 
-     * @param poInvoiceList 税发票列表
-     * @return 结果
-     */
-    @Override
-    public int updatePoInvoiceList(PoInvoiceList poInvoiceList)
-    {
-        return poInvoiceListMapper.updatePoInvoiceList(poInvoiceList);
-    }
-
-    /**
-     * 删除税发票列表对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deletePoInvoiceListByIds(String ids)
-    {
-        return poInvoiceListMapper.deletePoInvoiceListByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除税发票列表信息
-     * 
-     * @param invoiceid 税发票列表ID
-     * @return 结果
-     */
-    @Override
-    public int deletePoInvoiceListById(String invoiceid)
-    {
-        return poInvoiceListMapper.deletePoInvoiceListById(invoiceid);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.java
deleted file mode 100644
index 7dae4262..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package com.ruoyi.manufacture.domain.exportDto;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 领料物料对象 material_requisition_detail
- * 
- * @author ruoyi
- * @date 2023-04-06
- */
-public class MaterialRequisitionDetailDto extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-    /** 序号 */
-    @ExcelProperty("序号")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private Integer number;
-
-    /** 领料物料id */
-    private Long materialRequisitionDetailId;
-
-    /** 领料单号 */
-    @ExcelProperty("领料单号")
-    private String materialRequisitionNumber;
-
-    /** 物料代码 */
-    @ExcelProperty("物料代码")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String materialCode;
-
-    /** 物料名称 */
-    @ExcelProperty("物料名称")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String materialName;
-
-    /** 规格型号 */
-    @ExcelProperty("规格型号")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String specificationModel;
-
-    /** 料号 */
-    @ExcelProperty("料号")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String itemNumber;
-
-    /** 机种 */
-    @ExcelProperty("机种")
-    private String typeMachine;
-
-    /** 单位 */
-    @ExcelProperty("单位")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String inventoryUnit;
-
-    /** 计划数量 */
-    @ExcelProperty("计划数量")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String planQuantity;
-
-    /** 说明 */
-    @ExcelProperty("说明")
-    private String description;
-
-    /** 单位用量 */
-    @ExcelProperty("单位用量")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String unitUsage;
-
-    /** 存放位置 */
-    @ExcelProperty("存放位置")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String storageLocation;
-
-    /** 物料类别 */
-    @ExcelProperty("物料类别")
-    private String materialType;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-    /** 实发数量 */
-    @ExcelProperty("实发数量")
-//    @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
-    private String actualQuantity;
-
-    /** bom阶 */
-    @Excel(name = "bom阶")
-    private String bomRank;
-
-    /** 上级半成品代码 */
-    @Excel(name = "上级半成品代码")
-    private String upFinishProductCode;
-
-    public void setMaterialRequisitionDetailId(Long materialRequisitionDetailId) 
-    {
-        this.materialRequisitionDetailId = materialRequisitionDetailId;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Long getMaterialRequisitionDetailId()
-    {
-        return materialRequisitionDetailId;
-    }
-    public void setMaterialRequisitionNumber(String materialRequisitionNumber) 
-    {
-        this.materialRequisitionNumber = materialRequisitionNumber;
-    }
-
-    public String getMaterialRequisitionNumber() 
-    {
-        return materialRequisitionNumber;
-    }
-    public void setMaterialCode(String materialCode) 
-    {
-        this.materialCode = materialCode;
-    }
-
-    public String getMaterialCode() 
-    {
-        return materialCode;
-    }
-    public void setMaterialName(String materialName) 
-    {
-        this.materialName = materialName;
-    }
-
-    public String getMaterialName() 
-    {
-        return materialName;
-    }
-    public void setSpecificationModel(String specificationModel) 
-    {
-        this.specificationModel = specificationModel;
-    }
-
-    public String getSpecificationModel() 
-    {
-        return specificationModel;
-    }
-
-    public String getItemNumber() {
-        return itemNumber;
-    }
-
-    public void setItemNumber(String itemNumber) {
-        this.itemNumber = itemNumber;
-    }
-
-    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 setPlanQuantity(String planQuantity) 
-    {
-        this.planQuantity = planQuantity;
-    }
-
-    public String getPlanQuantity() 
-    {
-        return planQuantity;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setUnitUsage(String unitUsage) 
-    {
-        this.unitUsage = unitUsage;
-    }
-
-    public String getUnitUsage() 
-    {
-        return unitUsage;
-    }
-    public void setStorageLocation(String storageLocation) 
-    {
-        this.storageLocation = storageLocation;
-    }
-
-    public String getStorageLocation() 
-    {
-        return storageLocation;
-    }
-    public void setMaterialType(String materialType) 
-    {
-        this.materialType = materialType;
-    }
-
-    public String getMaterialType() 
-    {
-        return materialType;
-    }
-    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 getBomRank() {
-        return bomRank;
-    }
-
-    public void setBomRank(String bomRank) {
-        this.bomRank = bomRank;
-    }
-
-    public String getUpFinishProductCode() {
-        return upFinishProductCode;
-    }
-
-    public void setUpFinishProductCode(String upFinishProductCode) {
-        this.upFinishProductCode = upFinishProductCode;
-    }
-
-    public String getActualQuantity() {
-        return actualQuantity;
-    }
-
-    public void setActualQuantity(String actualQuantity) {
-        this.actualQuantity = actualQuantity;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("number", getNumber())
-            .append("materialRequisitionDetailId", getMaterialRequisitionDetailId())
-            .append("materialRequisitionNumber", getMaterialRequisitionNumber())
-            .append("materialCode", getMaterialCode())
-            .append("materialName", getMaterialName())
-            .append("specificationModel", getSpecificationModel())
-            .append("itemNumber", getItemNumber())
-            .append("typeMachine", getTypeMachine())
-            .append("inventoryUnit", getInventoryUnit())
-            .append("planQuantity", getPlanQuantity())
-            .append("description", getDescription())
-            .append("unitUsage", getUnitUsage())
-            .append("storageLocation", getStorageLocation())
-            .append("materialType", getMaterialType())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .append("bomRank", getBomRank())
-            .append("upFinishProductCode", getUpFinishProductCode())
-            .append("actualQuantity", getActualQuantity())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.java
deleted file mode 100644
index aea32c77..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.java
+++ /dev/null
@@ -1,377 +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;
-
-/**
- * 领料单对象 material_requisition_info
- * 
- * @author ruoyi
- * @date 2023-04-06
- */
-public class MaterialRequisitionInfoDto extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 领料单id */
-    private Long materialRequisitionId;
-
-    /** 领料单号 */
-    @ExcelProperty("领料单号")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String materialRequisitionNumber;
-
-    /** 订单号码 */
-    @ExcelProperty("订单号码")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String salesOrderNumber;
-
-    /** 制工单号 */
-    @ExcelProperty("制工单号")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String workOrderNumber;
-
-    /** 领料部门 */
-    @ExcelProperty("领料部门")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String deptName;
-
-    /** 领料人 */
-    @ExcelProperty("领料人")
-    private String materialRequisitionPerson;
-
-    /** 部门编号 */
-    @ExcelProperty("部门编号")
-    private String deptNumber;
-
-    /** 仓库编号 */
-    @ExcelProperty("仓库编号")
-    private String stockNumber;
-
-    /** 仓库名称 */
-    @ExcelProperty("仓库名称")
-    private String stockName;
-
-    /** 仓库管理员 */
-    @ExcelProperty("仓库管理员")
-    private String stockManager;
-
-    /** 出库类型 */
-    @ExcelProperty("出库类型")
-    private String outputClass;
-
-    /** 出库日期 */
-    @ExcelProperty("出库日期")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String outputDate;
-
-    /** 成品代码 */
-    @ExcelProperty("成品代码")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String finishProductCode;
-
-    /** 机种 */
-    @ExcelProperty("机种")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String typeMachine;
-
-    /** 工单数量 */
-    @ExcelProperty("工单数量")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String workOrderQuantity;
-
-    /** 备注内容 */
-    @ExcelProperty("备注内容")
-    private String remarkContent;
-
-    /** 领料否 */
-    @ExcelProperty("领料否")
-    private String getMaterialFlag;
-
-    /** 录入时间 */
-    @ExcelProperty("录入时间")
-//    @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE)
-    private String firstAddTime;
-
-    /** 修改时间 */
-    @ExcelProperty("修改时间")
-    private String updateInfoTime;
-
-    /** 备用一 */
-    private String standbyOne;
-
-    /** 备用二 */
-    private String standbyTwo;
-
-    /** 委外单号 */
-    @ExcelProperty("委外单号")
-    private String outsourceOrderNumber;
-
-
-    /** 生产批号 */
-    @ExcelProperty("生产批号")
-    private String batchNumber;
-
-    /** 厂商编号 */
-    @ExcelProperty("厂商编号")
-    private String supplierCode;
-
-    /** 厂商名称 */
-    @ExcelProperty("厂商名称")
-    private String supplierName;
-
-    public void setMaterialRequisitionId(Long materialRequisitionId) 
-    {
-        this.materialRequisitionId = materialRequisitionId;
-    }
-
-    public Long getMaterialRequisitionId() 
-    {
-        return materialRequisitionId;
-    }
-    public void setMaterialRequisitionNumber(String materialRequisitionNumber) 
-    {
-        this.materialRequisitionNumber = materialRequisitionNumber;
-    }
-
-    public String getMaterialRequisitionNumber() 
-    {
-        return materialRequisitionNumber;
-    }
-    public void setSalesOrderNumber(String salesOrderNumber) 
-    {
-        this.salesOrderNumber = salesOrderNumber;
-    }
-
-    public String getSalesOrderNumber() 
-    {
-        return salesOrderNumber;
-    }
-    public void setWorkOrderNumber(String workOrderNumber) 
-    {
-        this.workOrderNumber = workOrderNumber;
-    }
-
-    public String getWorkOrderNumber() 
-    {
-        return workOrderNumber;
-    }
-    public void setDeptName(String deptName) 
-    {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() 
-    {
-        return deptName;
-    }
-    public void setMaterialRequisitionPerson(String materialRequisitionPerson) 
-    {
-        this.materialRequisitionPerson = materialRequisitionPerson;
-    }
-
-    public String getMaterialRequisitionPerson() 
-    {
-        return materialRequisitionPerson;
-    }
-    public void setDeptNumber(String deptNumber) 
-    {
-        this.deptNumber = deptNumber;
-    }
-
-    public String getDeptNumber() 
-    {
-        return deptNumber;
-    }
-    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 setStockManager(String stockManager) 
-    {
-        this.stockManager = stockManager;
-    }
-
-    public String getStockManager() 
-    {
-        return stockManager;
-    }
-    public void setOutputClass(String outputClass) 
-    {
-        this.outputClass = outputClass;
-    }
-
-    public String getOutputClass() 
-    {
-        return outputClass;
-    }
-    public void setOutputDate(String outputDate) 
-    {
-        this.outputDate = outputDate;
-    }
-
-    public String getOutputDate() 
-    {
-        return outputDate;
-    }
-    public void setFinishProductCode(String finishProductCode) 
-    {
-        this.finishProductCode = finishProductCode;
-    }
-
-    public String getFinishProductCode() 
-    {
-        return finishProductCode;
-    }
-    public void setTypeMachine(String typeMachine) 
-    {
-        this.typeMachine = typeMachine;
-    }
-
-    public String getTypeMachine() 
-    {
-        return typeMachine;
-    }
-    public void setWorkOrderQuantity(String workOrderQuantity) 
-    {
-        this.workOrderQuantity = workOrderQuantity;
-    }
-
-    public String getWorkOrderQuantity() 
-    {
-        return workOrderQuantity;
-    }
-    public void setRemarkContent(String remarkContent) 
-    {
-        this.remarkContent = remarkContent;
-    }
-
-    public String getRemarkContent() 
-    {
-        return remarkContent;
-    }
-    public void setGetMaterialFlag(String getMaterialFlag) 
-    {
-        this.getMaterialFlag = getMaterialFlag;
-    }
-
-    public String getGetMaterialFlag() 
-    {
-        return getMaterialFlag;
-    }
-    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 getOutsourceOrderNumber() {
-        return outsourceOrderNumber;
-    }
-
-    public void setOutsourceOrderNumber(String outsourceOrderNumber) {
-        this.outsourceOrderNumber = outsourceOrderNumber;
-    }
-
-    public String getBatchNumber() {
-        return batchNumber;
-    }
-
-    public void setBatchNumber(String batchNumber) {
-        this.batchNumber = batchNumber;
-    }
-
-    public String getSupplierCode() {
-        return supplierCode;
-    }
-
-    public void setSupplierCode(String supplierCode) {
-        this.supplierCode = supplierCode;
-    }
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("materialRequisitionId", getMaterialRequisitionId())
-            .append("materialRequisitionNumber", getMaterialRequisitionNumber())
-            .append("salesOrderNumber", getSalesOrderNumber())
-            .append("workOrderNumber", getWorkOrderNumber())
-            .append("deptName", getDeptName())
-            .append("materialRequisitionPerson", getMaterialRequisitionPerson())
-            .append("deptNumber", getDeptNumber())
-            .append("stockNumber", getStockNumber())
-            .append("stockName", getStockName())
-            .append("stockManager", getStockManager())
-            .append("outputClass", getOutputClass())
-            .append("outputDate", getOutputDate())
-            .append("finishProductCode", getFinishProductCode())
-            .append("typeMachine", getTypeMachine())
-            .append("workOrderQuantity", getWorkOrderQuantity())
-            .append("remarkContent", getRemarkContent())
-            .append("getMaterialFlag", getGetMaterialFlag())
-            .append("firstAddTime", getFirstAddTime())
-            .append("updateInfoTime", getUpdateInfoTime())
-            .append("standbyOne", getStandbyOne())
-            .append("standbyTwo", getStandbyTwo())
-            .append("outsourceOrderNumber", getOutsourceOrderNumber())
-            .append("batchNumber", getBatchNumber())
-            .append("supplierCode", getSupplierCode())
-            .append("supplierName", getSupplierName())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadMapper.xml b/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadMapper.xml
deleted file mode 100644
index 876c7394..00000000
--- a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadMapper.xml
+++ /dev/null
@@ -1,253 +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.invoice.mapper.PoInvoiceHeadMapper">
-
-    <resultMap type="PoInvoiceHead" id="PoInvoiceHeadResult">
-        <result property="invoiceid" column="invoiceid"/>
-        <result property="Invoiceno" column="Invoiceno"/>
-        <result property="pCode" column="p_code"/>
-        <result property="pName" column="P_name"/>
-        <result property="HTNO" column="HTNO"/>
-        <result property="PAYWAY" column="PAYWAY"/>
-        <result property="invoicedate" column="invoicedate"/>
-        <result property="sendcompany" column="sendcompany"/>
-        <result property="getcompany" column="getcompany"/>
-        <result property="swater" column="swater"/>
-        <result property="dwater" column="dwater"/>
-        <result property="totalqty" column="totalqty"/>
-        <result property="totalamt" column="totalamt"/>
-        <result property="allenamt" column="allenamt"/>
-        <result property="opman" column="opman"/>
-        <result property="boxNum" column="box_num"/>
-        <result property="sendway" column="sendway"/>
-        <result property="sendtool" column="sendtool"/>
-        <result property="leavechinaDate" column="leavechina_date"/>
-        <result property="getFormNo" column="get_form_no"/>
-        <result property="ciqName" column="CIQ_NAME"/>
-        <result property="CPSendID" column="CPSendID"/>
-        <result property="crlName" column="CRL_NAME"/>
-        <result property="getmoneyFlag" column="GetMoney_Flag"/>
-        <result property="koukuanAmt" column="Koukuan_Amt"/>
-        <result property="koukuanMemotext" column="KouKuan_MemoText"/>
-        <result property="getmoneyMemotext" column="GetMoney_MemoText"/>
-        <result property="getmoneyDate" column="GetMoney_date"/>
-        <result property="getmoneyMan" column="getmoney_man"/>
-        <result property="getmoney" column="getmoney"/>
-        <result property="taxInvoiceNo" column="tax_invoice_no"/>
-        <result property="taxPrintVersion" column="tax_print_version"/>
-        <result property="payall" column="payall"/>
-        <result property="MemoText" column="MemoText"/>
-        <result property="ShouldPayDate" column="ShouldPayDate"/>
-        <result property="haveAppAmt" column="Have_APP_AMT"/>
-    </resultMap>
-
-    <sql id="selectPoInvoiceHeadVo">
-        select invoiceid, Invoiceno, p_code, P_name, HTNO, PAYWAY, invoicedate, sendcompany, getcompany, swater, dwater, totalqty, totalamt, allenamt, opman, box_num, sendway, sendtool, leavechina_date, get_form_no, CIQ_NAME, CPSendID, CRL_NAME, GetMoney_Flag, Koukuan_Amt, KouKuan_MemoText, GetMoney_MemoText, GetMoney_date, getmoney_man, getmoney, tax_invoice_no, tax_print_version, payall, MemoText, ShouldPayDate, Have_APP_AMT from poinvoicehead
-    </sql>
-
-    <select id="selectPoInvoiceHeadList" parameterType="PoInvoiceHead" resultMap="PoInvoiceHeadResult">
-        <include refid="selectPoInvoiceHeadVo"/>
-        <where>
-            <if test="invoiceid != null and invoiceid != ''">and invoiceid like concat('%', #{invoiceid}, '%')</if>
-            <if test="Invoiceno != null and Invoiceno != ''">and Invoiceno like concat('%', #{Invoiceno}, '%')</if>
-            <if test="pCode != null and pCode != ''">and p_code like concat('%', #{pCode}, '%')</if>
-            <if test="pName != null and pName != ''">and P_name like concat('%', #{pName}, '%')</if>
-            <if test="HTNO != null and HTNO != ''">and HTNO like concat('%', #{HTNO}, '%')</if>
-            <if test="PAYWAY != null and PAYWAY != ''">and PAYWAY like concat('%', #{PAYWAY}, '%')</if>
-            <if test="params.beginInvoiceDate != null and params.beginInvoiceDate !=''">and invoiceDate >=
-                #{params.beginInvoiceDate}
-            </if>
-            <if test="params.endInvoiceDate != null and params.endInvoiceDate != ''">and #{params.endInvoiceDate} >=
-                invoiceDate
-            </if>
-            <if test="sendcompany != null and sendcompany != ''">and sendcompany like concat('%', #{sendcompany}, '%')
-            </if>
-            <if test="getcompany != null and getcompany != ''">and getcompany like concat('%', #{getcompany}, '%')</if>
-            <if test="swater != null and swater != ''">and swater like concat('%', #{swater}, '%')</if>
-            <if test="dwater != null and dwater != ''">and dwater like concat('%', #{dwater}, '%')</if>
-            <if test="totalqty != null and totalqty != ''">and totalqty like concat('%', #{totalqty}, '%')</if>
-            <if test="totalamt != null and totalamt != ''">and totalamt like concat('%', #{totalamt}, '%')</if>
-            <if test="allenamt != null and allenamt != ''">and allenamt like concat('%', #{allenamt}, '%')</if>
-            <if test="opman != null and opman != ''">and opman like concat('%', #{opman}, '%')</if>
-            <if test="boxNum != null ">and box_num like concat('%', #{boxNum}, '%')</if>
-            <if test="sendway != null and sendway != ''">and sendway like concat('%', #{sendway}, '%')</if>
-            <if test="sendtool != null and sendtool != ''">and sendtool like concat('%', #{sendtool}, '%')</if>
-            <if test="leavechinaDate != null ">and leavechina_date like concat('%', #{leavechinaDate}, '%')</if>
-            <if test="getFormNo != null and getFormNo != ''">and get_form_no like concat('%', #{getFormNo}, '%')</if>
-            <if test="ciqName != null and ciqName != ''">and CIQ_NAME like concat('%', #{ciqName}, '%')</if>
-            <if test="CPSendID != null and CPSendID != ''">and CPSendID like concat('%', #{CPSendID}, '%')</if>
-            <if test="crlName != null and crlName != ''">and CRL_NAME like concat('%', #{crlName}, '%')</if>
-            <if test="getmoneyFlag != null and getmoneyFlag!=''">and GetMoney_Flag = #{getmoneyFlag}</if>
-            <if test="koukuanAmt != null ">and Koukuan_Amt like concat('%', #{koukuanAmt}, '%')</if>
-            <if test="koukuanMemotext != null and koukuanMemotext != ''">and KouKuan_MemoText like concat('%',
-                #{koukuanMemotext}, '%')
-            </if>
-            <if test="getmoneyMemotext != null and getmoneyMemotext != ''">and GetMoney_MemoText like concat('%',
-                #{getmoneyMemotext}, '%')
-            </if>
-            <if test="getmoneyDate != null ">and GetMoney_date like concat('%', #{getmoneyDate}, '%')</if>
-            <if test="getmoneyMan != null and getmoneyMan != ''">and getmoney_man like concat('%', #{getmoneyMan},
-                '%')
-            </if>
-            <if test="getmoney != null ">and getmoney like concat('%', #{getmoney}, '%')</if>
-            <if test="taxInvoiceNo != null and taxInvoiceNo != ''">and tax_invoice_no like concat('%', #{taxInvoiceNo},
-                '%')
-            </if>
-            <if test="taxPrintVersion != null and taxPrintVersion != ''">and tax_print_version like concat('%',
-                #{taxPrintVersion}, '%')
-            </if>
-            <if test="payall != null and payall != ''">and payall like concat('%', #{payall}, '%')</if>
-            <if test="MemoText != null and MemoText != ''">and MemoText like concat('%', #{MemoText}, '%')</if>
-            <if test="ShouldPayDate != null ">and ShouldPayDate like concat('%', #{ShouldPayDate}, '%')</if>
-            <if test="haveAppAmt != null ">and Have_APP_AMT like concat('%', #{haveAppAmt}, '%')</if>
-            <if test="isAllPay == 0 and isAllPay!='' and isAllPay!=null">and SUBSTRING(totalamt,4,LENGTH(totalamt)-3)-getmoney<![CDATA[ <> ]]>0</if>
-            <if test="isAllPay == 1 and isAllPay!='' and isAllPay!=null">and SUBSTRING(totalamt,4,LENGTH(totalamt)-3)-getmoney=0</if>
-            <if test="surplusPayDay !=null and surplusPayDay!=''">and TO_DAYS(ShouldPayDate)-TO_DAYS(NOW())>=#{surplusPayDay}</if>
-        </where>
-    </select>
-
-    <select id="selectPoInvoiceHeadById" parameterType="String" resultMap="PoInvoiceHeadResult">
-        <include refid="selectPoInvoiceHeadVo"/>
-        where invoiceid = #{invoiceid}
-    </select>
-
-    <insert id="insertPoInvoiceHead" parameterType="PoInvoiceHead">
-        insert into poinvoicehead
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="invoiceid != null">invoiceid,</if>
-            <if test="Invoiceno != null">Invoiceno,</if>
-            <if test="pCode != null">p_code,</if>
-            <if test="pName != null">P_name,</if>
-            <if test="HTNO != null">HTNO,</if>
-            <if test="PAYWAY != null">PAYWAY,</if>
-            <if test="invoicedate != null">invoicedate,</if>
-            <if test="sendcompany != null">sendcompany,</if>
-            <if test="getcompany != null">getcompany,</if>
-            <if test="swater != null">swater,</if>
-            <if test="dwater != null">dwater,</if>
-            <if test="totalqty != null">totalqty,</if>
-            <if test="totalamt != null">totalamt,</if>
-            <if test="allenamt != null">allenamt,</if>
-            <if test="opman != null">opman,</if>
-            <if test="boxNum != null">box_num,</if>
-            <if test="sendway != null">sendway,</if>
-            <if test="sendtool != null">sendtool,</if>
-            <if test="leavechinaDate != null">leavechina_date,</if>
-            <if test="getFormNo != null">get_form_no,</if>
-            <if test="ciqName != null">CIQ_NAME,</if>
-            <if test="CPSendID != null">CPSendID,</if>
-            <if test="crlName != null">CRL_NAME,</if>
-            <if test="getmoneyFlag != null">GetMoney_Flag,</if>
-            <if test="koukuanAmt != null">Koukuan_Amt,</if>
-            <if test="koukuanMemotext != null">KouKuan_MemoText,</if>
-            <if test="getmoneyMemotext != null">GetMoney_MemoText,</if>
-            <if test="getmoneyDate != null">GetMoney_date,</if>
-            <if test="getmoneyMan != null">getmoney_man,</if>
-            <if test="getmoney != null">getmoney,</if>
-            <if test="taxInvoiceNo != null">tax_invoice_no,</if>
-            <if test="taxPrintVersion != null">tax_print_version,</if>
-            <if test="payall != null">payall,</if>
-            <if test="MemoText != null">MemoText,</if>
-            <if test="ShouldPayDate != null">ShouldPayDate,</if>
-            <if test="haveAppAmt != null">Have_APP_AMT,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="invoiceid != null">#{invoiceid},</if>
-            <if test="Invoiceno != null">#{Invoiceno},</if>
-            <if test="pCode != null">#{pCode},</if>
-            <if test="pName != null">#{pName},</if>
-            <if test="HTNO != null">#{HTNO},</if>
-            <if test="PAYWAY != null">#{PAYWAY},</if>
-            <if test="invoicedate != null">#{invoicedate},</if>
-            <if test="sendcompany != null">#{sendcompany},</if>
-            <if test="getcompany != null">#{getcompany},</if>
-            <if test="swater != null">#{swater},</if>
-            <if test="dwater != null">#{dwater},</if>
-            <if test="totalqty != null">#{totalqty},</if>
-            <if test="totalamt != null">#{totalamt},</if>
-            <if test="allenamt != null">#{allenamt},</if>
-            <if test="opman != null">#{opman},</if>
-            <if test="boxNum != null">#{boxNum},</if>
-            <if test="sendway != null">#{sendway},</if>
-            <if test="sendtool != null">#{sendtool},</if>
-            <if test="leavechinaDate != null">#{leavechinaDate},</if>
-            <if test="getFormNo != null">#{getFormNo},</if>
-            <if test="ciqName != null">#{ciqName},</if>
-            <if test="CPSendID != null">#{CPSendID},</if>
-            <if test="crlName != null">#{crlName},</if>
-            <if test="getmoneyFlag != null">#{getmoneyFlag},</if>
-            <if test="koukuanAmt != null">#{koukuanAmt},</if>
-            <if test="koukuanMemotext != null">#{koukuanMemotext},</if>
-            <if test="getmoneyMemotext != null">#{getmoneyMemotext},</if>
-            <if test="getmoneyDate != null">#{getmoneyDate},</if>
-            <if test="getmoneyMan != null">#{getmoneyMan},</if>
-            <if test="getmoney != null">#{getmoney},</if>
-            <if test="taxInvoiceNo != null">#{taxInvoiceNo},</if>
-            <if test="taxPrintVersion != null">#{taxPrintVersion},</if>
-            <if test="payall != null">#{payall},</if>
-            <if test="MemoText != null">#{MemoText},</if>
-            <if test="ShouldPayDate != null">#{ShouldPayDate},</if>
-            <if test="haveAppAmt != null">#{haveAppAmt},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePoInvoiceHead" parameterType="PoInvoiceHead">
-        update poinvoicehead
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="Invoiceno != null">Invoiceno = #{Invoiceno},</if>
-            <if test="pCode != null">p_code = #{pCode},</if>
-            <if test="pName != null">P_name = #{pName},</if>
-            <if test="HTNO != null">HTNO = #{HTNO},</if>
-            <if test="PAYWAY != null">PAYWAY = #{PAYWAY},</if>
-            <if test="invoicedate != null">invoicedate = #{invoicedate},</if>
-            <if test="sendcompany != null">sendcompany = #{sendcompany},</if>
-            <if test="getcompany != null">getcompany = #{getcompany},</if>
-            <if test="swater != null">swater = #{swater},</if>
-            <if test="dwater != null">dwater = #{dwater},</if>
-            <if test="totalqty != null">totalqty = #{totalqty},</if>
-            <if test="totalamt != null">totalamt = #{totalamt},</if>
-            <if test="allenamt != null">allenamt = #{allenamt},</if>
-            <if test="opman != null">opman = #{opman},</if>
-            <if test="boxNum != null">box_num = #{boxNum},</if>
-            <if test="sendway != null">sendway = #{sendway},</if>
-            <if test="sendtool != null">sendtool = #{sendtool},</if>
-            <if test="leavechinaDate != null">leavechina_date = #{leavechinaDate},</if>
-            <if test="getFormNo != null">get_form_no = #{getFormNo},</if>
-            <if test="ciqName != null">CIQ_NAME = #{ciqName},</if>
-            <if test="CPSendID != null">CPSendID = #{CPSendID},</if>
-            <if test="crlName != null">CRL_NAME = #{crlName},</if>
-            <if test="getmoneyFlag != null">GetMoney_Flag = #{getmoneyFlag},</if>
-            <if test="koukuanAmt != null">Koukuan_Amt = #{koukuanAmt},</if>
-            <if test="koukuanMemotext != null">KouKuan_MemoText = #{koukuanMemotext},</if>
-            <if test="getmoneyMemotext != null">GetMoney_MemoText = #{getmoneyMemotext},</if>
-            <if test="getmoneyDate != null">GetMoney_date = #{getmoneyDate},</if>
-            <if test="getmoneyMan != null">getmoney_man = #{getmoneyMan},</if>
-            <if test="getmoney != null">getmoney = #{getmoney},</if>
-            <if test="taxInvoiceNo != null">tax_invoice_no = #{taxInvoiceNo},</if>
-            <if test="taxPrintVersion != null">tax_print_version = #{taxPrintVersion},</if>
-            <if test="payall != null">payall = #{payall},</if>
-            <if test="MemoText != null">MemoText = #{MemoText},</if>
-            <if test="ShouldPayDate != null">ShouldPayDate = #{ShouldPayDate},</if>
-            <if test="haveAppAmt != null">Have_APP_AMT = #{haveAppAmt},</if>
-        </trim>
-        where invoiceid = #{invoiceid}
-    </update>
-
-    <delete id="deletePoInvoiceHeadById" parameterType="String">
-        delete from poinvoicehead where invoiceid = #{invoiceid}
-    </delete>
-
-    <delete id="deletePoInvoiceHeadByIds" parameterType="String">
-        delete from poinvoicehead where invoiceid in
-        <foreach item="invoiceid" collection="array" open="(" separator="," close=")">
-            #{invoiceid}
-        </foreach>
-    </delete>
-
-    <select id="selectCountByDay" resultType="Integer">
-        select count(*) from poinvoicehead where to_days(invoicedate) = to_days(now());
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadWithListMapper.xml b/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadWithListMapper.xml
deleted file mode 100644
index b45cd643..00000000
--- a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceHeadWithListMapper.xml
+++ /dev/null
@@ -1,54 +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.invoice.mapper.PoInvoiceHeadWithListMapper">
-
-
-    <select id="selectPoInvoiceHeadWithList" resultType="com.ruoyi.invoice.domain.PoInvoiceHeadWithList" parameterType="PoInvoiceHeadWithList">
-        SELECT
-        poinvoicehead.invoiceid as invoiceId,
-        poinvoicehead.Invoiceno as invoiceNo,
-        poinvoicehead.p_code as pCode,
-        poinvoicehead.P_name as pName,
-        poinvoicehead.HTNO as HTNo,
-        poinvoicehead.PAYWAY as payWay,
-        poinvoicehead.invoicedate as invoiceDate,
-        poinvoicelist.orderno as orderNo,
-        poinvoicelist.wl_code as wlCode,
-        poinvoicelist.itemname as itemName,
-        poinvoicelist.stock_dw as stockDw,
-        poinvoicelist.crl_name as crlName,
-        poinvoicelist.qty as qty,
-        poinvoicelist.price as price,
-        poinvoicelist.amt as amt,
-        poinvoicehead.tax_invoice_no as taxInvoiceNo,
-        poinvoicehead.tax_print_version as taxPriceVersion,
-        poinvoicehead.GetMoney_Flag as getMoneyFlag
-        FROM
-        `poinvoicehead`
-        right JOIN poinvoicelist ON poinvoicehead.invoiceid = poinvoicelist.invoiceid
-        <where>
-            <if test="invoiceId!=null and invoiceId!=''">and poinvoicehead.invoiceid like concat('%', #{invoiceId}, '%')</if>
-            <if test="invoiceNo!=null and invoiceNo!=''">and poinvoicehead.Invoiceno like concat('%', #{invoiceNo}, '%')</if>
-            <if test="pCode!=null and pCode!=''">and poinvoicehead.p_code like concat('%', #{pCode}, '%')</if>
-            <if test="pName!=null and pName!=''">and poinvoicehead.P_name like concat('%', #{pName}, '%')</if>
-            <if test="HTNo!=null and HTNo!=''">and poinvoicehead.HTNO like concat('%', #{HTNo}, '%')</if>
-            <if test="payWay!=null and payWay!=''">and poinvoicehead.PAYWAY like concat('%', #{payWay}, '%')</if>
-            <if test="orderNo!=null and orderNo!=''">and poinvoicelist.orderno like concat('%', #{orderNo}, '%')</if>
-            <if test="wlCode!=null and wlCode!=''">and poinvoicelist.wl_code like concat('%', #{wlCode}, '%')</if>
-            <if test="itemName!=null and itemName!=''">and poinvoicelist.itemname like concat('%', #{itemName}, '%')</if>
-            <if test="stockDw!=null and stockDw!=''">and poinvoicelist.stock_dw like concat('%', #{stockDw}, '%')</if>
-            <if test="crlName!=null and crlName!=''">and poinvoicelist.crl_name like concat('%', #{crlName}, '%')</if>
-            <if test="qty!=null and qty!=''">and poinvoicelist.qty like concat('%', #{qty}, '%')</if>
-            <if test="price!=null and price!=''">and poinvoicelist.price like concat('%', #{price}, '%')</if>
-            <if test="amt!=null and amt!=''">and poinvoicelist.amt like concat('%', #{amt}, '%')</if>
-            <if test="taxInvoiceNo!=null and taxInvoiceNo!=''">and poinvoicehead.tax_invoice_no like concat('%', #{taxInvoiceNo}, '%')</if>
-            <if test="taxPriceVersion!=null and taxPriceVersion!=''">and poinvoicehead.tax_print_version like concat('%', #{taxPriceVersion}, '%')</if>
-            <if test="getMoneyFlag!=null and getMoneyFlag!=''">and poinvoicehead.GetMoney_Flag like concat('%', #{getMoneyFlag}, '%')</if>
-            <if test="params.beginInvoiceDate != null and params.beginInvoiceDate !=''"> and invoiceDate >= #{params.beginInvoiceDate}</if>
-            <if test="params.endInvoiceDate != null and params.endInvoiceDate != ''">and #{params.endInvoiceDate} >= invoiceDate</if>
-        </where>
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceListMapper.xml b/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceListMapper.xml
deleted file mode 100644
index b51b1b59..00000000
--- a/ruoyi-admin/src/main/resources/mapper/invoice/PoInvoiceListMapper.xml
+++ /dev/null
@@ -1,105 +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.invoice.mapper.PoInvoiceListMapper">
-    
-    <resultMap type="PoInvoiceList" id="PoInvoiceListResult">
-        <result property="invoiceid"    column="invoiceid"    />
-        <result property="orderno"    column="orderno"    />
-        <result property="wlCode"    column="wl_code"    />
-        <result property="itemname"    column="itemname"    />
-        <result property="stockDw"    column="stock_dw"    />
-        <result property="crlName"    column="crl_name"    />
-        <result property="qty"    column="qty"    />
-        <result property="price"    column="price"    />
-        <result property="amt"    column="amt"    />
-        <result property="PNO"    column="PNO"    />
-        <result property="FPH"    column="FPH"    />
-    </resultMap>
-
-    <sql id="selectPoInvoiceListVo">
-        select invoiceid, orderno, wl_code, itemname, stock_dw, crl_name, qty, price, amt, PNO, FPH from poinvoicelist
-    </sql>
-
-    <select id="selectPoInvoiceListList" parameterType="PoInvoiceList" resultMap="PoInvoiceListResult">
-        <include refid="selectPoInvoiceListVo"/>
-        <where>  
-            <if test="invoiceid != null  and invoiceid != ''"> and invoiceid = #{invoiceid}</if>
-            <if test="orderno != null  and orderno != ''"> and orderno = #{orderno}</if>
-            <if test="wlCode != null  and wlCode != ''"> and wl_code = #{wlCode}</if>
-            <if test="itemname != null  and itemname != ''"> and itemname like concat('%', #{itemname}, '%')</if>
-            <if test="stockDw != null  and stockDw != ''"> and stock_dw = #{stockDw}</if>
-            <if test="crlName != null  and crlName != ''"> and crl_name like concat('%', #{crlName}, '%')</if>
-            <if test="qty != null "> and qty = #{qty}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="amt != null "> and amt = #{amt}</if>
-            <if test="PNO != null  and PNO != ''"> and PNO = #{PNO}</if>
-            <if test="FPH != null  and FPH != ''"> and FPH = #{FPH}</if>
-        </where>
-    </select>
-    
-    <select id="selectPoInvoiceListById" parameterType="String" resultMap="PoInvoiceListResult">
-        <include refid="selectPoInvoiceListVo"/>
-        where invoiceid = #{invoiceid}
-    </select>
-        
-    <insert id="insertPoInvoiceList" parameterType="PoInvoiceList">
-        insert into poinvoicelist
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="invoiceid != null">invoiceid,</if>
-            <if test="orderno != null">orderno,</if>
-            <if test="wlCode != null">wl_code,</if>
-            <if test="itemname != null">itemname,</if>
-            <if test="stockDw != null">stock_dw,</if>
-            <if test="crlName != null">crl_name,</if>
-            <if test="qty != null">qty,</if>
-            <if test="price != null">price,</if>
-            <if test="amt != null">amt,</if>
-            <if test="PNO != null">PNO,</if>
-            <if test="FPH != null">FPH,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="invoiceid != null">#{invoiceid},</if>
-            <if test="orderno != null">#{orderno},</if>
-            <if test="wlCode != null">#{wlCode},</if>
-            <if test="itemname != null">#{itemname},</if>
-            <if test="stockDw != null">#{stockDw},</if>
-            <if test="crlName != null">#{crlName},</if>
-            <if test="qty != null">#{qty},</if>
-            <if test="price != null">#{price},</if>
-            <if test="amt != null">#{amt},</if>
-            <if test="PNO != null">#{PNO},</if>
-            <if test="FPH != null">#{FPH},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePoInvoiceList" parameterType="PoInvoiceList">
-        update poinvoicelist
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderno != null">orderno = #{orderno},</if>
-            <if test="wlCode != null">wl_code = #{wlCode},</if>
-            <if test="itemname != null">itemname = #{itemname},</if>
-            <if test="stockDw != null">stock_dw = #{stockDw},</if>
-            <if test="crlName != null">crl_name = #{crlName},</if>
-            <if test="qty != null">qty = #{qty},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="amt != null">amt = #{amt},</if>
-            <if test="PNO != null">PNO = #{PNO},</if>
-            <if test="FPH != null">FPH = #{FPH},</if>
-        </trim>
-        where invoiceid = #{invoiceid}
-    </update>
-
-    <delete id="deletePoInvoiceListById" parameterType="String">
-        delete from poinvoicelist where invoiceid = #{invoiceid}
-    </delete>
-
-    <delete id="deletePoInvoiceListByIds" parameterType="String">
-        delete from poinvoicelist where invoiceid in 
-        <foreach item="invoiceid" collection="array" open="(" separator="," close=")">
-            #{invoiceid}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/edit.html b/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/edit.html
deleted file mode 100644
index a809c5c5..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/edit.html
+++ /dev/null
@@ -1,215 +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">
-
-    <style type="text/css">
-        .select2-container--open {
-            z-index: 9999999
-        }
-    </style>
-</head>
-<body class="white-bg">
-
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12">
-
-        </div>
-        <form class="form-horizontal m" id="form-poinvoicehead-edit" th:object="${poInvoiceHead}">
-            <input name="invoiceid" th:field="*{invoiceid}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">发票号：</label>
-                <div class="col-sm-8">
-                    <input name="Invoiceno" th:field="*{Invoiceno}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商代码：</label>
-                <div class="col-sm-8">
-                    <select name="pCode" class="form-control m-b" disabled>
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商名称：</label>
-                <div class="col-sm-8">
-                    <select name="pName" class="form-control m-b">
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label">开票日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="invoicedate"
-                               th:value="${#dates.format(poInvoiceHead.invoicedate, 'yyyy-MM-dd')}"
-                               class="form-control time-input" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label">币别：</label>
-                <div class="col-sm-8">
-                    <select class="form-control" name="crlName" id="crlName"
-                            th:with="type=${@dict.getType('sys_coin_class')}">
-                        <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="taxInvoiceNo" th:field="*{taxInvoiceNo}" 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="taxPrintVersion" th:field="*{taxPrintVersion}" 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="totalamt" th:field="*{totalamt}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">实付金额：</label>
-                <div class="col-sm-8">
-                    <input name="getmoney" th:field="*{getmoney}" class="form-control" type="text" disabled>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">此次支付金额：</label>
-                <div class="col-sm-8">
-                    <input name="getmoney" 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="getmoneyMemotext" class="form-control">[[*{getmoneyMemotext}]]</textarea>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-table-editable-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    let prefix = ctx + "invoice/poInvoicePay";
-    $("#form-poinvoicehead-edit").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-      submit();
-    }
-
-    let getData = [[${poInvoiceHead}]];
-
-    $("select[name='crlName']").val(getData.crlName).trigger("change");
-
-    //模态框select2可输入
-    $.fn.modal.Constructor.prototype.enforceFocus = function () {
-    };
-
-    //获取供应商编号和名称
-    $.ajax({
-        url: ctx + "ProviderPrice/ProviderPrice/all",
-        type: "post",
-        resultType: "json",
-        success: function (resp) {
-            if (resp.data.length > 0) {
-                $("select [name='pCode']").empty();
-                $("select [name='pName']").empty();
-                let data = resp.data;
-                for (let i in data) {
-                    //alert(data[i].pCode);
-                    $("select[name='pCode']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    $("select[name='pName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                }
-                $("select[name='pName']").val(getData.pName).select2();
-                $("select[name='pCode']").val(getData.pCode).select2();
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    });
-
-    //供应商名称改变时改变供应商编号
-    $("select[name='pName']").change(function () {
-        if ($(this).attr("id") === "pName") {
-            return false;
-        }
-        let pName = $(this).val();
-        $.ajax({
-            url: ctx + "ProviderPrice/ProviderPrice/findOne",
-            data: {"pName": pName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                $("select[name='pCode']").val(resp.data.pCode).trigger("change");
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    });
-
-
-    // //关闭模态框并刷新
-    // function closeModal() {
-    //     $("#itemModal").modal("hide");
-    //     reset();
-    //     $("#itemTable2").bootstrapTable("removeAll");
-    // }
-
-    //提交修改
-    function submit() {
-        let formData = new FormData($("#form-poinvoicehead-edit")[0]);
-        //formData.append("poInvoiceListList", JSON.stringify(bootstrapTable));
-        let data = {};
-        formData.forEach((value, key) => data[key] = value);
-        //alert(JSON.stringify(data1));
-        $.ajax({
-            url: prefix + "/edit",
-            type: "post",
-            resultType: "json",
-            data: {"jsonStr": JSON.stringify(data)},
-            success: function (resp) {
-                if (resp.code === 0) {
-                    alert("修改成功！");
-                    //window.location.href = prefix;\
-                    var index = parent.layer.getFrameIndex(window.name);
-                    var parent2 = window.parent;
-                    parent2.$.table.refresh();
-                    parent.layer.close(index);//关闭当前页
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        });
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/poInvoiceHead2.html b/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/poInvoiceHead2.html
deleted file mode 100644
index 901b17f3..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poInvoicePay/poInvoiceHead2.html
+++ /dev/null
@@ -1,277 +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('采购付款确认列表')"/>
-    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
-    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
-</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="invoiceNo"/>
-                        </li>
-                        <li>
-                            <label>税发票号：</label>
-                            <input type="text" name="taxInvoiceNo"/>
-                        </li>
-                        <li>
-                            <label>剩余交期：</label>
-                            <input type="text" name="surplusPayDay"/>
-                        </li>
-                        <li class="select-time">
-                            <label>开票日期：</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
-                                   name="params[beginInvoiceDate]"/>
-                            <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
-                                   name="params[endInvoiceDate]"/>
-                        </li>
-                        <li>
-                            <label>付款否：</label>
-                            <select name="getmoneyFlag">
-                                <option value="">所有</option>
-                                <option value="1">已收款</option>
-                                <option value="0">未收款</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>付全款否：</label>
-                            <select name="isAllPay">
-                                <option value="">所有</option>
-                                <option value="1">是</option>
-                                <option value="0">否</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>币别：</label>
-                            <select name="crlName"
-                                    th:with="type=${@dict.getType('sys_coin_class')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <li style="display: none">
-                            <label>厂商代码：</label>
-                            <select name="pCode" class="form-control m-b">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>厂商名称：</label>
-                            <select name="pName" class="form-control">
-                                <option value="">所有</option>
-                            </select>
-                        </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="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="" shiro:hasPermission="invoice:poinvoicehead:add" disabled>
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="invoice:poinvoicehead:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick=""
-               shiro:hasPermission="invoice:poinvoicehead:remove" disabled>
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()"
-               shiro:hasPermission="invoice:poinvoicehead:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table"
-                   style="overflow : hidden; text-overflow : ellipsis ; white-space:nowrap ;"></table>
-        </div>
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('invoice:poinvoicehead:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('invoice:poinvoicehead:remove')}]];
-    var prefix = ctx + "invoice/poInvoicePay";
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //重置
-    function reset() {
-        $("select[name='pCode']").val("").trigger("change");
-        $("select[name='pName']").val("").trigger("change");
-        $.form.reset();
-    }
-
-    //添加
-    // function add() {
-    //     window.location.href = prefix + "/add";
-    // }
-
-    //修改
-    // function edit() {
-    //     let row = $("#bootstrap-table").bootstrapTable("getSelections");
-    //     window.location.href = prefix + "/edit/" + row[0].invoiceId;
-    // }
-
-    $(function () {
-        let options = {
-            url: ctx + "invoice/poinvoicehead/list",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            modalName: "税发票列表",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'invoiceno',
-                    title: '发票号'
-                },
-                {
-                    field: 'pCode',
-                    title: '厂商名'
-                },
-                {
-                    field: 'pName',
-                    title: '厂商名称',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'invoicedate',
-                    title: '开票日期',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'crlName',
-                    title: '币别'
-                },
-                {
-                    field: 'totalamt',
-                    title: '金额'
-                },
-                {
-                    field: 'getmoneyFlag',
-                    title: '付款否',
-                    formatter: function (val) {
-                        if (val === 1) {
-                            return "已付款"
-                        } else if (val === 0) {
-                            return "未付款"
-                        }
-                    },
-                },
-                {
-                    field: 'getmoneyDate',
-                    title: '付款日期'
-                },
-                {
-                    field: 'getmoneyMan',
-                    title: '付款人'
-                },
-                {
-                    field: 'getmoney',
-                    title: '付款金额'
-                },
-                {
-                    field: 'paymentStatus',
-                    title: '付款状态',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        if ((row.totalamt-row.getmoney)==0){
-                            actions.push('<p>付全</p>');
-                        }else {
-                            actions.push('<p>没付全</p>');
-                        }
-                        return actions.join('');
-                    }
-                },
-                {
-                    field: 'ShouldPayDate',
-                    title: '应付日期'
-                },
-                {
-                    field: 'haveAppAmt',
-                    title: 'Have APP AMT'
-                },
-                {
-                    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.invoiceid + '\')"><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.invoiceid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-        };
-        $.table.init(options);
-    });
-
-    //获取供应商代码和名称
-    $.ajax({
-        url: ctx + "ProviderPrice/ProviderPrice/all",
-        type: "post",
-        resultType: "json",
-        success: function (resp) {
-            if (resp.data.length > 0) {
-                var data = resp.data;
-                for (var i in data) {
-                    //alert(data[i].pCode);
-                    $("select[name='pCode']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    $("select[name='pName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                }
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    });
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/add.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/add.html
deleted file mode 100644
index f4bf3dd0..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/add.html
+++ /dev/null
@@ -1,1042 +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">
-
-    <style type="text/css">
-        .select2-container--open {
-            z-index: 9999999
-        }
-    </style>
-</head>
-<body class="white-bg">
-<!--    <div class="wrapper wrapper-content animated fadeInRight ibox-content">-->
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12">
-
-        </div>
-        <form class="form-horizontal m" id="form-poinvoicehead-add">
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">发票编号：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="invoiceid" 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="Invoiceno" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商代码：</label>
-                <div class="col-sm-8">
-                    <select name="pCode" class="form-control m-b" disabled>
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商名称：</label>
-                <div class="col-sm-8">
-                    <select name="pName" class="form-control m-b">
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">合同号：</label>
-                <div class="col-sm-8">
-                    <input name="HTNO" 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="PAYWAY" class="form-control" type="text">
-                </div>
-            </div>
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">开票日期：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <div class="input-group date">-->
-            <!--                        <input name="invoicedate" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-            <!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-            <!--                    </div>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <div class="form-group">
-                <label class="col-sm-3 control-label">出口海关：</label>
-                <div class="col-sm-8">
-                    <input name="swater" 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="ciqName" 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="dwater" 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="CPSendID" 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="boxNum" 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="sendway" 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="sendtool" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">到票日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="ShouldPayDate" class="form-control time-input" placeholder="yyyy-MM-dd"
-                               type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">离境日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="leavechinaDate" class="form-control time-input" placeholder="yyyy-MM-dd"
-                               type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">币种：</label>
-                <div class="col-sm-8">
-                    <select class="form-control" name="crlName" th:with="type=${@dict.getType('sys_coin_class')}">
-                        <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="getmoneyFlag" class="form-control m-b">
-                        <option value="0">未收款</option>
-                        <option value="1">已收款</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">国税发票编号：</label>
-                <div class="col-sm-8">
-                    <input name="taxInvoiceNo" 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="taxPrintVersion" 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="MemoText" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-
-        <button type="button" class="btn btn-success" id="btn_addBom" onclick="addItem()">新增</button>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrapTableBody">
-            </table>
-<!--            <div class="col-sm-12" style="margin-top: 50px">-->
-<!--                <div class="row">-->
-<!--                    <div class="col-sm-12 col-sm-offset-3">-->
-<!--                        <button type="button" class="btn btn-primary" onclick="submit()" style="margin-left: 230px">提交-->
-<!--                        </button>-->
-<!--                        <button onclick="closeAdd()" class="btn btn-danger" type="button" style="margin-left: 200px">-->
-<!--                            关闭-->
-<!--                        </button>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-        </div>
-
-        <div class="modal inmodal" id="itemModal" tabindex="-1"
-             role="dilog" aria-hidden="true" style="padding-bottom: 100px;">
-            <div class="modal-dialog" style="width: 800px">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择物料</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center">
-                        <div class="row">
-                            <form id="itemForm" class="form-group">
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="wlCode" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料名：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="itemName" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料种类：</label>
-                                        <div class="col-sm-9">
-                                            <select class="form-control m-b" name="itemClass">
-                                                <option value="">所有</option>
-                                                <option value="成品">成品</option>
-                                                <option value="原料">原料</option>
-                                                <option value="辅料">辅料</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">客户/厂商料号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="pWldm" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">批号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="poPiNo" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group" style="display: none">
-                                        <label class="col-sm-3 control-label">客户名：</label>
-                                        <div class="col-sm-9">
-                                            <select class="form-control" name="pName" id="pName">
-                                                <option value="">所有</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-                            <div class="col-sm-12 col-sm-offset-3" style="margin-left: 0">
-                                <button type="button" class="btn btn-primary" id="itemTableSearch">搜索</button>
-                                <button type="button" class="btn btn-warning" id="itemTableReset">重置</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="itemTable"
-                                           class="table table-striped table-responsive" style="padding-bottom: 50px;">
-
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <button class="btn btn-success" id="btn_addWaitTable" onclick="addItem2()">添加</button>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive" style="padding-bottom:30px; ">
-                                    <table id="itemTable2"
-                                           class="table table-striped table-responsive">
-
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="confirm();">确定
-                        </button>
-                        <button type="button" class="btn btn-default" onclick="closeModal()">关闭</button>
-                    </div>
-
-                </div>
-                <!--  /.modal-content -->
-            </div>
-            <!-- /.modal-dialog  -->
-        </div>
-
-    </div>
-</div>
-
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-table-editable-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    let prefix = ctx + "invoice/poinvoicehead"
-    $("#form-poinvoicehead-add").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/add", $('#form-poinvoicehead-add').serialize());
-        }
-    }
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //查询参数
-    // function queryParams(params) {
-    //     var search = $.table.queryParams(params);
-    //     search.wlCode = $("#cpCode2").val();
-    //     return search;
-    // }
-
-    //提交
-    function submit(){
-        let bootstrapTable = $("#bootstrapTableBody").bootstrapTable("getData", true);
-        let formData = new FormData($("#form-poinvoicehead-add")[0]);
-        formData.append("poInvoiceListList",JSON.stringify(bootstrapTable));
-        let data={};
-        formData.forEach((value, key) => data[key] = value);
-        //alert(JSON.stringify(data1));
-        $.ajax({
-            url: prefix + "/add",
-            type: "post",
-            resultType: "json",
-            data:{"jsonStr":JSON.stringify(data)},
-            success: function (resp) {
-                if (resp.code === 0) {
-                    alert("添加成功！");
-                    // window.location.href = prefix;
-                    var index = parent.layer.getFrameIndex(window.name);
-                    var parent2 = window.parent;
-                    parent2.$.table.refresh();
-                    parent.layer.close(index);//关闭当前页
-                }else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        });
-    }
-
-    //模态框select2可输入
-    $.fn.modal.Constructor.prototype.enforceFocus = function () {
-    };
-
-    //点击引入按钮
-    function addItem() {
-        $("#itemModal").modal("show");
-    }
-
-    //关闭添加页面
-    function closeAdd() {
-        window.location.href = prefix;
-    }
-
-    //重置itemTable
-    $("#itemTableReset").on("click", function () {
-        $("input[name='wlCode']").val("");
-        $("input[name='itemName']").val("");
-        $("select[name='itemClass']").val("").trigger("change");
-        //$("#pName").val("").trigger("change");
-        $("input[name='pWldm']").val("");
-        $("input[name='poPiNo']").val("");
-        $("#itemTable").bootstrapTable("refresh");
-    })
-
-    function reset() {
-        $("input[name='wlCode']").val("");
-        $("input[name='itemName']").val("");
-        $("select[name='itemClass']").val("").trigger("change");
-        $("#pName").val("").trigger("change");
-        $("input[name='pWldm']").val("");
-        $("input[name='poPiNo']").val("");
-        $("#itemTable").bootstrapTable("refresh");
-    }
-
-    //搜索itemTable
-    $("#itemTableSearch").on("click", function () {
-        $("#itemTable").bootstrapTable("refresh");
-    })
-
-    //获取供应商编号和名称
-    $.ajax({
-        url: ctx + "ProviderPrice/ProviderPrice/all",
-        type: "post",
-        resultType: "json",
-        success: function (resp) {
-            if (resp.data.length > 0) {
-                $("select [name='pCode']").empty();
-                $("select [name='pName']").empty();
-                let data = resp.data;
-                for (let i in data) {
-                    //alert(data[i].pCode);
-                    $("select[name='pCode']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    $("select[name='pName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                }
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    });
-
-    //供应商名称改变时改变供应商编号
-    $("select[name='pName']").change(function () {
-        if ($(this).attr("id") === "pName") {
-            return false;
-        }
-        let pName = $(this).val();
-        $.ajax({
-            url: ctx + "ProviderPrice/ProviderPrice/findOne",
-            data: {"pName": pName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                $("select[name='pCode']").val(resp.data.pCode).trigger("change");
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    });
-
-    //引入item2表格
-    function addItem2() {
-        let row = $("#itemTable").bootstrapTable("getSelections");
-        let count = $('#itemTable2').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#itemTable2").bootstrapTable("getRowByUniqueId",row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable!=null){
-                alert(bootstrapTable.wlCode+"已存在!");
-                continue;
-            }
-            $("#itemTable2").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    wlCode: row[i].wlCode,
-                    itemName: row[i].itemName,
-                    itemStandard: row[i].itemStandard,
-                    machineNo: row[i].machineNo,
-                    stockDw: row[i].stockDw,
-                    weight: row[i].weight,
-                    pCode: row[i].pCode,
-                    pName: row[i].pName,
-                    stockNo: row[i].stockNo,
-                    stockName: row[i].stockName,
-                    nowJuan: row[i].nowJuan,
-                    nowQty: row[i].nowQty,
-                    fuWidth: row[i].fuWidth,
-                    longWidth: row[i].longWidth,
-                    wldm: row[i].wldm,
-                    pWldm: row[i].pWldm,
-                    poPiNo: row[i].poPiNo,
-                    madeClass: row[i].madeClass,
-                    inClass: row[i].inClass,
-                    defaultPosition: row[i].defaultPosition
-                }
-            });
-        }
-        reset();
-    }
-
-    //引入准备提交的item表格
-    function confirm() {
-        let row = $("#itemTable2").bootstrapTable("getData", true);
-        let count = $('#bootstrapTableBody').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#bootstrapTableBody").bootstrapTable("getRowByUniqueId",row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable!=null){
-                alert(bootstrapTable.wlCode+"已存在!");
-                continue;
-            }
-            $("#bootstrapTableBody").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    wlCode: row[i].wlCode,
-                    itemName: row[i].itemName,
-                    stockDw: row[i].stockDw,
-                    qty: 0,
-                    price: 0,
-                    amt: 0
-                }
-            });
-        }
-        closeModal();
-    }
-
-    //关闭模态框并刷新
-    function closeModal(){
-        $("#itemModal").modal("hide");
-        reset();
-        $("#itemTable2").bootstrapTable("removeAll");
-    }
-
-    //全部itemList
-    $('#itemTable').bootstrapTable({
-        url: ctx + "invoice/poinvoicehead/poInvoiceHeadWithList",
-        method: 'post',
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        pagination: true, // 是否显示分页（*）
-        contentType: "application/x-www-form-urlencoded",
-        queryParams: function (params) {
-            let curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1
-                // searchValue:    params.search,
-                // orderByColumn:  params.sort,
-                // isAsc:          params.order
-            };
-            let json = $.extend(curParams, $.common.formToJSON("itemForm"));
-            return json;
-        },
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        pageNumber: 1, // 初始化加载第一页，默认第一页
-        pageSize: 5, // 每页的记录行数（*）
-        pageList: [5, 10, 50], // 可供选择的每页的行数（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        // singleSelect : true,
-        height: 350,
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemStandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'weight',
-                title: '单位重量'
-            },
-            {
-                field: 'wldm',
-                title: '物料码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockNo',
-                title: '仓库号',
-            },
-            {
-                field: 'stockName',
-                title: '仓库名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'nowJuan',
-                title: '库存卷数',
-            },
-            {
-                field: 'nowQty',
-                title: '库存数量',
-            },
-            {
-                field: 'poPiNo',
-                title: '批号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'pWldm',
-                title: '基本料号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'fuWidth',
-                title: '幅宽',
-            },
-            {
-                field: 'longWidth',
-                title: '长度',
-            },
-            {
-                field: 'inClass',
-                title: '所属类别',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'madeClass',
-                title: '加工类型',
-            },
-            {
-                field: 'defaultPosition',
-                title: '存放位置',
-            },
-        ]
-
-    });
-
-    //待确认item
-    $('#itemTable2').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'wlCode',
-        columns: [
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemStandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'weight',
-                title: '单位重量'
-            },
-            {
-                field: 'wldm',
-                title: '物料码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockNo',
-                title: '仓库号',
-            },
-            {
-                field: 'stockName',
-                title: '仓库名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'nowJuan',
-                title: '库存卷数',
-            },
-            {
-                field: 'nowQty',
-                title: '库存数量',
-            },
-            {
-                field: 'poPiNo',
-                title: '批号',
-            },
-            {
-                field: 'pWldm',
-                title: '基本料号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'fuWidth',
-                title: '幅宽',
-            },
-            {
-                field: 'longWidth',
-                title: '长度',
-            },
-            {
-                field: 'inClass',
-                title: '所属类别',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'madeClass',
-                title: '加工类型',
-            },
-            {
-                field: 'defaultPosition',
-                title: '存放位置',
-            },
-            {
-                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="edit()"><i class="fa fa-edit"></i>编辑</a> ');
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove(\'' + row.wlCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }
-        ]
-
-    });
-
-    //准备提交的item
-    $('#bootstrapTableBody').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'wlCode',
-        onEditableSave: function (field, row, oldValue, $el) {
-            if (row.qty > 0 && row.price > 0) {
-                row.amt = row.qty * row.price;
-            }
-        },
-        columns: [
-            {
-                checkbox: false
-            },
-            {
-                field: 'wlCode',
-                title: '料号',
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-            },
-            {
-                field: 'stockDw',
-                title: '单位',
-            },
-            {
-                field: "qty",
-                title: '数量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-
-                }
-            },
-            {
-                field: 'crlName',
-                title: '币别',
-                editable: {
-                    type: 'select',
-                    title: '币别',
-                    source: function () {
-                        let result = [];
-                        $.ajax({
-                            url: ctx + "system/dict/data/coin",
-                            type: "post",
-                            resultType: "json",
-                            data: {"type": "sys_coin_class"},
-                            async: false,
-                            success: function (resp) {
-                                if (resp.code === 0) {
-                                    let temp = resp.data;
-                                    for (let i in temp) {
-                                        result.push({value: temp[i].dictValue, text: temp[i].dictLabel});
-                                    }
-                                } else {
-                                    $.modal.msgError(resp.msg);
-                                }
-                            },
-                            error: function () {
-                                $.modal.msgError("出错了！");
-                            }
-                        });
-                        return result;
-                    }
-                }
-            },
-            {
-                field: 'price',
-                title: '单价',
-                editable: {
-                    type: 'text',
-                    title: '单价',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) <= 0) {
-                            return '单价必须大于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'amt',
-                title: '金额'
-            },
-            {
-                title: '操作',
-                align: 'center',
-                formatter: function (value, row, index) {
-                    var actions = [];
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove2(\'' + row.wlCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }]
-
-    });
-
-    //移除bomtable2的对应行数据
-    function remove(wlCode) {
-        $("#itemTable2").bootstrapTable("remove", {
-            field: 'wlCode',
-            values: wlCode
-        });
-    }
-
-    function remove2(wlCode) {
-        $("#bootstrapTableBody").bootstrapTable("remove", {
-            field: 'wlCode',
-            values: wlCode
-        });
-    }
-
-    function submitHandler() {
-        // if ($.validate.form()) {
-        //     $.operate.edit(prefix + "/edit", $('#form-ProviderPrice-add').serialize());
-        // }
-        submit();
-    }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/edit.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/edit.html
deleted file mode 100644
index 488b16f6..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/edit.html
+++ /dev/null
@@ -1,1043 +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">
-
-    <style type="text/css">
-        .select2-container--open {
-            z-index: 9999999
-        }
-    </style>
-</head>
-<body class="white-bg">
-
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12">
-
-        </div>
-        <form class="form-horizontal m" id="form-poinvoicehead-edit" th:object="${poInvoiceHead}">
-            <input name="invoiceid" th:field="*{invoiceid}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">发票号：</label>
-                <div class="col-sm-8">
-                    <input name="Invoiceno" th:field="*{Invoiceno}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商代码：</label>
-                <div class="col-sm-8">
-                    <select name="pCode" class="form-control m-b" disabled>
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">厂商名称：</label>
-                <div class="col-sm-8">
-                    <select name="pName" class="form-control m-b">
-                        <option value="-1">--请选择--</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">合同号：</label>
-                <div class="col-sm-8">
-                    <input name="HTNO" th:field="*{HTNO}" 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="PAYWAY" th:field="*{PAYWAY}" 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="swater" th:field="*{swater}" 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="boxNum" th:field="*{boxNum}" 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="sendway" th:field="*{sendway}" 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="sendtool" th:field="*{sendtool}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">到票日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="ShouldPayDate"
-                               th:value="${#dates.format(poInvoiceHead.ShouldPayDate, 'yyyy-MM-dd')}"
-                               class="form-control time-input" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">离境日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="leavechinaDate"
-                               th:value="${#dates.format(poInvoiceHead.leavechinaDate, 'yyyy-MM-dd')}"
-                               class="form-control time-input" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">币别：</label>
-                <div class="col-sm-8">
-                    <select class="form-control" name="crlName" id="crlName"
-                            th:with="type=${@dict.getType('sys_coin_class')}">
-                        <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="ciqName" th:field="*{ciqName}" 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="dwater" th:field="*{dwater}" 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="CPSendID" th:field="*{CPSendID}" 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="taxInvoiceNo" th:field="*{taxInvoiceNo}" 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="taxPrintVersion" th:field="*{taxPrintVersion}" 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="MemoText" class="form-control">[[*{MemoText}]]</textarea>
-                </div>
-            </div>
-        </form>
-
-        <button type="button" class="btn btn-success" id="btn_addBom" onclick="addItem()">新增</button>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrapTableBody">
-            </table>
-<!--            <div class="col-sm-12" style="margin-top: 50px">-->
-<!--                <div class="row">-->
-<!--                    <div class="col-sm-12 col-sm-offset-3">-->
-<!--                        <button type="button" class="btn btn-primary" onclick="submit()" style="margin-left: 230px">提交-->
-<!--                        </button>-->
-<!--                        <button onclick="closeAdd()" class="btn btn-danger" type="button" style="margin-left: 200px">-->
-<!--                            关闭-->
-<!--                        </button>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-        </div>
-
-        <div class="modal inmodal" id="itemModal" tabindex="-1"
-             role="dilog" aria-hidden="true" style="padding-bottom: 100px;">
-            <div class="modal-dialog" style="width: 800px">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择物料</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center">
-                        <div class="row">
-                            <form id="itemForm" class="form-group">
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="wlCode" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料名：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="itemName" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">物料种类：</label>
-                                        <div class="col-sm-9">
-                                            <select class="form-control m-b" name="itemClass">
-                                                <option value="">所有</option>
-                                                <option value="成品">成品</option>
-                                                <option value="原料">原料</option>
-                                                <option value="辅料">辅料</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">客户/厂商料号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="pWldm" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-sm-3 control-label">批号：</label>
-                                        <div class="col-sm-9">
-                                            <input type="text" name="poPiNo" class="form-control m-b">
-                                        </div>
-                                    </div>
-                                    <div class="form-group" style="display: none">
-                                        <label class="col-sm-3 control-label">客户名：</label>
-                                        <div class="col-sm-9">
-                                            <select class="form-control" name="pName" id="pName">
-                                                <option value="">所有</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-                            <div class="col-sm-12 col-sm-offset-3" style="margin-left: 0">
-                                <button type="button" class="btn btn-primary" id="itemTableSearch">搜索</button>
-                                <button type="button" class="btn btn-warning" id="itemTableReset">重置</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="itemTable"
-                                           class="table table-striped table-responsive" style="padding-bottom: 50px;">
-
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <button class="btn btn-success" id="btn_addWaitTable" onclick="addItem2()">添加</button>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive" style="padding-bottom:30px; ">
-                                    <table id="itemTable2"
-                                           class="table table-striped table-responsive">
-
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="confirm();">确定
-                        </button>
-                        <button type="button" class="btn btn-default" onclick="closeModal()">关闭</button>
-                    </div>
-
-                </div>
-                <!--  /.modal-content -->
-            </div>
-            <!-- /.modal-dialog  -->
-        </div>
-
-    </div>
-</div>
-
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-table-editable-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    let prefix = ctx + "invoice/poinvoicehead";
-    $("#form-poinvoicehead-edit").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/edit", $('#form-poinvoicehead-edit').serialize());
-        }
-    }
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    let getData = [[${poInvoiceHead}]];
-
-    $("select[name='crlName']").val(getData.crlName).trigger("change");
-
-    //加载物料信息
-    $.ajax({
-        url: ctx + "invoice/poinvoicelist/getList",
-        type: "post",
-        dataType: "json",
-        data: {"invoiceid": getData.invoiceid},
-        success: function (resp) {
-            if (resp.code === 0) {
-                let row = resp.data;
-                let count = $('#bootstrapTableBody').bootstrapTable('getData').length;
-                for (let i = 0; i < row.length; i++) {
-                    $("#bootstrapTableBody").bootstrapTable('insertRow', {
-                        index: count + i,
-                        row: {
-                            wlCode: row[i].wlCode,
-                            itemName: row[i].itemName,
-                            stockDw: row[i].stockDw,
-                            qty: row[i].qty,
-                            price: row[i].price,
-                            amt: row[i].amt,
-                            crlName:row[i].crlName
-                        }
-                    });
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    })
-
-    //模态框select2可输入
-    $.fn.modal.Constructor.prototype.enforceFocus = function () {
-    };
-
-    //点击引入按钮
-    function addItem() {
-        $("#itemModal").modal("show");
-    }
-
-    //关闭添加页面
-    function closeAdd() {
-        window.location.href = prefix;
-    }
-
-    //获取供应商编号和名称
-    $.ajax({
-        url: ctx + "ProviderPrice/ProviderPrice/all",
-        type: "post",
-        resultType: "json",
-        success: function (resp) {
-            if (resp.data.length > 0) {
-                $("select [name='pCode']").empty();
-                $("select [name='pName']").empty();
-                let data = resp.data;
-                for (let i in data) {
-                    //alert(data[i].pCode);
-                    $("select[name='pCode']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    $("select[name='pName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                }
-                $("select[name='pName']").val(getData.pName).select2();
-                $("select[name='pCode']").val(getData.pCode).select2();
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    });
-
-    //供应商名称改变时改变供应商编号
-    $("select[name='pName']").change(function () {
-        if ($(this).attr("id") === "pName") {
-            return false;
-        }
-        let pName = $(this).val();
-        $.ajax({
-            url: ctx + "ProviderPrice/ProviderPrice/findOne",
-            data: {"pName": pName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                $("select[name='pCode']").val(resp.data.pCode).trigger("change");
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    });
-
-    //引入item2表格
-    function addItem2() {
-        let row = $("#itemTable").bootstrapTable("getSelections");
-        let count = $('#itemTable2').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#itemTable2").bootstrapTable("getRowByUniqueId", row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable != null) {
-                alert(bootstrapTable.wlCode + "已存在!");
-                continue;
-            }
-            $("#itemTable2").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    wlCode: row[i].wlCode,
-                    itemName: row[i].itemName,
-                    itemStandard: row[i].itemStandard,
-                    machineNo: row[i].machineNo,
-                    stockDw: row[i].stockDw,
-                    weight: row[i].weight,
-                    pCode: row[i].pCode,
-                    pName: row[i].pName,
-                    stockNo: row[i].stockNo,
-                    stockName: row[i].stockName,
-                    nowJuan: row[i].nowJuan,
-                    nowQty: row[i].nowQty,
-                    fuWidth: row[i].fuWidth,
-                    longWidth: row[i].longWidth,
-                    wldm: row[i].wldm,
-                    pWldm: row[i].pWldm,
-                    poPiNo: row[i].poPiNo,
-                    madeClass: row[i].madeClass,
-                    inClass: row[i].inClass,
-                    defaultPosition: row[i].defaultPosition
-                }
-            });
-        }
-        reset();
-    }
-
-    //引入准备提交的item表格
-    function confirm() {
-        let row = $("#itemTable2").bootstrapTable("getData", true);
-        let count = $('#bootstrapTableBody').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#bootstrapTableBody").bootstrapTable("getRowByUniqueId", row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable != null) {
-                alert(bootstrapTable.wlCode + "已存在!");
-                continue;
-            }
-            $("#bootstrapTableBody").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    wlCode: row[i].wlCode,
-                    itemName: row[i].itemName,
-                    stockDw: row[i].stockDw,
-                    qty: 0,
-                    price: 0,
-                    amt: 0
-                }
-            });
-        }
-        closeModal();
-    }
-
-    //关闭模态框并刷新
-    function closeModal() {
-        $("#itemModal").modal("hide");
-        reset();
-        $("#itemTable2").bootstrapTable("removeAll");
-    }
-
-    //重置itemTable
-    $("#itemTableReset").on("click", function () {
-        $("input[name='wlCode']").val("");
-        $("input[name='itemName']").val("");
-        $("select[name='itemClass']").val("").trigger("change");
-        //$("#pName").val("").trigger("change");
-        $("input[name='pWldm']").val("");
-        $("input[name='poPiNo']").val("");
-        $("#itemTable").bootstrapTable("refresh");
-    })
-
-    function reset() {
-        $("input[name='wlCode']").val("");
-        $("input[name='itemName']").val("");
-        $("select[name='itemClass']").val("").trigger("change");
-        //$("#pName").val("").trigger("change");
-        $("input[name='pWldm']").val("");
-        $("input[name='poPiNo']").val("");
-        $("#itemTable").bootstrapTable("refresh");
-    }
-
-    //搜索itemTable
-    $("#itemTableSearch").on("click", function () {
-        $("#itemTable").bootstrapTable("refresh");
-    })
-
-    //全部itemList
-    $('#itemTable').bootstrapTable({
-        url: ctx + "invoice/poinvoicehead/poInvoiceHeadWithList",
-        method: 'post',
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        pagination: true, // 是否显示分页（*）
-        contentType: "application/x-www-form-urlencoded",
-        queryParams: function (params) {
-            let curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1
-                // searchValue:    params.search,
-                // orderByColumn:  params.sort,
-                // isAsc:          params.order
-            };
-            let json = $.extend(curParams, $.common.formToJSON("itemForm"));
-            return json;
-        },
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        pageNumber: 1, // 初始化加载第一页，默认第一页
-        pageSize: 5, // 每页的记录行数（*）
-        pageList: [5, 10, 50], // 可供选择的每页的行数（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        // singleSelect : true,
-        height: 350,
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemStandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'weight',
-                title: '单位重量'
-            },
-            {
-                field: 'wldm',
-                title: '物料码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockNo',
-                title: '仓库号',
-            },
-            {
-                field: 'stockName',
-                title: '仓库名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'nowJuan',
-                title: '库存卷数',
-            },
-            {
-                field: 'nowQty',
-                title: '库存数量',
-            },
-            {
-                field: 'poPiNo',
-                title: '批号',
-            },
-            {
-                field: 'pWldm',
-                title: '基本料号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'fuWidth',
-                title: '幅宽',
-            },
-            {
-                field: 'longWidth',
-                title: '长度',
-            },
-            {
-                field: 'inClass',
-                title: '所属类别',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'madeClass',
-                title: '加工类型',
-            },
-            {
-                field: 'defaultPosition',
-                title: '存放位置',
-            },
-        ]
-
-    });
-
-    //待确认item
-    $('#itemTable2').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'wlCode',
-        columns: [
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemStandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'weight',
-                title: '单位重量'
-            },
-            {
-                field: 'wldm',
-                title: '物料码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'stockNo',
-                title: '仓库号',
-            },
-            {
-                field: 'stockName',
-                title: '仓库名',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'nowJuan',
-                title: '库存卷数',
-            },
-            {
-                field: 'nowQty',
-                title: '库存数量',
-            },
-            {
-                field: 'poPiNo',
-                title: '批号',
-            },
-            {
-                field: 'pWldm',
-                title: '基本料号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'fuWidth',
-                title: '幅宽',
-            },
-            {
-                field: 'longWidth',
-                title: '长度',
-            },
-            {
-                field: 'inClass',
-                title: '所属类别',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "130px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'madeClass',
-                title: '加工类型',
-            },
-            {
-                field: 'defaultPosition',
-                title: '存放位置',
-            },
-            {
-                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="edit()"><i class="fa fa-edit"></i>编辑</a> ');
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove(\'' + row.wlCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }
-        ]
-
-    });
-
-    //准备提交的item
-    $('#bootstrapTableBody').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'wlCode',
-        onEditableSave: function (field, row, oldValue, $el) {
-            if (row.qty > 0 && row.price > 0) {
-                row.amt = row.qty * row.price;
-            }
-        },
-        columns: [
-            {
-                checkbox: false
-            },
-            {
-                field: 'wlCode',
-                title: '料号',
-            },
-            {
-                field: 'itemName',
-                title: '品名',
-            },
-            {
-                field: 'stockDw',
-                title: '单位',
-            },
-            {
-                field: "qty",
-                title: '数量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-
-                }
-            },
-            {
-                field: 'crlName',
-                title: '币别',
-                editable: {
-                    type: 'select',
-                    title: '币别',
-                    source: function () {
-                        let result = [];
-                        $.ajax({
-                            url: ctx + "system/dict/data/coin",
-                            type: "post",
-                            resultType: "json",
-                            data: {"type": "sys_coin_class"},
-                            async: false,
-                            success: function (resp) {
-                                if (resp.code === 0) {
-                                    let temp = resp.data;
-                                    for (let i in temp) {
-                                        result.push({value: temp[i].dictValue, text: temp[i].dictLabel});
-                                    }
-                                } else {
-                                    $.modal.msgError(resp.msg);
-                                }
-                            },
-                            error: function () {
-                                $.modal.msgError("出错了！");
-                            }
-                        });
-                        return result;
-                    }
-                }
-            },
-            {
-                field: 'price',
-                title: '单价',
-                editable: {
-                    type: 'text',
-                    title: '单价',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) <= 0) {
-                            return '单价必须大于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'amt',
-                title: '金额'
-            },
-            {
-                title: '操作',
-                align: 'center',
-                formatter: function (value, row, index) {
-                    var actions = [];
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove2(\'' + row.wlCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }]
-
-    });
-
-    //移除bomtable2的对应行数据
-    function remove(wlCode) {
-        $("#itemTable2").bootstrapTable("remove", {
-            field: 'wlCode',
-            values: wlCode
-        });
-    }
-
-    function remove2(wlCode) {
-        $("#bootstrapTableBody").bootstrapTable("remove", {
-            field: 'wlCode',
-            values: wlCode
-        });
-    }
-
-    //提交修改
-    function submit() {
-        let bootstrapTable = $("#bootstrapTableBody").bootstrapTable("getData", true);
-        let formData = new FormData($("#form-poinvoicehead-edit")[0]);
-        formData.append("poInvoiceListList", JSON.stringify(bootstrapTable));
-        let data = {};
-        formData.forEach((value, key) => data[key] = value);
-        //alert(JSON.stringify(data1));
-        $.ajax({
-            url: prefix + "/edit",
-            type: "post",
-            resultType: "json",
-            data: {"jsonStr": JSON.stringify(data)},
-            success: function (resp) {
-                if (resp.code === 0) {
-                    alert("修改成功！");
-                    //window.location.href = prefix;
-                    var index = parent.layer.getFrameIndex(window.name);
-                    var parent2 = window.parent;
-                    parent2.$.table.refresh();
-                    parent.layer.close(index);//关闭当前页
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        });
-    }
-
-    function submitHandler() {
-        // if ($.validate.form()) {
-        //     $.operate.edit(prefix + "/edit", $('#form-ProviderPrice-add').serialize());
-        // }
-        submit();
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/poinvoicehead.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/poinvoicehead.html
deleted file mode 100644
index a1cfabf6..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicehead/poinvoicehead.html
+++ /dev/null
@@ -1,283 +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('税发票列表列表')"/>
-    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
-    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
-</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="invoiceId"/>
-                        </li>
-                        <li>
-                            <label>发票号：</label>
-                            <input type="text" name="invoiceNo"/>
-                        </li>
-                        <li>
-                            <label>厂商代码：</label>
-                            <select name="pCode" class="form-control m-b">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>厂商名称：</label>
-                            <select name="pName" class="form-control">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <li class="select-time">
-                            <label>开票日期：</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
-                                   name="params[beginInvoiceDate]"/>
-                            <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
-                                   name="params[endInvoiceDate]"/>
-                        </li>
-                        <li>
-                            <label>收款否：</label>
-                            <select name="getMoneyFlag">
-                                <option value="">所有</option>
-                                <option value="1">已收款</option>
-                                <option value="0">未收款</option>
-                            </select>
-                        </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="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="invoice:poinvoicehead:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="invoice:poinvoicehead:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="invoice:poinvoicehead:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()"
-               shiro:hasPermission="invoice:poinvoicehead:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table" style="overflow : hidden; text-overflow : ellipsis ; white-space:nowrap ;"></table>
-        </div>
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('invoice:poinvoicehead:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('invoice:poinvoicehead:remove')}]];
-    var prefix = ctx + "invoice/poinvoicehead";
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //重置
-    function reset(){
-        $("select[name='pCode']").val("").trigger("change");
-        $("select[name='pName']").val("").trigger("change");
-        $.form.reset();
-    }
-
-    //添加
-    function add(){
-        window.location.href=prefix+"/add";
-    }
-
-    //修改
-    function edit(){
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        window.location.href=prefix+"/edit/"+row[0].invoiceId;
-    }
-
-    $(function () {
-        let options = {
-            url: prefix + "/list2",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            modalName: "税发票列表",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'invoiceId',
-                    title: '发票编号'
-                },
-                {
-                    field: 'invoiceNo',
-                    title: '发票号'
-                },
-                {
-                    field: 'pCode',
-                    title: '厂商名'
-                },
-                {
-                    field: 'pName',
-                    title: '厂商名称',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'HTNo',
-                    title: '合同号'
-                },
-                {
-                    field: 'payWay',
-                    title: '付款条件'
-                },
-                {
-                    field: 'invoiceDate',
-                    title: '开票日期',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'orderNo',
-                    title: '规格型号',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'wlCode',
-                    title: '物料代码'
-                },
-                {
-                    field: 'itemName',
-                    title: '物料名称',
-                    cellStyle: function (value, row, index) {
-                        return {
-                            css: {
-                                "min-width": "130px",
-                                "text-overflow": "ellipsis",
-                                "overflow": "hidden",
-                                "max-width": "150px",
-                                "white-space": "nowrap"
-                            }
-                        }
-                    },
-                    formatter: paramsMatter
-                },
-                {
-                    field: 'stockDw',
-                    title: '单位'
-                },
-                {
-                    field: 'crlName',
-                    title: '币别'
-                },
-                {
-                    field: 'qty',
-                    title: '数量'
-                },
-                {
-                    field: 'price',
-                    title: '单价'
-                },
-                {
-                    field: 'amt',
-                    title: '金额'
-                },
-                {
-                    field: 'getMoneyFlag',
-                    title: '收款否'
-                },
-                {
-                    field: 'taxInvoiceNo',
-                    title: '税款发票号'
-                },
-                {
-                    field: 'taxPriceVersion',
-                    title: '税款打印版本'
-                },
-                {
-                    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.invoiceid + '\')"><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.invoiceid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-        };
-        $.table.init(options);
-    });
-
-    //获取供应商代码和名称
-    $.ajax({
-        url: ctx + "ProviderPrice/ProviderPrice/all",
-        type: "post",
-        resultType: "json",
-        success: function (resp) {
-            if (resp.data.length > 0) {
-                var data = resp.data;
-                for (var i in data) {
-                    //alert(data[i].pCode);
-                    $("select[name='pCode']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    $("select[name='pName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                }
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错了！");
-        }
-    });
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/add.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/add.html
deleted file mode 100644
index b5811352..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/add.html
+++ /dev/null
@@ -1,91 +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-poinvoicelist-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">发票编号：</label>
-                <div class="col-sm-8">
-                    <input name="invoiceid" 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="orderno" 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="wlCode" 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="itemname" 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="stockDw" 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="crlName" 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="qty" 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="price" 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="amt" 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="PNO" 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="FPH" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "invoice/poinvoicelist"
-        $("#form-poinvoicelist-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-poinvoicelist-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/edit.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/edit.html
deleted file mode 100644
index 81c160a4..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/edit.html
+++ /dev/null
@@ -1,92 +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-poinvoicelist-edit" th:object="${poInvoiceList}">
-            <input name="invoiceid" th:field="*{invoiceid}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">发票编号：</label>
-                <div class="col-sm-8">
-                    <input name="invoiceid" th:field="*{invoiceid}" 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="orderno" th:field="*{orderno}" 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="wlCode" th:field="*{wlCode}" 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="itemname" th:field="*{itemname}" 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="stockDw" th:field="*{stockDw}" 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="crlName" th:field="*{crlName}" 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="qty" th:field="*{qty}" 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="price" th:field="*{price}" 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="amt" th:field="*{amt}" 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="PNO" th:field="*{PNO}" 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="FPH" th:field="*{FPH}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "invoice/poinvoicelist";
-        $("#form-poinvoicelist-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-poinvoicelist-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/poinvoicelist.html b/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/poinvoicelist.html
deleted file mode 100644
index 9af92824..00000000
--- a/ruoyi-admin/src/main/resources/templates/invoice/poinvoicelist/poinvoicelist.html
+++ /dev/null
@@ -1,161 +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="invoiceid"/>
-                            </li>
-                            <li>
-                                <label>规格型号：</label>
-                                <input type="text" name="orderno"/>
-                            </li>
-                            <li>
-                                <label>物料代码·：</label>
-                                <input type="text" name="wlCode"/>
-                            </li>
-                            <li>
-                                <label>物料名称：</label>
-                                <input type="text" name="itemname"/>
-                            </li>
-                            <li>
-                                <label>单位：</label>
-                                <input type="text" name="stockDw"/>
-                            </li>
-                            <li>
-                                <label>币别：</label>
-                                <input type="text" name="crlName"/>
-                            </li>
-                            <li>
-                                <label>数量：</label>
-                                <input type="text" name="qty"/>
-                            </li>
-                            <li>
-                                <label>单价：</label>
-                                <input type="text" name="price"/>
-                            </li>
-                            <li>
-                                <label>金额：</label>
-                                <input type="text" name="amt"/>
-                            </li>
-                            <li>
-                                <label>：</label>
-                                <input type="text" name="PNO"/>
-                            </li>
-                            <li>
-                                <label>：</label>
-                                <input type="text" name="FPH"/>
-                            </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="invoice:poinvoicelist:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="invoice:poinvoicelist:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="invoice:poinvoicelist:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="invoice:poinvoicelist: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('invoice:poinvoicelist:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('invoice:poinvoicelist:remove')}]];
-        var prefix = ctx + "invoice/poinvoicelist";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "税发票列表",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'invoiceid',
-                    title: '发票编号'
-                },
-                {
-                    field: 'orderno',
-                    title: '规格型号'
-                },
-                {
-                    field: 'wlCode',
-                    title: '物料代码·'
-                },
-                {
-                    field: 'itemname',
-                    title: '物料名称'
-                },
-                {
-                    field: 'stockDw',
-                    title: '单位'
-                },
-                {
-                    field: 'crlName',
-                    title: '币别'
-                },
-                {
-                    field: 'qty',
-                    title: '数量'
-                },
-                {
-                    field: 'price',
-                    title: '单价'
-                },
-                {
-                    field: 'amt',
-                    title: '金额'
-                },
-                {
-                    field: 'PNO',
-                    title: ''
-                },
-                {
-                    field: 'FPH',
-                    title: ''
-                },
-                {
-                    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.invoiceid + '\')"><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.invoiceid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file