diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/CustomerController.java
deleted file mode 100644
index 4aa9d3b8..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/CustomerController.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.ruoyi.finance.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.finance.domain.Customer;
-import com.ruoyi.finance.domain.Parameter;
-import com.ruoyi.finance.domain.productpriceCAA;
-import com.ruoyi.finance.service.ICustomerService;
-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.text.DecimalFormat;
-import java.util.List;
-
-/**
- * 客户资料Controller
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-@Controller
-@RequestMapping("/finance/customer")
-public class CustomerController extends BaseController
-{
-    private String prefix = "finance/customer";
-
-    @Autowired
-    private ICustomerService customerService;
-
-
-    @RequiresPermissions("finance:customer:view")
-    @GetMapping()
-    public String customer()
-    {
-        return prefix + "/customer";
-    }
-
-    /**
-     * 查询客户资料列表
-     */
-    @RequiresPermissions("finance:customer:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(Customer customer)
-    {
-        startPage();
-        List<Customer> list = customerService.selectCustomerList(customer);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出客户资料列表
-     */
-    @RequiresPermissions("finance:customer:export")
-    @Log(title = "客户资料", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(Customer customer)
-    {
-        List<Customer> list = customerService.selectCustomerList(customer);
-        ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
-        return util.exportExcel(list, "客户资料数据");
-    }
-
-    /**
-     * 新增客户资料
-     */
-    @GetMapping("/add")
-    public String add(Parameter parameter, ModelMap mmap)
-    {
-        DecimalFormat df=new DecimalFormat("000");
-        int a=customerService.selectNum().intValue() + 1;
-        String str2=df.format(a);
-//        System.out.println(str2);
-//        String i =  Integer.toString(customerService.selectNum());
-        parameter.setNum(str2);
-        mmap.addAttribute("parameter",parameter);
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存客户资料
-     */
-    @RequiresPermissions("finance:customer:add")
-    @Log(title = "客户资料", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(Customer customer)
-    {
-//        System.out.print(customer);
-        customer.setComfirmFlag("0");
-//        return toAjax(1);
-        return toAjax(customerService.insertCustomer(customer));
-    }
-    @GetMapping("/test")
-    public String test()
-    {
-
-        return prefix + "/test";
-    }
-    /**
-     * 修改客户资料
-     */
-    @GetMapping("/edit/{pCode}")
-    public String edit(@PathVariable("pCode") String pCode, ModelMap mmap)
-    {
-        Customer customer = customerService.selectCustomerById(pCode);
-        mmap.put("customer", customer);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存客户资料
-     */
-    @RequiresPermissions("finance:customer:edit")
-    @Log(title = "客户资料", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Customer customer)
-    {
-
-        String comfirmFlag = customerService.selectCustomerById(customer.getpCode()).getComfirmFlag();
-        if(comfirmFlag.equals("1")){
-            return error("已确认的资料不能修改");
-        }
-//        return toAjax(1);
-        return toAjax(customerService.updateCustomer(customer));
-    }
-
-    /**
-     * 删除客户资料
-     */
-    @RequiresPermissions("finance:customer:remove")
-    @Log(title = "客户资料", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        Customer customer = customerService.selectCustomerById(ids);
-        if(customer.getComfirmFlag().equals("1")){
-            return error("已确认的资料不能删除");
-        }
-        return toAjax(customerService.deleteCustomerByIds(ids));
-
-    }
-
-    /**
-     * 客户资料确认
-     */
-    @RequiresPermissions("finance:productprice:edit")
-    @Log(title = "产品报价", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit/comfirm")
-    @ResponseBody
-    public AjaxResult CustomerComfirm(productpriceCAA caa)
-    {
-//        System.out.print(caa);
-//        return toAjax(1);
-        Customer customer = customerService.selectCustomerById(caa.getId());
-        if(customer.getComfirmFlag()=="1"){
-            return error("已确认的资料");
-        }
-        return toAjax(customerService.customerComfirm(caa));
-
-    }
-
-     @ResponseBody
-    @PostMapping("/getName")
-    public Result getNameAndCode()throws Exception{
-        return customerService.findNameAndCode();
-    }
-
-    @ResponseBody
-    @PostMapping("/item")
-    public Result findByItem(Customer customer)throws Exception{
-        List<Customer> customers = customerService.selectCustomerList(customer);
-        return Result.getSuccessResult(customers);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/ProductpriceController.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/ProductpriceController.java
deleted file mode 100644
index 4a75e876..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/controller/ProductpriceController.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.ruoyi.finance.controller;
-
-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.finance.domain.Customer;
-import com.ruoyi.finance.domain.Productprice;
-import com.ruoyi.finance.domain.productpriceCAA;
-import com.ruoyi.finance.service.ICustomerService;
-import com.ruoyi.finance.service.IProductpriceService;
-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.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * 产品报价Controller
- * 
- * @author ruoyi
- * @date 2021-11-01
- */
-@Controller
-@RequestMapping("/finance/productprice")
-public class ProductpriceController extends BaseController
-{
-    private String prefix = "finance/productprice";
-
-    @Autowired
-    private IProductpriceService productpriceService;
-    @Autowired
-    private ICustomerService iCustomerService;
-
-
-
-    @RequiresPermissions("finance:productprice:view")
-    @GetMapping()
-    public String productprice()
-    {
-        return prefix + "/productprice";
-    }
-
-    /**
-     * 查询产品报价列表
-     */
-    @RequiresPermissions("finance:productprice:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(Productprice productprice)
-    {
-        startPage();
-        System.out.print(productprice.getWlCode());
-        System.out.print(productprice.getItemname());
-        List<Productprice> list = productpriceService.selectProductpriceList(productprice);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出产品报价列表
-     */
-    @RequiresPermissions("finance:productprice:export")
-    @Log(title = "产品报价", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(Productprice productprice)
-    {
-        List<Productprice> list = productpriceService.selectProductpriceList(productprice);
-        ExcelUtil<Productprice> util = new ExcelUtil<Productprice>(Productprice.class);
-        return util.exportExcel(list, "产品报价数据");
-    }
-
-    /**
-     * 新增产品报价
-     */
-    @GetMapping("/add")
-    public String add( ModelMap mmap,Customer customer)
-    {
-        String id = ID();
-        int exist = productpriceService.selectProductpriceNnm(id);
-        //判断编号是否存在，存在则再次随机
-        while (exist==1){
-            id =  ID();
-            exist = productpriceService.selectProductpriceNnm(id);
-        }
-
-//        System.out.println("id"+id);
-//        System.out.println(exist);
-        List<Customer> list = iCustomerService.selectCustomerList(customer);
-        mmap.addAttribute("wxProduct",list);
-        mmap.addAttribute("SaleOrderID",id);
-//        String userName = (String) PermissionUtils.getPrincipalProperty("userName");
-        return prefix + "/add";
-    }
-    //获取随机编号
-    public String ID(){
-        Date date = new Date();
-        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd");
-        String dates = dateFormat.format(date);
-        String s = "BJ"+Pattern.compile("[^0-9]").matcher(dates).replaceAll("");
-//        System.out.println("/////转化后"+s);
-        //        获取时间并转化为字符串
-
-        char[] str = "0123456789".toCharArray();
-        for(int i = 0; i < 5; i++) {
-            int indexNumber = (int) (Math.random() * str.length);
-            s += str[indexNumber];
-        }
-//        System.out.println("/////拼接后"+s);
-        //        拼接上5位随机数
-        return s;
-}
-
-    /**
-     * 新增保存产品报价
-     */
-    @RequiresPermissions("finance:productprice:add")
-    @Log(title = "产品报价", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(Productprice productprice)
-    {
-        String ID1 = productprice.getSaleOrderID();
-        productprice.setComfirmFlag("0");
-        productprice.setApproveFlag("0");
-        productprice.setAuditingFlag("0");
-        return toAjax(productpriceService.insertProductprice(productprice));
-//        return toAjax(1);
-
-    }
-
-    /**
-     * 修改产品报价
-     */
-    @GetMapping("/edit/{SaleOrderID}")
-    public String edit(@PathVariable("SaleOrderID") String SaleOrderID, ModelMap mmap)
-    {
-        Productprice productprice = productpriceService.selectProductpriceById(SaleOrderID);
-        mmap.put("productprice", productprice);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存产品报价
-     */
-    @RequiresPermissions("finance:productprice:edit")
-    @Log(title = "产品报价", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Productprice productprice)
-    {
-        System.out.print("11111111111111"+productprice);
-        return toAjax(productpriceService.updateProductprice(productprice));
-    }
-
-    /**
-     * 产品报价确认
-     */
-    @RequiresPermissions("finance:productprice:edit")
-    @Log(title = "产品报价", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit/comfirm")
-    @ResponseBody
-    public AjaxResult editSave1(productpriceCAA caa)
-    {
-//        System.out.print(caa);
-//        return toAjax(1);
-        Productprice productprice = productpriceService.selectProductpriceById(caa.getId());
-        if(productprice.getComfirmFlag().equals("1")){
-            return error("已确认的资料");
-        }
-        return toAjax(productpriceService.updateCAA(caa));
-//        return toAjax(1);
-    }
-
-    /**
-     * 产品报价审核
-     */
-    @RequiresPermissions("finance:productprice:edit")
-    @Log(title = "产品报价", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit/auditing")
-    @ResponseBody
-    public AjaxResult editSave2(productpriceCAA caa)
-    {
-        Productprice productprice = productpriceService.selectProductpriceById(caa.getId());
-        if(productprice.getAuditingFlag().equals("1")){
-            return error("已审核的资料");
-        }
-//        System.out.print(caa);
-//        return toAjax(1);
-        return toAjax(productpriceService.updateCBB(caa));
-
-    }
-
-    /**
-     * 产品报价核准
-     */
-    @RequiresPermissions("finance:productprice:edit")
-    @Log(title = "产品报价", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit/approve")
-    @ResponseBody
-    public AjaxResult editSave3(productpriceCAA caa)
-    {
-        Productprice productprice = productpriceService.selectProductpriceById(caa.getId());
-        if(productprice.getApproveFlag().equals("1")){
-            return error("已核准的资料");
-        }
-//        System.out.print(caa);
-//        return toAjax(1);
-        return toAjax(productpriceService.updateCCC(caa));
-
-    }
-
-    /**
-     * 删除产品报价
-     */
-    @RequiresPermissions("finance:productprice:remove")
-    @Log(title = "产品报价", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(productpriceService.deleteProductpriceByIds(ids));
-    }
-
-
-
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Customer.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Customer.java
deleted file mode 100644
index f96a4a84..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Customer.java
+++ /dev/null
@@ -1,819 +0,0 @@
-package com.ruoyi.finance.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-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;
-import java.util.Date;
-
-/**
- * 客户资料对象 customer
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public class Customer extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @Excel(name = "")
-    private String pCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pName;
-
-    /**  */
-    @Excel(name = "")
-    private String pEnName;
-
-    /**  */
-    @Excel(name = "")
-    private String pAddress;
-
-    /**  */
-    @Excel(name = "")
-    private String pPost;
-
-    /**  */
-    @Excel(name = "")
-    private String pCountry;
-
-    /**  */
-    @Excel(name = "")
-    private String pCeo;
-
-    /**  */
-    @Excel(name = "")
-    private String pLinkman;
-
-    /**  */
-    @Excel(name = "")
-    private String pTel;
-
-    /**  */
-    @Excel(name = "")
-    private String pFax;
-
-    /**  */
-    @Excel(name = "")
-    private String pEmail;
-
-    /**  */
-    @Excel(name = "")
-    private String pHttp;
-
-    /**  */
-    @Excel(name = "")
-    private String pCiqCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pComCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pHyCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pType;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date pCreatDate;
-
-    /**  */
-    @Excel(name = "")
-    private String pJhbank;
-
-    /**  */
-    @Excel(name = "")
-    private String pJhbankCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pBank;
-
-    /**  */
-    @Excel(name = "")
-    private String pBankCode;
-
-    /**  */
-    @Excel(name = "")
-    private Long pRmbMoney;
-
-    /**  */
-    @Excel(name = "")
-    private String pWbType;
-
-    /**  */
-    @Excel(name = "")
-    private Long pWbMoney;
-
-    /**  */
-    @Excel(name = "")
-    private String memoText;
-
-    /**  */
-    @Excel(name = "")
-    private String moral;
-
-    /**  */
-    @Excel(name = "")
-    private String comfirmFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String comfirmMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date comfirmDate;
-
-    /**  */
-    @Excel(name = "")
-    private String writeMan;
-
-    /**  */
-    @Excel(name = "")
-    private Long auditingFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String auditingMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date auditingDate;
-
-    /**  */
-    @Excel(name = "")
-    private Long approveFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String approveMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date approveDate;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date writeDate;
-
-    /**  */
-    @Excel(name = "")
-    private String memotext;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal creditAmt;
-
-    /**  */
-    @Excel(name = "")
-    private String PID;
-
-    /**  */
-    @Excel(name = "")
-    private String NWX;
-
-    /**  */
-    @Excel(name = "")
-    private Long ordernoLen;
-
-    /**  */
-    @Excel(name = "")
-    private String sendcpReportname;
-
-    /**  */
-    @Excel(name = "")
-    private String saler;
-
-    /**  */
-    @Excel(name = "")
-    private String dWaterNo;
-
-    /**  */
-    @Excel(name = "")
-    private String sWaterName;
-
-    /**  */
-    @Excel(name = "")
-    private String sWaterNo;
-
-    /**  */
-    @Excel(name = "")
-    private String comCode;
-
-    /**  */
-    @Excel(name = "")
-    private String crlName;
-
-    /**  */
-    @Excel(name = "")
-    private String pCountryCode;
-
-    /**  */
-    @Excel(name = "")
-    private String CID;
-
-    /**  */
-    @Excel(name = "")
-    private String senduseConfirm;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal taxPercent;
-
-    /**  */
-    @Excel(name = "")
-    private String senddw;
-
-    /**  */
-    @Excel(name = "")
-    private Long taxFlag;
-
-    /**  */
-    @Excel(name = "")
-    private Integer num;
-
-    @Override
-    public String toString() {
-        return "Customer{" +
-                "pCode='" + pCode + '\'' +
-                ", pName='" + pName + '\'' +
-                ", pEnName='" + pEnName + '\'' +
-                ", pAddress='" + pAddress + '\'' +
-                ", pPost='" + pPost + '\'' +
-                ", pCountry='" + pCountry + '\'' +
-                ", pCeo='" + pCeo + '\'' +
-                ", pLinkman='" + pLinkman + '\'' +
-                ", pTel='" + pTel + '\'' +
-                ", pFax='" + pFax + '\'' +
-                ", pEmail='" + pEmail + '\'' +
-                ", pHttp='" + pHttp + '\'' +
-                ", pCiqCode='" + pCiqCode + '\'' +
-                ", pComCode='" + pComCode + '\'' +
-                ", pHyCode='" + pHyCode + '\'' +
-                ", pType='" + pType + '\'' +
-                ", pCreatDate=" + pCreatDate +
-                ", pJhbank='" + pJhbank + '\'' +
-                ", pJhbankCode='" + pJhbankCode + '\'' +
-                ", pBank='" + pBank + '\'' +
-                ", pBankCode='" + pBankCode + '\'' +
-                ", pRmbMoney=" + pRmbMoney +
-                ", pWbType='" + pWbType + '\'' +
-                ", pWbMoney=" + pWbMoney +
-                ", memoText='" + memoText + '\'' +
-                ", moral='" + moral + '\'' +
-                ", comfirmFlag=" + comfirmFlag +
-                ", comfirmMan='" + comfirmMan + '\'' +
-                ", comfirmDate=" + comfirmDate +
-                ", writeMan='" + writeMan + '\'' +
-                ", auditingFlag=" + auditingFlag +
-                ", auditingMan='" + auditingMan + '\'' +
-                ", auditingDate=" + auditingDate +
-                ", approveFlag=" + approveFlag +
-                ", approveMan='" + approveMan + '\'' +
-                ", approveDate=" + approveDate +
-                ", writeDate=" + writeDate +
-                ", memotext='" + memotext + '\'' +
-                ", creditAmt=" + creditAmt +
-                ", PID='" + PID + '\'' +
-                ", NWX='" + NWX + '\'' +
-                ", ordernoLen=" + ordernoLen +
-                ", sendcpReportname='" + sendcpReportname + '\'' +
-                ", saler='" + saler + '\'' +
-                ", dWaterNo='" + dWaterNo + '\'' +
-                ", sWaterName='" + sWaterName + '\'' +
-                ", sWaterNo='" + sWaterNo + '\'' +
-                ", comCode='" + comCode + '\'' +
-                ", crlName='" + crlName + '\'' +
-                ", pCountryCode='" + pCountryCode + '\'' +
-                ", CID='" + CID + '\'' +
-                ", senduseConfirm='" + senduseConfirm + '\'' +
-                ", taxPercent=" + taxPercent +
-                ", senddw='" + senddw + '\'' +
-                ", taxFlag=" + taxFlag +
-                ", num=" + num +
-                '}';
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-
-
-    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 setpEnName(String pEnName) 
-    {
-        this.pEnName = pEnName;
-    }
-
-    public String getpEnName() 
-    {
-        return pEnName;
-    }
-    public void setpAddress(String pAddress) 
-    {
-        this.pAddress = pAddress;
-    }
-
-    public String getpAddress() 
-    {
-        return pAddress;
-    }
-    public void setpPost(String pPost) 
-    {
-        this.pPost = pPost;
-    }
-
-    public String getpPost() 
-    {
-        return pPost;
-    }
-    public void setpCountry(String pCountry) 
-    {
-        this.pCountry = pCountry;
-    }
-
-    public String getpCountry() 
-    {
-        return pCountry;
-    }
-    public void setpCeo(String pCeo) 
-    {
-        this.pCeo = pCeo;
-    }
-
-    public String getpCeo() 
-    {
-        return pCeo;
-    }
-    public void setpLinkman(String pLinkman) 
-    {
-        this.pLinkman = pLinkman;
-    }
-
-    public String getpLinkman() 
-    {
-        return pLinkman;
-    }
-    public void setpTel(String pTel) 
-    {
-        this.pTel = pTel;
-    }
-
-    public String getpTel() 
-    {
-        return pTel;
-    }
-    public void setpFax(String pFax) 
-    {
-        this.pFax = pFax;
-    }
-
-    public String getpFax() 
-    {
-        return pFax;
-    }
-    public void setpEmail(String pEmail) 
-    {
-        this.pEmail = pEmail;
-    }
-
-    public String getpEmail() 
-    {
-        return pEmail;
-    }
-    public void setpHttp(String pHttp) 
-    {
-        this.pHttp = pHttp;
-    }
-
-    public String getpHttp() 
-    {
-        return pHttp;
-    }
-    public void setpCiqCode(String pCiqCode) 
-    {
-        this.pCiqCode = pCiqCode;
-    }
-
-    public String getpCiqCode() 
-    {
-        return pCiqCode;
-    }
-    public void setpComCode(String pComCode) 
-    {
-        this.pComCode = pComCode;
-    }
-
-    public String getpComCode() 
-    {
-        return pComCode;
-    }
-    public void setpHyCode(String pHyCode) 
-    {
-        this.pHyCode = pHyCode;
-    }
-
-    public String getpHyCode() 
-    {
-        return pHyCode;
-    }
-    public void setpType(String pType) 
-    {
-        this.pType = pType;
-    }
-
-    public String getpType() 
-    {
-        return pType;
-    }
-    public void setpCreatDate(Date pCreatDate) 
-    {
-        this.pCreatDate = pCreatDate;
-    }
-
-    public Date getpCreatDate() 
-    {
-        return pCreatDate;
-    }
-    public void setpJhbank(String pJhbank) 
-    {
-        this.pJhbank = pJhbank;
-    }
-
-    public String getpJhbank() 
-    {
-        return pJhbank;
-    }
-    public void setpJhbankCode(String pJhbankCode) 
-    {
-        this.pJhbankCode = pJhbankCode;
-    }
-
-    public String getpJhbankCode() 
-    {
-        return pJhbankCode;
-    }
-    public void setpBank(String pBank) 
-    {
-        this.pBank = pBank;
-    }
-
-    public String getpBank() 
-    {
-        return pBank;
-    }
-    public void setpBankCode(String pBankCode) 
-    {
-        this.pBankCode = pBankCode;
-    }
-
-    public String getpBankCode() 
-    {
-        return pBankCode;
-    }
-    public void setpRmbMoney(Long pRmbMoney) 
-    {
-        this.pRmbMoney = pRmbMoney;
-    }
-
-    public Long getpRmbMoney() 
-    {
-        return pRmbMoney;
-    }
-    public void setpWbType(String pWbType) 
-    {
-        this.pWbType = pWbType;
-    }
-
-    public String getpWbType() 
-    {
-        return pWbType;
-    }
-    public void setpWbMoney(Long pWbMoney) 
-    {
-        this.pWbMoney = pWbMoney;
-    }
-
-    public Long getpWbMoney() 
-    {
-        return pWbMoney;
-    }
-    public void setMemoText(String memoText) 
-    {
-        this.memoText = memoText;
-    }
-
-    public String getMemoText() 
-    {
-        return memoText;
-    }
-    public void setMoral(String moral) 
-    {
-        this.moral = moral;
-    }
-
-    public String getMoral() 
-    {
-        return moral;
-    }
-    public void setComfirmFlag(String comfirmFlag)
-    {
-        this.comfirmFlag = comfirmFlag;
-    }
-
-    public String getComfirmFlag()
-    {
-        return comfirmFlag;
-    }
-    public void setComfirmMan(String comfirmMan) 
-    {
-        this.comfirmMan = comfirmMan;
-    }
-
-    public String getComfirmMan() 
-    {
-        return comfirmMan;
-    }
-    public void setComfirmDate(Date comfirmDate) 
-    {
-        this.comfirmDate = comfirmDate;
-    }
-
-    public Date getComfirmDate() 
-    {
-        return comfirmDate;
-    }
-    public void setWriteMan(String writeMan) 
-    {
-        this.writeMan = writeMan;
-    }
-
-    public String getWriteMan() 
-    {
-        return writeMan;
-    }
-    public void setAuditingFlag(Long auditingFlag) 
-    {
-        this.auditingFlag = auditingFlag;
-    }
-
-    public Long getAuditingFlag() 
-    {
-        return auditingFlag;
-    }
-    public void setAuditingMan(String auditingMan) 
-    {
-        this.auditingMan = auditingMan;
-    }
-
-    public String getAuditingMan() 
-    {
-        return auditingMan;
-    }
-    public void setAuditingDate(Date auditingDate) 
-    {
-        this.auditingDate = auditingDate;
-    }
-
-    public Date getAuditingDate() 
-    {
-        return auditingDate;
-    }
-    public void setApproveFlag(Long approveFlag) 
-    {
-        this.approveFlag = approveFlag;
-    }
-
-    public Long getApproveFlag() 
-    {
-        return approveFlag;
-    }
-    public void setApproveMan(String approveMan) 
-    {
-        this.approveMan = approveMan;
-    }
-
-    public String getApproveMan() 
-    {
-        return approveMan;
-    }
-    public void setApproveDate(Date approveDate) 
-    {
-        this.approveDate = approveDate;
-    }
-
-    public Date getApproveDate() 
-    {
-        return approveDate;
-    }
-    public void setWriteDate(Date writeDate) 
-    {
-        this.writeDate = writeDate;
-    }
-
-    public Date getWriteDate() 
-    {
-        return writeDate;
-    }
-    public void setMemotext(String memotext) 
-    {
-        this.memotext = memotext;
-    }
-
-    public String getMemotext() 
-    {
-        return memotext;
-    }
-    public void setCreditAmt(BigDecimal creditAmt) 
-    {
-        this.creditAmt = creditAmt;
-    }
-
-    public BigDecimal getCreditAmt() 
-    {
-        return creditAmt;
-    }
-    public void setPID(String PID) 
-    {
-        this.PID = PID;
-    }
-
-    public String getPID() 
-    {
-        return PID;
-    }
-    public void setNWX(String NWX) 
-    {
-        this.NWX = NWX;
-    }
-
-    public String getNWX() 
-    {
-        return NWX;
-    }
-    public void setOrdernoLen(Long ordernoLen) 
-    {
-        this.ordernoLen = ordernoLen;
-    }
-
-    public Long getOrdernoLen() 
-    {
-        return ordernoLen;
-    }
-    public void setSendcpReportname(String sendcpReportname) 
-    {
-        this.sendcpReportname = sendcpReportname;
-    }
-
-    public String getSendcpReportname() 
-    {
-        return sendcpReportname;
-    }
-    public void setSaler(String saler) 
-    {
-        this.saler = saler;
-    }
-
-    public String getSaler() 
-    {
-        return saler;
-    }
-    public void setdWaterNo(String dWaterNo) 
-    {
-        this.dWaterNo = dWaterNo;
-    }
-
-    public String getdWaterNo() 
-    {
-        return dWaterNo;
-    }
-    public void setsWaterName(String sWaterName) 
-    {
-        this.sWaterName = sWaterName;
-    }
-
-    public String getsWaterName() 
-    {
-        return sWaterName;
-    }
-    public void setsWaterNo(String sWaterNo) 
-    {
-        this.sWaterNo = sWaterNo;
-    }
-
-    public String getsWaterNo() 
-    {
-        return sWaterNo;
-    }
-    public void setComCode(String comCode) 
-    {
-        this.comCode = comCode;
-    }
-
-    public String getComCode() 
-    {
-        return comCode;
-    }
-    public void setCrlName(String crlName) 
-    {
-        this.crlName = crlName;
-    }
-
-    public String getCrlName() 
-    {
-        return crlName;
-    }
-    public void setpCountryCode(String pCountryCode) 
-    {
-        this.pCountryCode = pCountryCode;
-    }
-
-    public String getpCountryCode() 
-    {
-        return pCountryCode;
-    }
-    public void setCID(String CID) 
-    {
-        this.CID = CID;
-    }
-
-    public String getCID() 
-    {
-        return CID;
-    }
-    public void setSenduseConfirm(String senduseConfirm) 
-    {
-        this.senduseConfirm = senduseConfirm;
-    }
-
-    public String getSenduseConfirm() 
-    {
-        return senduseConfirm;
-    }
-    public void setTaxPercent(BigDecimal taxPercent) 
-    {
-        this.taxPercent = taxPercent;
-    }
-
-    public BigDecimal getTaxPercent() 
-    {
-        return taxPercent;
-    }
-    public void setSenddw(String senddw) 
-    {
-        this.senddw = senddw;
-    }
-
-    public String getSenddw() 
-    {
-        return senddw;
-    }
-    public void setTaxFlag(Long taxFlag) 
-    {
-        this.taxFlag = taxFlag;
-    }
-
-    public Long getTaxFlag() 
-    {
-        return taxFlag;
-    }
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Productprice.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Productprice.java
deleted file mode 100644
index 871441dd..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Productprice.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package com.ruoyi.finance.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-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;
-import java.util.Date;
-
-/**
- * 产品报价对象 productprice
- * 
- * @author ruoyi
- * @date 2021-11-01
- */
-public class Productprice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @Excel(name = "")
-    private String SaleOrderID;
-
-    /**  */
-    @Excel(name = "")
-    private String wlCode;
-
-    /**  */
-    @Excel(name = "")
-    private String Itemname;
-
-    /**  */
-    @Excel(name = "")
-    private String Itemstandard;
-
-    /**  */
-    @Excel(name = "")
-    private String machineNo;
-
-    /**  */
-    @Excel(name = "")
-    private String stockDw;
-
-    /**  */
-    @Excel(name = "")
-    private String crlName;
-
-    /**  */
-    @Excel(name = "")
-    private Long Price;
-
-    /**  */
-    @Excel(name = "")
-    private String pCode;
-
-    /**  */
-    @Excel(name = "")
-    private String pName;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date SendDate;
-
-    /**  */
-    @Excel(name = "")
-    private String memoText;
-
-    /**  */
-    @Excel(name = "")
-    private Integer IsNowPrice;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal rmbPrice;
-
-    /**  */
-    @Excel(name = "")
-    private Long taxFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String comfirmFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String comfirmMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date comfirmDate;
-
-    /**  */
-    @Excel(name = "")
-    private String writeMan;
-
-    /**  */
-    @Excel(name = "")
-    private String auditingFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String auditingMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date auditingDatetime;
-
-    /**  */
-    @Excel(name = "")
-    private String approveFlag;
-
-    /**  */
-    @Excel(name = "")
-    private String approveMan;
-
-    /**  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date approveDate;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal lastPrice;
-
-    /**  */
-    @Excel(name = "")
-    private String lastCrlName;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal taxPercent;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal noTaxPrice;
-
-    /**  */
-    @Excel(name = "")
-    private BigDecimal taxPrice;
-
-    public void setSaleOrderID(String SaleOrderID) 
-    {
-        this.SaleOrderID = SaleOrderID;
-    }
-
-    public String getSaleOrderID() 
-    {
-        return SaleOrderID;
-    }
-    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 setItemstandard(String Itemstandard) 
-    {
-        this.Itemstandard = Itemstandard;
-    }
-
-    public String getItemstandard() 
-    {
-        return Itemstandard;
-    }
-    public void setMachineNo(String machineNo) 
-    {
-        this.machineNo = machineNo;
-    }
-
-    public String getMachineNo() 
-    {
-        return machineNo;
-    }
-    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 setPrice(Long Price) 
-    {
-        this.Price = Price;
-    }
-
-    public Long getPrice() 
-    {
-        return Price;
-    }
-    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 setSendDate(Date SendDate) 
-    {
-        this.SendDate = SendDate;
-    }
-
-    public Date getSendDate() 
-    {
-        return SendDate;
-    }
-    public void setMemoText(String memoText) 
-    {
-        this.memoText = memoText;
-    }
-
-    public String getMemoText() 
-    {
-        return memoText;
-    }
-    public void setIsNowPrice(Integer IsNowPrice) 
-    {
-        this.IsNowPrice = IsNowPrice;
-    }
-
-    public Integer getIsNowPrice() 
-    {
-        return IsNowPrice;
-    }
-    public void setRmbPrice(BigDecimal rmbPrice) 
-    {
-        this.rmbPrice = rmbPrice;
-    }
-
-    public BigDecimal getRmbPrice() 
-    {
-        return rmbPrice;
-    }
-    public void setTaxFlag(Long taxFlag) 
-    {
-        this.taxFlag = taxFlag;
-    }
-
-    public Long getTaxFlag() 
-    {
-        return taxFlag;
-    }
-    public void setComfirmFlag(String comfirmFlag)
-    {
-        this.comfirmFlag = comfirmFlag;
-    }
-
-    public String getComfirmFlag()
-    {
-        return comfirmFlag;
-    }
-    public void setComfirmMan(String comfirmMan) 
-    {
-        this.comfirmMan = comfirmMan;
-    }
-
-    public String getComfirmMan() 
-    {
-        return comfirmMan;
-    }
-    public void setComfirmDate(Date comfirmDate) 
-    {
-        this.comfirmDate = comfirmDate;
-    }
-
-    public Date getComfirmDate() 
-    {
-        return comfirmDate;
-    }
-    public void setWriteMan(String writeMan) 
-    {
-        this.writeMan = writeMan;
-    }
-
-    public String getWriteMan() 
-    {
-        return writeMan;
-    }
-    public void setAuditingFlag(String auditingFlag)
-    {
-        this.auditingFlag = auditingFlag;
-    }
-
-    public String getAuditingFlag()
-    {
-        return auditingFlag;
-    }
-    public void setAuditingMan(String auditingMan) 
-    {
-        this.auditingMan = auditingMan;
-    }
-
-    public String getAuditingMan() 
-    {
-        return auditingMan;
-    }
-    public void setAuditingDatetime(Date auditingDatetime) 
-    {
-        this.auditingDatetime = auditingDatetime;
-    }
-
-    public Date getAuditingDatetime() 
-    {
-        return auditingDatetime;
-    }
-    public void setApproveFlag(String approveFlag)
-    {
-        this.approveFlag = approveFlag;
-    }
-
-    public String getApproveFlag()
-    {
-        return approveFlag;
-    }
-    public void setApproveMan(String approveMan) 
-    {
-        this.approveMan = approveMan;
-    }
-
-    public String getApproveMan() 
-    {
-        return approveMan;
-    }
-    public void setApproveDate(Date approveDate) 
-    {
-        this.approveDate = approveDate;
-    }
-
-    public Date getApproveDate() 
-    {
-        return approveDate;
-    }
-    public void setLastPrice(BigDecimal lastPrice) 
-    {
-        this.lastPrice = lastPrice;
-    }
-
-    public BigDecimal getLastPrice() 
-    {
-        return lastPrice;
-    }
-    public void setLastCrlName(String lastCrlName) 
-    {
-        this.lastCrlName = lastCrlName;
-    }
-
-    public String getLastCrlName() 
-    {
-        return lastCrlName;
-    }
-    public void setTaxPercent(BigDecimal taxPercent) 
-    {
-        this.taxPercent = taxPercent;
-    }
-
-    public BigDecimal getTaxPercent() 
-    {
-        return taxPercent;
-    }
-    public void setNoTaxPrice(BigDecimal noTaxPrice) 
-    {
-        this.noTaxPrice = noTaxPrice;
-    }
-
-    public BigDecimal getNoTaxPrice() 
-    {
-        return noTaxPrice;
-    }
-    public void setTaxPrice(BigDecimal taxPrice) 
-    {
-        this.taxPrice = taxPrice;
-    }
-
-    public BigDecimal getTaxPrice() 
-    {
-        return taxPrice;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("SaleOrderID", getSaleOrderID())
-            .append("wlCode", getWlCode())
-            .append("Itemname", getItemname())
-            .append("Itemstandard", getItemstandard())
-            .append("machineNo", getMachineNo())
-            .append("stockDw", getStockDw())
-            .append("crlName", getCrlName())
-            .append("Price", getPrice())
-            .append("pCode", getpCode())
-            .append("pName", getpName())
-            .append("SendDate", getSendDate())
-            .append("memoText", getMemoText())
-            .append("IsNowPrice", getIsNowPrice())
-            .append("rmbPrice", getRmbPrice())
-            .append("taxFlag", getTaxFlag())
-            .append("comfirmFlag", getComfirmFlag())
-            .append("comfirmMan", getComfirmMan())
-            .append("comfirmDate", getComfirmDate())
-            .append("writeMan", getWriteMan())
-            .append("auditingFlag", getAuditingFlag())
-            .append("auditingMan", getAuditingMan())
-            .append("auditingDatetime", getAuditingDatetime())
-            .append("approveFlag", getApproveFlag())
-            .append("approveMan", getApproveMan())
-            .append("approveDate", getApproveDate())
-            .append("lastPrice", getLastPrice())
-            .append("lastCrlName", getLastCrlName())
-            .append("taxPercent", getTaxPercent())
-            .append("noTaxPrice", getNoTaxPrice())
-            .append("taxPrice", getTaxPrice())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/CustomerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/CustomerMapper.java
deleted file mode 100644
index 6ce3d37d..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/CustomerMapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.ruoyi.finance.mapper;
-
-import com.ruoyi.finance.domain.Customer;
-import com.ruoyi.finance.domain.productpriceCAA;
-
-import java.util.List;
-
-/**
- * 客户资料Mapper接口
- *
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface CustomerMapper {
-    /**
-     * 查询客户资料
-     *
-     * @param pCode 客户资料ID
-     * @return 客户资料
-     */
-    public Customer selectCustomerById(String pCode);
-
-    /**
-     * 查询客户资料列表
-     *
-     * @param customer 客户资料
-     * @return 客户资料集合
-     */
-    public List<Customer> selectCustomerList(Customer customer);
-
-    /**
-     * 新增客户资料
-     *
-     * @param customer 客户资料
-     * @return 结果
-     */
-    public int insertCustomer(Customer customer);
-
-    /**
-     * 修改客户资料
-     *
-     * @param customer 客户资料
-     * @return 结果
-     */
-    public int updateCustomer(Customer customer);
-
-
-    /**
-     * 删除客户资料
-     *
-     * @param pCode 客户资料ID
-     * @return 结果
-     */
-    public int deleteCustomerById(String pCode);
-
-    /**
-     * 批量删除客户资料
-     *
-     * @param pCodes 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteCustomerByIds(String[] pCodes);
-
-
-    /**
-     * 获取客户数
-     *
-     * @return 结果
-     */
-    public Integer selectNnm();
-
-    /**
-     * 确认客户资料
-     *
-     * @return 结果
-     */
-    public int customerComfirm(productpriceCAA caa);
-
-    public List<Customer> selectNameAndCode();
-}
-
-
-
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/ProductpriceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/ProductpriceMapper.java
deleted file mode 100644
index ac438eee..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/ProductpriceMapper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.ruoyi.finance.mapper;
-
-import com.ruoyi.finance.domain.Productprice;
-import com.ruoyi.finance.domain.productpriceCAA;
-
-import java.util.List;
-
-/**
- * 产品报价Mapper接口
- * 
- * @author ruoyi
- * @date 2021-11-01
- */
-public interface ProductpriceMapper 
-{
-    /**
-     * 查询产品报价
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    public Productprice selectProductpriceById(String SaleOrderID);
-
-    /**
-     * 查询产品报价的编号是否存在
-     *
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    public Integer selectProductpriceNnm(String SaleOrderID);
-
-    /**
-     * 查询产品报价列表
-     * 
-     * @param productprice 产品报价
-     * @return 产品报价集合
-     */
-    public List<Productprice> selectProductpriceList(Productprice productprice);
-
-    /**
-     * 新增产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    public int insertProductprice(Productprice productprice);
-
-    /**
-     * 修改产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    public int updateProductprice(Productprice productprice);
-
-    /**
-     * 产品报价确认
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCAA(productpriceCAA caa);
-
-    /**
-     * 产品报价确认
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCBB(productpriceCAA caa);
-
-    /**
-     * 产品报价确认
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCCC(productpriceCAA caa);
-
-
-
-
-    /**
-     * 删除产品报价
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 结果
-     */
-    public int deleteProductpriceById(String SaleOrderID);
-
-    /**
-     * 批量删除产品报价
-     * 
-     * @param SaleOrderIDs 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteProductpriceByIds(String[] SaleOrderIDs);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/ICustomerService.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/service/ICustomerService.java
deleted file mode 100644
index e6ffdabf..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/ICustomerService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.ruoyi.finance.service;
-
-import com.ruoyi.ck.utils.Result;
-import com.ruoyi.finance.domain.Customer;
-import com.ruoyi.finance.domain.productpriceCAA;
-
-import java.util.List;
-
-/**
- * 客户资料Service接口
- * 
- * @author ruoyi
- * @date 2021-11-16
- */
-public interface ICustomerService 
-{
-    /**
-     * 查询客户资料
-     * 
-     * @param pCode 客户资料ID
-     * @return 客户资料
-     */
-    public Customer selectCustomerById(String pCode);
-
-    /**
-     * 查询客户资料列表
-     * 
-     * @param customer 客户资料
-     * @return 客户资料集合
-     */
-    public List<Customer> selectCustomerList(Customer customer);
-
-    /**
-     * 新增客户资料
-     * 
-     * @param customer 客户资料
-     * @return 结果
-     */
-    public int insertCustomer(Customer customer);
-
-    /**
-     * 修改客户资料
-     * 
-     * @param customer 客户资料
-     * @return 结果
-     */
-    public int updateCustomer(Customer customer);
-
-    /**
-     * 批量删除客户资料
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteCustomerByIds(String ids);
-
-    /**
-     * 删除客户资料信息
-     * 
-     * @param pCode 客户资料ID
-     * @return 结果
-     */
-    public int deleteCustomerById(String pCode);
-
-    /**
-     * 获取客户资料记录数
-     *
-     * @return 结果
-     */
-    public Integer selectNum();
-
-
-    /**
-     * 删除客户资料信息
-     *
-     * @return 结果
-     */
-    public int customerComfirm(productpriceCAA caa);
-
-    public Result findNameAndCode()throws Exception;
-}
-
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/IProductpriceService.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/service/IProductpriceService.java
deleted file mode 100644
index 77901cf8..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/IProductpriceService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ruoyi.finance.service;
-
-import com.ruoyi.finance.domain.Productprice;
-import com.ruoyi.finance.domain.productpriceCAA;
-
-import java.util.List;
-
-/**
- * 产品报价Service接口
- * 
- * @author ruoyi
- * @date 2021-11-01
- */
-public interface IProductpriceService 
-{
-    /**
-     * 查询产品报价
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    public Productprice selectProductpriceById(String SaleOrderID);
-
-
-    /**
-     * 查询产品报价编号是否存在
-     *
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    public int selectProductpriceNnm(String SaleOrderID);
-
-    /**
-     * 查询产品报价列表
-     * 
-     * @param productprice 产品报价
-     * @return 产品报价集合
-     */
-    public List<Productprice> selectProductpriceList(Productprice productprice);
-
-    /**
-     * 新增产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    public int insertProductprice(Productprice productprice);
-
-    /**
-     * 修改产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    public int updateProductprice(Productprice productprice);
-
-    /**
-     * 确认产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCAA(productpriceCAA caa);
-
-    /**
-     * 审核产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCBB(productpriceCAA caa);
-
-    /**
-     * 核准产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    public int updateCCC(productpriceCAA caa);
-
-
-    /**
-     * 批量删除产品报价
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteProductpriceByIds(String ids);
-
-    /**
-     * 删除产品报价信息
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 结果
-     */
-    public int deleteProductpriceById(String SaleOrderID);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/CustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/CustomerServiceImpl.java
deleted file mode 100644
index 1fd408d0..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/CustomerServiceImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.ruoyi.finance.service.impl;
-
-import com.ruoyi.ck.utils.Result;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.finance.domain.Customer;
-import com.ruoyi.finance.domain.productpriceCAA;
-import com.ruoyi.finance.mapper.CustomerMapper;
-import com.ruoyi.finance.service.ICustomerService;
-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 CustomerServiceImpl implements ICustomerService 
-{
-    @Autowired
-    private CustomerMapper customerMapper;
-
-    /**
-     * 查询客户资料
-     * 
-     * @param pCode 客户资料ID
-     * @return 客户资料
-     */
-    @Override
-    public Customer selectCustomerById(String pCode)
-    {
-        return customerMapper.selectCustomerById(pCode);
-    }
-
-    /**
-     * 查询客户资料列表
-     * 
-     * @param customer 客户资料
-     * @return 客户资料
-     */
-    @Override
-    public List<Customer> selectCustomerList(Customer customer)
-    {
-        return customerMapper.selectCustomerList(customer);
-    }
-
-    /**
-     * 新增客户资料
-     * 
-     * @param customer 客户资料
-     * @return 结果
-     */
-    @Override
-    public int insertCustomer(Customer customer)
-    {
-        return customerMapper.insertCustomer(customer);
-    }
-
-    /**
-     * 修改客户资料
-     * 
-     * @param customer 客户资料
-     * @return 结果
-     */
-    @Override
-    public int updateCustomer(Customer customer)
-    {
-        return customerMapper.updateCustomer(customer);
-    }
-
-    /**
-     * 删除客户资料对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerByIds(String ids)
-    {
-        return customerMapper.deleteCustomerByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除客户资料信息
-     * 
-     * @param pCode 客户资料ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerById(String pCode)
-    {
-        return customerMapper.deleteCustomerById(pCode);
-    }
-
-    /**
-     * 获取客户资料记录数
-
-     * @return 结果
-     */
-    @Override
-    public Integer selectNum()
-    {
-        return customerMapper.selectNnm();
-    }
-    /**
-     * 确认客户资料
-
-     * @return 结果
-     */
-    @Override
-    public int customerComfirm(productpriceCAA caa)
-    {
-        System.out.print("***************"+caa+"***************");
-        return customerMapper.customerComfirm(caa);
-    }
-
-    @Override
-    public Result findNameAndCode() throws Exception {
-        List<Customer> customers = customerMapper.selectNameAndCode();
-        //System.out.println(customers);
-        return Result.getSuccessResult(customers);
-    }
-
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/ProductpriceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/ProductpriceServiceImpl.java
deleted file mode 100644
index 42363afb..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/ProductpriceServiceImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.ruoyi.finance.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.finance.domain.Productprice;
-import com.ruoyi.finance.domain.productpriceCAA;
-import com.ruoyi.finance.mapper.ProductpriceMapper;
-import com.ruoyi.finance.service.IProductpriceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 产品报价Service业务层处理
- * 
- * @author ruoyi
- * @date 2021-11-01
- */
-@Service
-public class ProductpriceServiceImpl implements IProductpriceService 
-{
-    @Autowired
-    private ProductpriceMapper productpriceMapper;
-
-    /**
-     * 查询产品报价
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    @Override
-    public Productprice selectProductpriceById(String SaleOrderID)
-    {
-        return productpriceMapper.selectProductpriceById(SaleOrderID);
-    }
-
-    /**
-     *  查询产品报价编号是否存在
-     *
-     * @param SaleOrderID 产品报价ID
-     * @return 产品报价
-     */
-    @Override
-    public int selectProductpriceNnm(String SaleOrderID)
-    {
-
-        Integer exist = productpriceMapper.selectProductpriceNnm(SaleOrderID);
-        if ( exist != null ) {
-            return exist;
-        } else {
-            exist = 0;
-        }
-        return exist;
-    }
-
-    /**
-     * 查询产品报价列表
-     * 
-     * @param productprice 产品报价
-     * @return 产品报价
-     */
-    @Override
-    public List<Productprice> selectProductpriceList(Productprice productprice)
-    {
-        return productpriceMapper.selectProductpriceList(productprice);
-    }
-
-    /**
-     * 新增产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    @Override
-    public int insertProductprice(Productprice productprice)
-    {
-        return productpriceMapper.insertProductprice(productprice);
-    }
-
-    /**
-     * 修改产品报价
-     * 
-     * @param productprice 产品报价
-     * @return 结果
-     */
-    @Override
-    public int updateProductprice(Productprice productprice)
-    {
-//        System.out.print(productprice);
-        return productpriceMapper.updateProductprice(productprice);
-    }
-
-    /**
-     * 确认产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    @Override
-    public int updateCAA(productpriceCAA caa)
-    {
-        System.out.print(caa);
-        return productpriceMapper.updateCAA(caa);
-    }
-
-    /**
-     * 审核产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    @Override
-    public int updateCBB(productpriceCAA caa)
-    {
-        System.out.print(caa);
-        return productpriceMapper.updateCBB(caa);
-    }
-
-    /**
-     * 核准产品报价
-     *
-     * @param caa 产品报价
-     * @return 结果
-     */
-    @Override
-    public int updateCCC(productpriceCAA caa)
-    {
-        System.out.print(caa);
-        return productpriceMapper.updateCCC(caa);
-    }
-
-    /**
-     * 删除产品报价对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteProductpriceByIds(String ids)
-    {
-        return productpriceMapper.deleteProductpriceByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除产品报价信息
-     * 
-     * @param SaleOrderID 产品报价ID
-     * @return 结果
-     */
-    @Override
-    public int deleteProductpriceById(String SaleOrderID)
-    {
-        return productpriceMapper.deleteProductpriceById(SaleOrderID);
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/StockAdjustController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/StockAdjustController.java
deleted file mode 100644
index 648b9edf..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/StockAdjustController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.ruoyi.stock.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.stock.domain.StockAdjust;
-import com.ruoyi.stock.service.IStockAdjustService;
-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-12-21
- */
-@Controller
-@RequestMapping("/stock/stockAdjust")
-public class StockAdjustController extends BaseController
-{
-    private String prefix = "stock/stockAdjust";
-
-    @Autowired
-    private IStockAdjustService stockAdjustService;
-
-    @RequiresPermissions("stock:stockAdjust:view")
-    @GetMapping()
-    public String stockAdjust()
-    {
-        return prefix + "/stockAdjust";
-    }
-
-    /**
-     * 查询库存调整列表
-     */
-    @RequiresPermissions("stock:stockAdjust:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(StockAdjust stockAdjust)
-    {
-        startPage();
-        List<StockAdjust> list = stockAdjustService.selectStockAdjustList(stockAdjust);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出库存调整列表
-     */
-    @RequiresPermissions("stock:stockAdjust:export")
-    @Log(title = "库存调整", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(StockAdjust stockAdjust)
-    {
-        List<StockAdjust> list = stockAdjustService.selectStockAdjustList(stockAdjust);
-        ExcelUtil<StockAdjust> util = new ExcelUtil<StockAdjust>(StockAdjust.class);
-        return util.exportExcel(list, "库存调整数据");
-    }
-
-    /**
-     * 新增库存调整
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存库存调整
-     */
-    @RequiresPermissions("stock:stockAdjust:add")
-    @Log(title = "库存调整", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(StockAdjust stockAdjust)
-    {
-        return toAjax(stockAdjustService.insertStockAdjust(stockAdjust));
-    }
-
-    /**
-     * 修改库存调整
-     */
-    @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Long id, ModelMap mmap)
-    {
-        StockAdjust stockAdjust = stockAdjustService.selectStockAdjustById(id);
-        mmap.put("stockAdjust", stockAdjust);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存库存调整
-     */
-    @RequiresPermissions("stock:stockAdjust:edit")
-    @Log(title = "库存调整", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(StockAdjust stockAdjust)
-    {
-        return toAjax(stockAdjustService.updateStockAdjust(stockAdjust));
-    }
-
-    /**
-     * 删除库存调整
-     */
-    @RequiresPermissions("stock:stockAdjust:remove")
-    @Log(title = "库存调整", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(stockAdjustService.deleteStockAdjustByIds(ids));
-    }
-
-    @ResponseBody
-    @PostMapping("/inventory")
-    public Result updateInventory(StockAdjust stockAdjust)throws Exception{
-        return Result.getSuccessResult(stockAdjustService.updateInventory(stockAdjust));
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockAdjust.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockAdjust.java
deleted file mode 100644
index 867cd40a..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockAdjust.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.ruoyi.stock.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-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.util.Date;
-
-/**
- * 库存调整对象 stock_adjust
- * 
- * @author ruoyi
- * @date 2021-12-21
- */
-public class StockAdjust extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    @Excel(name = "编号")
-    private Long id;
-
-    /** 登记日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date registerDate;
-
-    /** 物料类别 */
-    @Excel(name = "物料类别")
-    private String itemType;
-
-    /** 仓库号 */
-    @Excel(name = "仓库号")
-    private String stockNo;
-
-    /** 仓库名称 */
-    @Excel(name = "仓库名称")
-    private String stockName;
-
-    /** 物料代码 */
-    @Excel(name = "物料代码")
-    private String itemCode;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String itemName;
-
-    /** 机种 */
-    @Excel(name = "机种")
-    private String machineType;
-
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String itemSpecification;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
-
-    /** 客户号 */
-    @Excel(name = "客户号")
-    private String customerNo;
-
-    /** 客户名称 */
-    @Excel(name = "客户名称")
-    private String customerName;
-
-    /** 批号 */
-    @Excel(name = "批号")
-    private String batchNumber;
-
-    /** 调整数量 */
-    @Excel(name = "调整数量")
-    private Long adjustQty;
-
-    /** 调整卷/PCS量 */
-    @Excel(name = "调整卷/PCS量")
-    private Long adjustReel;
-
-    /**  */
-    @Excel(name = "")
-    private String spare1;
-
-    /**  */
-    @Excel(name = "")
-    private String spare2;
-
-    /**  */
-    @Excel(name = "")
-    private String spare3;
-
-    /**  */
-    @Excel(name = "")
-    private String spare4;
-
-    /**  */
-    @Excel(name = "")
-    private String spare5;
-
-    /**  */
-    @Excel(name = "")
-    private String spare6;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setRegisterDate(Date registerDate) 
-    {
-        this.registerDate = registerDate;
-    }
-
-    public Date getRegisterDate() 
-    {
-        return registerDate;
-    }
-    public void setItemType(String itemType) 
-    {
-        this.itemType = itemType;
-    }
-
-    public String getItemType() 
-    {
-        return itemType;
-    }
-    public void setStockNo(String stockNo) 
-    {
-        this.stockNo = stockNo;
-    }
-
-    public String getStockNo() 
-    {
-        return stockNo;
-    }
-    public void setStockName(String stockName) 
-    {
-        this.stockName = stockName;
-    }
-
-    public String getStockName() 
-    {
-        return stockName;
-    }
-    public void setItemCode(String itemCode) 
-    {
-        this.itemCode = itemCode;
-    }
-
-    public String getItemCode() 
-    {
-        return itemCode;
-    }
-    public void setItemName(String itemName) 
-    {
-        this.itemName = itemName;
-    }
-
-    public String getItemName() 
-    {
-        return itemName;
-    }
-    public void setMachineType(String machineType) 
-    {
-        this.machineType = machineType;
-    }
-
-    public String getMachineType() 
-    {
-        return machineType;
-    }
-    public void setItemSpecification(String itemSpecification) 
-    {
-        this.itemSpecification = itemSpecification;
-    }
-
-    public String getItemSpecification() 
-    {
-        return itemSpecification;
-    }
-    public void setUnit(String unit) 
-    {
-        this.unit = unit;
-    }
-
-    public String getUnit() 
-    {
-        return unit;
-    }
-    public void setCustomerNo(String customerNo) 
-    {
-        this.customerNo = customerNo;
-    }
-
-    public String getCustomerNo() 
-    {
-        return customerNo;
-    }
-    public void setCustomerName(String customerName) 
-    {
-        this.customerName = customerName;
-    }
-
-    public String getCustomerName() 
-    {
-        return customerName;
-    }
-    public void setBatchNumber(String batchNumber) 
-    {
-        this.batchNumber = batchNumber;
-    }
-
-    public String getBatchNumber() 
-    {
-        return batchNumber;
-    }
-    public void setAdjustQty(Long adjustQty) 
-    {
-        this.adjustQty = adjustQty;
-    }
-
-    public Long getAdjustQty() 
-    {
-        return adjustQty;
-    }
-    public void setAdjustReel(Long adjustReel) 
-    {
-        this.adjustReel = adjustReel;
-    }
-
-    public Long getAdjustReel() 
-    {
-        return adjustReel;
-    }
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1() 
-    {
-        return spare1;
-    }
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2() 
-    {
-        return spare2;
-    }
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3() 
-    {
-        return spare3;
-    }
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4() 
-    {
-        return spare4;
-    }
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5() 
-    {
-        return spare5;
-    }
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6() 
-    {
-        return spare6;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("registerDate", getRegisterDate())
-            .append("itemType", getItemType())
-            .append("stockNo", getStockNo())
-            .append("stockName", getStockName())
-            .append("itemCode", getItemCode())
-            .append("itemName", getItemName())
-            .append("machineType", getMachineType())
-            .append("itemSpecification", getItemSpecification())
-            .append("unit", getUnit())
-            .append("customerNo", getCustomerNo())
-            .append("customerName", getCustomerName())
-            .append("batchNumber", getBatchNumber())
-            .append("adjustQty", getAdjustQty())
-            .append("adjustReel", getAdjustReel())
-            .append("remark", getRemark())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/StockAdjustMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/StockAdjustMapper.java
deleted file mode 100644
index f8cd84cd..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/StockAdjustMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.stock.mapper;
-
-import com.ruoyi.stock.domain.StockAdjust;
-
-import java.util.List;
-
-/**
- * 库存调整Mapper接口
- * 
- * @author ruoyi
- * @date 2021-12-21
- */
-public interface StockAdjustMapper 
-{
-    /**
-     * 查询库存调整
-     * 
-     * @param id 库存调整ID
-     * @return 库存调整
-     */
-    public StockAdjust selectStockAdjustById(Long id);
-
-    /**
-     * 查询库存调整列表
-     * 
-     * @param stockAdjust 库存调整
-     * @return 库存调整集合
-     */
-    public List<StockAdjust> selectStockAdjustList(StockAdjust stockAdjust);
-
-    /**
-     * 新增库存调整
-     * 
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    public int insertStockAdjust(StockAdjust stockAdjust);
-
-    /**
-     * 修改库存调整
-     * 
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    public int updateStockAdjust(StockAdjust stockAdjust);
-
-    /**
-     * 删除库存调整
-     * 
-     * @param id 库存调整ID
-     * @return 结果
-     */
-    public int deleteStockAdjustById(Long id);
-
-    /**
-     * 批量删除库存调整
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteStockAdjustByIds(String[] ids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IStockAdjustService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IStockAdjustService.java
deleted file mode 100644
index 2bc27612..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IStockAdjustService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ruoyi.stock.service;
-
-import com.ruoyi.stock.domain.StockAdjust;
-
-import java.util.List;
-
-/**
- * 库存调整Service接口
- * 
- * @author ruoyi
- * @date 2021-12-21
- */
-public interface IStockAdjustService 
-{
-    /**
-     * 查询库存调整
-     * 
-     * @param id 库存调整ID
-     * @return 库存调整
-     */
-    public StockAdjust selectStockAdjustById(Long id);
-
-    /**
-     * 查询库存调整列表
-     * 
-     * @param stockAdjust 库存调整
-     * @return 库存调整集合
-     */
-    public List<StockAdjust> selectStockAdjustList(StockAdjust stockAdjust);
-
-    /**
-     * 新增库存调整
-     * 
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    public int insertStockAdjust(StockAdjust stockAdjust);
-
-    /**
-     * 修改库存调整
-     * 
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    public int updateStockAdjust(StockAdjust stockAdjust);
-
-    /**
-     * 批量删除库存调整
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteStockAdjustByIds(String ids);
-
-    /**
-     * 删除库存调整信息
-     * 
-     * @param id 库存调整ID
-     * @return 结果
-     */
-    public int deleteStockAdjustById(Long id);
-
-    public int updateInventory(StockAdjust stockAdjust);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java
deleted file mode 100644
index 7cef0532..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.ruoyi.stock.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.finance.domain.Customer;
-import com.ruoyi.finance.mapper.CustomerMapper;
-import com.ruoyi.stock.domain.StockAdjust;
-import com.ruoyi.stock.domain.StockInfo;
-import com.ruoyi.stock.domain.Warehouse;
-import com.ruoyi.stock.mapper.StockAdjustMapper;
-import com.ruoyi.stock.mapper.StockInfoMapper;
-import com.ruoyi.stock.mapper.WarehouseMapper;
-import com.ruoyi.stock.service.IStockAdjustService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 库存调整Service业务层处理
- *
- * @author ruoyi
- * @date 2021-12-21
- */
-@Service
-public class StockAdjustServiceImpl implements IStockAdjustService {
-    @Autowired
-    private StockAdjustMapper stockAdjustMapper;
-
-    @Autowired
-    private StockInfoMapper stockInfoMapper;
-
-    @Autowired
-    private CustomerMapper customerMapper;
-
-    @Autowired
-    private WarehouseMapper warehouseMapper;
-
-    /**
-     * 查询库存调整
-     *
-     * @param id 库存调整ID
-     * @return 库存调整
-     */
-    @Override
-    public StockAdjust selectStockAdjustById(Long id) {
-        return stockAdjustMapper.selectStockAdjustById(id);
-    }
-
-    /**
-     * 查询库存调整列表
-     *
-     * @param stockAdjust 库存调整
-     * @return 库存调整
-     */
-    @Override
-    public List<StockAdjust> selectStockAdjustList(StockAdjust stockAdjust) {
-        return stockAdjustMapper.selectStockAdjustList(stockAdjust);
-    }
-
-    /**
-     * 新增库存调整
-     *
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    @Override
-    public int insertStockAdjust(StockAdjust stockAdjust) {
-        //获取仓库号
-        StockInfo stockInfo = new StockInfo();
-        stockInfo.setStockName(stockAdjust.getStockName());
-        stockInfo = stockInfoMapper.selectStockInfoList(stockInfo).get(0);
-        stockAdjust.setStockNo(stockInfo.getStockNO());
-
-        //获取客户号
-        Customer customer = new Customer();
-        customer.setpName(stockAdjust.getCustomerName());
-        customer = customerMapper.selectCustomerList(customer).get(0);
-        stockAdjust.setCustomerNo(customer.getpCode());
-
-        stockAdjust.setRegisterDate(new Date());
-        return stockAdjustMapper.insertStockAdjust(stockAdjust);
-    }
-
-    /**
-     * 修改库存调整
-     *
-     * @param stockAdjust 库存调整
-     * @return 结果
-     */
-    @Override
-    public int updateStockAdjust(StockAdjust stockAdjust) {
-        return stockAdjustMapper.updateStockAdjust(stockAdjust);
-    }
-
-    /**
-     * 删除库存调整对象
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteStockAdjustByIds(String ids) {
-        return stockAdjustMapper.deleteStockAdjustByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除库存调整信息
-     *
-     * @param id 库存调整ID
-     * @return 结果
-     */
-    @Override
-    public int deleteStockAdjustById(Long id) {
-        return stockAdjustMapper.deleteStockAdjustById(id);
-    }
-
-    @Override
-    public int updateInventory(StockAdjust stockAdjust) {
-        Warehouse warehouse = new Warehouse();
-        warehouse.setWlCode(stockAdjust.getItemCode());
-        warehouse = warehouseMapper.selectByCode(warehouse);
-        if (warehouse != null) {
-            stockAdjust.setSpare1(warehouse.getQty() + "");
-        } else {
-            stockAdjust.setSpare1("0");
-        }
-        return stockAdjustMapper.updateStockAdjust(stockAdjust);
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/finance/CustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/finance/CustomerMapper.xml
deleted file mode 100644
index 2f0558ae..00000000
--- a/ruoyi-admin/src/main/resources/mapper/finance/CustomerMapper.xml
+++ /dev/null
@@ -1,335 +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.finance.mapper.CustomerMapper">
-    
-    <resultMap type="Customer" id="CustomerResult">
-        <result property="pCode"    column="P_Code"    />
-        <result property="pName"    column="P_Name"    />
-        <result property="pEnName"    column="P_EN_NAME"    />
-        <result property="pAddress"    column="P_Address"    />
-        <result property="pPost"    column="P_Post"    />
-        <result property="pCountry"    column="P_Country"    />
-        <result property="pCeo"    column="P_CEO"    />
-        <result property="pLinkman"    column="P_LinkMan"    />
-        <result property="pTel"    column="P_TEL"    />
-        <result property="pFax"    column="P_FAX"    />
-        <result property="pEmail"    column="P_EMAIL"    />
-        <result property="pHttp"    column="P_HTTP"    />
-        <result property="pCiqCode"    column="P_CIQ_CODE"    />
-        <result property="pComCode"    column="P_COM_CODE"    />
-        <result property="pHyCode"    column="P_HY_CODE"    />
-        <result property="pType"    column="P_TYPE"    />
-        <result property="pCreatDate"    column="P_Creat_Date"    />
-        <result property="pJhbank"    column="P_JHbank"    />
-        <result property="pJhbankCode"    column="P_JHbank_code"    />
-        <result property="pBank"    column="P_bank"    />
-        <result property="pBankCode"    column="P_bank_code"    />
-        <result property="pRmbMoney"    column="P_RMB_MONEY"    />
-        <result property="pWbType"    column="P_WB_TYPE"    />
-        <result property="pWbMoney"    column="P_WB_MONEY"    />
-        <result property="memoText"    column="memo_text"    />
-        <result property="moral"    column="moral"    />
-        <result property="comfirmFlag"    column="comfirm_flag"    />
-        <result property="comfirmMan"    column="comfirm_man"    />
-        <result property="comfirmDate"    column="comfirm_DATE"    />
-        <result property="writeMan"    column="write_man"    />
-        <result property="auditingFlag"    column="Auditing_Flag"    />
-        <result property="auditingMan"    column="Auditing_man"    />
-        <result property="auditingDate"    column="Auditing_Date"    />
-        <result property="approveFlag"    column="Approve_flag"    />
-        <result property="approveMan"    column="Approve_man"    />
-        <result property="approveDate"    column="Approve_date"    />
-        <result property="writeDate"    column="write_date"    />
-        <result property="memotext"    column="memotext"    />
-        <result property="creditAmt"    column="Credit_Amt"    />
-        <result property="PID"    column="PID"    />
-        <result property="NWX"    column="NWX"    />
-        <result property="ordernoLen"    column="OrderNO_Len"    />
-        <result property="sendcpReportname"    column="SendCP_ReportName"    />
-        <result property="saler"    column="saler"    />
-        <result property="dWaterNo"    column="d_water_no"    />
-        <result property="sWaterName"    column="S_Water_Name"    />
-        <result property="sWaterNo"    column="S_Water_NO"    />
-        <result property="comCode"    column="Com_Code"    />
-        <result property="crlName"    column="Crl_Name"    />
-        <result property="pCountryCode"    column="P_Country_Code"    />
-        <result property="CID"    column="CID"    />
-        <result property="senduseConfirm"    column="SendUse_Confirm"    />
-        <result property="taxPercent"    column="TAX_Percent"    />
-        <result property="senddw"    column="senddw"    />
-        <result property="taxFlag"    column="tax_flag"    />
-    </resultMap>
-
-    <sql id="selectCustomerVo">
-        select P_Code, P_Name, P_EN_NAME, P_Address, P_Post, P_Country, P_CEO, P_LinkMan, P_TEL, P_FAX, P_EMAIL, P_HTTP, P_CIQ_CODE, P_COM_CODE, P_HY_CODE, P_TYPE, P_Creat_Date, P_JHbank, P_JHbank_code, P_bank, P_bank_code, P_RMB_MONEY, P_WB_TYPE, P_WB_MONEY, memo_text, moral, comfirm_flag, comfirm_man, comfirm_DATE, write_man, Auditing_Flag, Auditing_man, Auditing_Date, Approve_flag, Approve_man, Approve_date, write_date, memotext, Credit_Amt, PID, NWX, OrderNO_Len, SendCP_ReportName, saler, d_water_no, S_Water_Name, S_Water_NO, Com_Code, Crl_Name, P_Country_Code, CID, SendUse_Confirm, TAX_Percent, senddw, tax_flag from customer
-    </sql>
-
-    <select id="selectCustomerList" parameterType="Customer" resultMap="CustomerResult">
-        <include refid="selectCustomerVo"/>
-        <where>  
-            <if test="pCode != null  and pCode != ''"> and P_Code = #{pCode}</if>
-            <if test="pName != null  and pName != ''"> and P_Name like concat('%', #{pName}, '%')</if>
-            <if test="pEnName != null  and pEnName != ''"> and P_EN_NAME like concat('%', #{pEnName}, '%')</if>
-            <if test="pAddress != null  and pAddress != ''"> and P_Address = #{pAddress}</if>
-            <if test="pPost != null  and pPost != ''"> and P_Post = #{pPost}</if>
-            <if test="pCountry != null  and pCountry != ''"> and P_Country = #{pCountry}</if>
-            <if test="pCeo != null  and pCeo != ''"> and P_CEO = #{pCeo}</if>
-            <if test="pLinkman != null  and pLinkman != ''"> and P_LinkMan = #{pLinkman}</if>
-            <if test="pTel != null  and pTel != ''"> and P_TEL = #{pTel}</if>
-            <if test="pFax != null  and pFax != ''"> and P_FAX = #{pFax}</if>
-            <if test="pEmail != null  and pEmail != ''"> and P_EMAIL = #{pEmail}</if>
-            <if test="pHttp != null  and pHttp != ''"> and P_HTTP = #{pHttp}</if>
-            <if test="pCiqCode != null  and pCiqCode != ''"> and P_CIQ_CODE = #{pCiqCode}</if>
-            <if test="pComCode != null  and pComCode != ''"> and P_COM_CODE = #{pComCode}</if>
-            <if test="pHyCode != null  and pHyCode != ''"> and P_HY_CODE = #{pHyCode}</if>
-            <if test="pType != null  and pType != ''"> and P_TYPE = #{pType}</if>
-            <if test="pCreatDate != null "> and P_Creat_Date = #{pCreatDate}</if>
-            <if test="pJhbank != null  and pJhbank != ''"> and P_JHbank = #{pJhbank}</if>
-            <if test="pJhbankCode != null  and pJhbankCode != ''"> and P_JHbank_code = #{pJhbankCode}</if>
-            <if test="pBank != null  and pBank != ''"> and P_bank = #{pBank}</if>
-            <if test="pBankCode != null  and pBankCode != ''"> and P_bank_code = #{pBankCode}</if>
-            <if test="pRmbMoney != null "> and P_RMB_MONEY = #{pRmbMoney}</if>
-            <if test="pWbType != null  and pWbType != ''"> and P_WB_TYPE = #{pWbType}</if>
-            <if test="pWbMoney != null "> and P_WB_MONEY = #{pWbMoney}</if>
-            <if test="memoText != null  and memoText != ''"> and memo_text = #{memoText}</if>
-            <if test="moral != null  and moral != ''"> and moral = #{moral}</if>
-            <if test="comfirmFlag != null "> and comfirm_flag = #{comfirmFlag}</if>
-            <if test="comfirmMan != null  and comfirmMan != ''"> and comfirm_man = #{comfirmMan}</if>
-            <if test="comfirmDate != null "> and comfirm_DATE = #{comfirmDate}</if>
-            <if test="writeMan != null  and writeMan != ''"> and write_man = #{writeMan}</if>
-            <if test="auditingFlag != null "> and Auditing_Flag = #{auditingFlag}</if>
-            <if test="auditingMan != null  and auditingMan != ''"> and Auditing_man = #{auditingMan}</if>
-            <if test="auditingDate != null "> and Auditing_Date = #{auditingDate}</if>
-            <if test="approveFlag != null "> and Approve_flag = #{approveFlag}</if>
-            <if test="approveMan != null  and approveMan != ''"> and Approve_man = #{approveMan}</if>
-            <if test="approveDate != null "> and Approve_date = #{approveDate}</if>
-            <if test="writeDate != null "> and write_date = #{writeDate}</if>
-            <if test="memotext != null  and memotext != ''"> and memotext = #{memotext}</if>
-            <if test="creditAmt != null "> and Credit_Amt = #{creditAmt}</if>
-            <if test="PID != null  and PID != ''"> and PID = #{PID}</if>
-            <if test="NWX != null  and NWX != ''"> and NWX = #{NWX}</if>
-            <if test="ordernoLen != null "> and OrderNO_Len = #{ordernoLen}</if>
-            <if test="sendcpReportname != null  and sendcpReportname != ''"> and SendCP_ReportName like concat('%', #{sendcpReportname}, '%')</if>
-            <if test="saler != null  and saler != ''"> and saler = #{saler}</if>
-            <if test="dWaterNo != null  and dWaterNo != ''"> and d_water_no = #{dWaterNo}</if>
-            <if test="sWaterName != null  and sWaterName != ''"> and S_Water_Name like concat('%', #{sWaterName}, '%')</if>
-            <if test="sWaterNo != null  and sWaterNo != ''"> and S_Water_NO = #{sWaterNo}</if>
-            <if test="comCode != null  and comCode != ''"> and Com_Code = #{comCode}</if>
-            <if test="crlName != null  and crlName != ''"> and Crl_Name like concat('%', #{crlName}, '%')</if>
-            <if test="pCountryCode != null  and pCountryCode != ''"> and P_Country_Code = #{pCountryCode}</if>
-            <if test="CID != null  and CID != ''"> and CID = #{CID}</if>
-            <if test="senduseConfirm != null  and senduseConfirm != ''"> and SendUse_Confirm = #{senduseConfirm}</if>
-            <if test="taxPercent != null "> and TAX_Percent = #{taxPercent}</if>
-            <if test="senddw != null  and senddw != ''"> and senddw = #{senddw}</if>
-            <if test="taxFlag != null "> and tax_flag = #{taxFlag}</if>
-        </where>
-    </select>
-    
-    <select id="selectCustomerById" parameterType="String" resultMap="CustomerResult">
-        <include refid="selectCustomerVo"/>
-        where P_Code = #{pCode}
-    </select>
-    
-    <select id="selectNnm"  resultType="java.lang.Integer" >
-        select count(*) num from customer
-    </select>
-        
-    <insert id="insertCustomer" parameterType="Customer">
-        insert into customer
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="pCode != null and pCode != ''">P_Code,</if>
-            <if test="pName != null and pName != ''">P_Name,</if>
-            <if test="pEnName != null">P_EN_NAME,</if>
-            <if test="pAddress != null">P_Address,</if>
-            <if test="pPost != null">P_Post,</if>
-            <if test="pCountry != null">P_Country,</if>
-            <if test="pCeo != null">P_CEO,</if>
-            <if test="pLinkman != null">P_LinkMan,</if>
-            <if test="pTel != null">P_TEL,</if>
-            <if test="pFax != null">P_FAX,</if>
-            <if test="pEmail != null">P_EMAIL,</if>
-            <if test="pHttp != null">P_HTTP,</if>
-            <if test="pCiqCode != null">P_CIQ_CODE,</if>
-            <if test="pComCode != null">P_COM_CODE,</if>
-            <if test="pHyCode != null">P_HY_CODE,</if>
-            <if test="pType != null">P_TYPE,</if>
-            <if test="pCreatDate != null">P_Creat_Date,</if>
-            <if test="pJhbank != null">P_JHbank,</if>
-            <if test="pJhbankCode != null">P_JHbank_code,</if>
-            <if test="pBank != null">P_bank,</if>
-            <if test="pBankCode != null">P_bank_code,</if>
-            <if test="pRmbMoney != null">P_RMB_MONEY,</if>
-            <if test="pWbType != null">P_WB_TYPE,</if>
-            <if test="pWbMoney != null">P_WB_MONEY,</if>
-            <if test="memoText != null">memo_text,</if>
-            <if test="moral != null">moral,</if>
-            <if test="comfirmFlag != null">comfirm_flag,</if>
-            <if test="comfirmMan != null">comfirm_man,</if>
-            <if test="comfirmDate != null">comfirm_DATE,</if>
-            <if test="writeMan != null">write_man,</if>
-            <if test="auditingFlag != null">Auditing_Flag,</if>
-            <if test="auditingMan != null">Auditing_man,</if>
-            <if test="auditingDate != null">Auditing_Date,</if>
-            <if test="approveFlag != null">Approve_flag,</if>
-            <if test="approveMan != null">Approve_man,</if>
-            <if test="approveDate != null">Approve_date,</if>
-            <if test="writeDate != null">write_date,</if>
-            <if test="memotext != null">memotext,</if>
-            <if test="creditAmt != null">Credit_Amt,</if>
-            <if test="PID != null">PID,</if>
-            <if test="NWX != null">NWX,</if>
-            <if test="ordernoLen != null">OrderNO_Len,</if>
-            <if test="sendcpReportname != null">SendCP_ReportName,</if>
-            <if test="saler != null">saler,</if>
-            <if test="dWaterNo != null">d_water_no,</if>
-            <if test="sWaterName != null">S_Water_Name,</if>
-            <if test="sWaterNo != null">S_Water_NO,</if>
-            <if test="comCode != null">Com_Code,</if>
-            <if test="crlName != null">Crl_Name,</if>
-            <if test="pCountryCode != null">P_Country_Code,</if>
-            <if test="CID != null">CID,</if>
-            <if test="senduseConfirm != null">SendUse_Confirm,</if>
-            <if test="taxPercent != null">TAX_Percent,</if>
-            <if test="senddw != null">senddw,</if>
-            <if test="taxFlag != null">tax_flag,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="pCode != null and pCode != ''">#{pCode},</if>
-            <if test="pName != null and pName != ''">#{pName},</if>
-            <if test="pEnName != null">#{pEnName},</if>
-            <if test="pAddress != null">#{pAddress},</if>
-            <if test="pPost != null">#{pPost},</if>
-            <if test="pCountry != null">#{pCountry},</if>
-            <if test="pCeo != null">#{pCeo},</if>
-            <if test="pLinkman != null">#{pLinkman},</if>
-            <if test="pTel != null">#{pTel},</if>
-            <if test="pFax != null">#{pFax},</if>
-            <if test="pEmail != null">#{pEmail},</if>
-            <if test="pHttp != null">#{pHttp},</if>
-            <if test="pCiqCode != null">#{pCiqCode},</if>
-            <if test="pComCode != null">#{pComCode},</if>
-            <if test="pHyCode != null">#{pHyCode},</if>
-            <if test="pType != null">#{pType},</if>
-            <if test="pCreatDate != null">#{pCreatDate},</if>
-            <if test="pJhbank != null">#{pJhbank},</if>
-            <if test="pJhbankCode != null">#{pJhbankCode},</if>
-            <if test="pBank != null">#{pBank},</if>
-            <if test="pBankCode != null">#{pBankCode},</if>
-            <if test="pRmbMoney != null">#{pRmbMoney},</if>
-            <if test="pWbType != null">#{pWbType},</if>
-            <if test="pWbMoney != null">#{pWbMoney},</if>
-            <if test="memoText != null">#{memoText},</if>
-            <if test="moral != null">#{moral},</if>
-            <if test="comfirmFlag != null">#{comfirmFlag},</if>
-            <if test="comfirmMan != null">#{comfirmMan},</if>
-            <if test="comfirmDate != null">#{comfirmDate},</if>
-            <if test="writeMan != null">#{writeMan},</if>
-            <if test="auditingFlag != null">#{auditingFlag},</if>
-            <if test="auditingMan != null">#{auditingMan},</if>
-            <if test="auditingDate != null">#{auditingDate},</if>
-            <if test="approveFlag != null">#{approveFlag},</if>
-            <if test="approveMan != null">#{approveMan},</if>
-            <if test="approveDate != null">#{approveDate},</if>
-            <if test="writeDate != null">#{writeDate},</if>
-            <if test="memotext != null">#{memotext},</if>
-            <if test="creditAmt != null">#{creditAmt},</if>
-            <if test="PID != null">#{PID},</if>
-            <if test="NWX != null">#{NWX},</if>
-            <if test="ordernoLen != null">#{ordernoLen},</if>
-            <if test="sendcpReportname != null">#{sendcpReportname},</if>
-            <if test="saler != null">#{saler},</if>
-            <if test="dWaterNo != null">#{dWaterNo},</if>
-            <if test="sWaterName != null">#{sWaterName},</if>
-            <if test="sWaterNo != null">#{sWaterNo},</if>
-            <if test="comCode != null">#{comCode},</if>
-            <if test="crlName != null">#{crlName},</if>
-            <if test="pCountryCode != null">#{pCountryCode},</if>
-            <if test="CID != null">#{CID},</if>
-            <if test="senduseConfirm != null">#{senduseConfirm},</if>
-            <if test="taxPercent != null">#{taxPercent},</if>
-            <if test="senddw != null">#{senddw},</if>
-            <if test="taxFlag != null">#{taxFlag},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCustomer" parameterType="Customer">
-        update customer
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="pName != null and pName != ''">P_Name = #{pName},</if>
-            <if test="pEnName != null">P_EN_NAME = #{pEnName},</if>
-            <if test="pAddress != null">P_Address = #{pAddress},</if>
-            <if test="pPost != null">P_Post = #{pPost},</if>
-            <if test="pCountry != null">P_Country = #{pCountry},</if>
-            <if test="pCeo != null">P_CEO = #{pCeo},</if>
-            <if test="pLinkman != null">P_LinkMan = #{pLinkman},</if>
-            <if test="pTel != null">P_TEL = #{pTel},</if>
-            <if test="pFax != null">P_FAX = #{pFax},</if>
-            <if test="pEmail != null">P_EMAIL = #{pEmail},</if>
-            <if test="pHttp != null">P_HTTP = #{pHttp},</if>
-            <if test="pCiqCode != null">P_CIQ_CODE = #{pCiqCode},</if>
-            <if test="pComCode != null">P_COM_CODE = #{pComCode},</if>
-            <if test="pHyCode != null">P_HY_CODE = #{pHyCode},</if>
-            <if test="pType != null">P_TYPE = #{pType},</if>
-            <if test="pCreatDate != null">P_Creat_Date = #{pCreatDate},</if>
-            <if test="pJhbank != null">P_JHbank = #{pJhbank},</if>
-            <if test="pJhbankCode != null">P_JHbank_code = #{pJhbankCode},</if>
-            <if test="pBank != null">P_bank = #{pBank},</if>
-            <if test="pBankCode != null">P_bank_code = #{pBankCode},</if>
-            <if test="pRmbMoney != null">P_RMB_MONEY = #{pRmbMoney},</if>
-            <if test="pWbType != null">P_WB_TYPE = #{pWbType},</if>
-            <if test="pWbMoney != null">P_WB_MONEY = #{pWbMoney},</if>
-            <if test="memoText != null">memo_text = #{memoText},</if>
-            <if test="moral != null">moral = #{moral},</if>
-            <if test="comfirmFlag != null">comfirm_flag = #{comfirmFlag},</if>
-            <if test="comfirmMan != null">comfirm_man = #{comfirmMan},</if>
-            <if test="comfirmDate != null">comfirm_DATE = #{comfirmDate},</if>
-            <if test="writeMan != null">write_man = #{writeMan},</if>
-            <if test="auditingFlag != null">Auditing_Flag = #{auditingFlag},</if>
-            <if test="auditingMan != null">Auditing_man = #{auditingMan},</if>
-            <if test="auditingDate != null">Auditing_Date = #{auditingDate},</if>
-            <if test="approveFlag != null">Approve_flag = #{approveFlag},</if>
-            <if test="approveMan != null">Approve_man = #{approveMan},</if>
-            <if test="approveDate != null">Approve_date = #{approveDate},</if>
-            <if test="writeDate != null">write_date = #{writeDate},</if>
-            <if test="memotext != null">memotext = #{memotext},</if>
-            <if test="creditAmt != null">Credit_Amt = #{creditAmt},</if>
-            <if test="PID != null">PID = #{PID},</if>
-            <if test="NWX != null">NWX = #{NWX},</if>
-            <if test="ordernoLen != null">OrderNO_Len = #{ordernoLen},</if>
-            <if test="sendcpReportname != null">SendCP_ReportName = #{sendcpReportname},</if>
-            <if test="saler != null">saler = #{saler},</if>
-            <if test="dWaterNo != null">d_water_no = #{dWaterNo},</if>
-            <if test="sWaterName != null">S_Water_Name = #{sWaterName},</if>
-            <if test="sWaterNo != null">S_Water_NO = #{sWaterNo},</if>
-            <if test="comCode != null">Com_Code = #{comCode},</if>
-            <if test="crlName != null">Crl_Name = #{crlName},</if>
-            <if test="pCountryCode != null">P_Country_Code = #{pCountryCode},</if>
-            <if test="CID != null">CID = #{CID},</if>
-            <if test="senduseConfirm != null">SendUse_Confirm = #{senduseConfirm},</if>
-            <if test="taxPercent != null">TAX_Percent = #{taxPercent},</if>
-            <if test="senddw != null">senddw = #{senddw},</if>
-            <if test="taxFlag != null">tax_flag = #{taxFlag},</if>
-        </trim>
-        where P_Code = #{pCode}
-    </update>
-
-    <update id="customerComfirm" parameterType="com.ruoyi.finance.domain.productpriceCAA">
-        UPDATE customer SET comfirm_flag = '1',comfirm_man = #{Name},comfirm_DATE = #{Date} WHERE P_Code = #{Id}
-    </update>
-    
-    <delete id="deleteCustomerById" parameterType="String">
-        delete from customer where P_Code = #{pCode}
-    </delete>
-
-    <delete id="deleteCustomerByIds" parameterType="String">
-        delete from customer where P_Code in 
-        <foreach item="pCode" collection="array" open="(" separator="," close=")">
-            #{pCode}
-        </foreach>
-    </delete>
-
-    <select id="selectNameAndCode" resultMap="CustomerResult" resultType="Customer">select P_Name,P_Code from customer </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/finance/ProductpriceMapper.xml b/ruoyi-admin/src/main/resources/mapper/finance/ProductpriceMapper.xml
deleted file mode 100644
index b9fd1366..00000000
--- a/ruoyi-admin/src/main/resources/mapper/finance/ProductpriceMapper.xml
+++ /dev/null
@@ -1,217 +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.finance.mapper.ProductpriceMapper">
-    
-    <resultMap type="Productprice" id="ProductpriceResult">
-        <result property="SaleOrderID"    column="SaleOrderID"    />
-        <result property="wlCode"    column="Wl_Code"    />
-        <result property="Itemname"    column="Itemname"    />
-        <result property="Itemstandard"    column="Itemstandard"    />
-        <result property="machineNo"    column="Machine_no"    />
-        <result property="stockDw"    column="Stock_dw"    />
-        <result property="crlName"    column="Crl_Name"    />
-        <result property="Price"    column="Price"    />
-        <result property="pCode"    column="P_Code"    />
-        <result property="pName"    column="P_Name"    />
-        <result property="SendDate"    column="SendDate"    />
-        <result property="memoText"    column="Memo_TEXT"    />
-        <result property="IsNowPrice"    column="IsNowPrice"    />
-        <result property="rmbPrice"    column="RMB_Price"    />
-        <result property="taxFlag"    column="Tax_flag"    />
-        <result property="comfirmFlag"    column="ComFirm_Flag"    />
-        <result property="comfirmMan"    column="ComFirm_MAN"    />
-        <result property="comfirmDate"    column="ComFirm_Date"    />
-        <result property="writeMan"    column="write_man"    />
-        <result property="auditingFlag"    column="Auditing_Flag"    />
-        <result property="auditingMan"    column="Auditing_man"    />
-        <result property="auditingDatetime"    column="Auditing_Datetime"    />
-        <result property="approveFlag"    column="Approve_flag"    />
-        <result property="approveMan"    column="Approve_MAN"    />
-        <result property="approveDate"    column="Approve_DATE"    />
-        <result property="lastPrice"    column="last_price"    />
-        <result property="lastCrlName"    column="last_crl_name"    />
-        <result property="taxPercent"    column="tax_percent"    />
-        <result property="noTaxPrice"    column="no_tax_price"    />
-        <result property="taxPrice"    column="tax_price"    />
-    </resultMap>
-
-    <sql id="selectProductpriceVo">
-        select SaleOrderID, Wl_Code, Itemname, Itemstandard, Machine_no, Stock_dw, Crl_Name, Price, P_Code, P_Name, SendDate, Memo_TEXT, IsNowPrice, RMB_Price, Tax_flag, ComFirm_Flag, ComFirm_MAN, ComFirm_Date, write_man, Auditing_Flag, Auditing_man, Auditing_Datetime, Approve_flag, Approve_MAN, Approve_DATE, last_price, last_crl_name, tax_percent, no_tax_price, tax_price from productprice
-    </sql>
-
-    <select id="selectProductpriceList" parameterType="Productprice" resultMap="ProductpriceResult">
-        <include refid="selectProductpriceVo"/>
-        <where>  
-            <if test="SaleOrderID != null  and SaleOrderID != ''"> and SaleOrderID = #{SaleOrderID}</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="Itemstandard != null  and Itemstandard != ''"> and Itemstandard = #{Itemstandard}</if>
-            <if test="machineNo != null  and machineNo != ''"> and Machine_no = #{machineNo}</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="Price != null "> and Price = #{Price}</if>
-            <if test="pCode != null  and pCode != ''"> and P_Code = #{pCode}</if>
-            <if test="pName != null  and pName != ''"> and P_Name like concat('%', #{pName}, '%')</if>
-            <if test="SendDate != null "> and SendDate = #{SendDate}</if>
-            <if test="memoText != null  and memoText != ''"> and Memo_TEXT = #{memoText}</if>
-            <if test="IsNowPrice != null "> and IsNowPrice = #{IsNowPrice}</if>
-            <if test="rmbPrice != null "> and RMB_Price = #{rmbPrice}</if>
-            <if test="taxFlag != null "> and Tax_flag = #{taxFlag}</if>
-            <if test="comfirmFlag != null "> and ComFirm_Flag = #{comfirmFlag}</if>
-            <if test="comfirmMan != null  and comfirmMan != ''"> and ComFirm_MAN = #{comfirmMan}</if>
-            <if test="comfirmDate != null "> and ComFirm_Date = #{comfirmDate}</if>
-            <if test="writeMan != null  and writeMan != ''"> and write_man = #{writeMan}</if>
-            <if test="auditingFlag != null "> and Auditing_Flag = #{auditingFlag}</if>
-            <if test="auditingMan != null  and auditingMan != ''"> and Auditing_man = #{auditingMan}</if>
-            <if test="auditingDatetime != null "> and Auditing_Datetime = #{auditingDatetime}</if>
-            <if test="approveFlag != null "> and Approve_flag = #{approveFlag}</if>
-            <if test="approveMan != null  and approveMan != ''"> and Approve_MAN = #{approveMan}</if>
-            <if test="approveDate != null "> and Approve_DATE = #{approveDate}</if>
-            <if test="lastPrice != null "> and last_price = #{lastPrice}</if>
-            <if test="lastCrlName != null  and lastCrlName != ''"> and last_crl_name like concat('%', #{lastCrlName}, '%')</if>
-            <if test="taxPercent != null "> and tax_percent = #{taxPercent}</if>
-            <if test="noTaxPrice != null "> and no_tax_price = #{noTaxPrice}</if>
-            <if test="taxPrice != null "> and tax_price = #{taxPrice}</if>
-        </where>
-    </select>
-    
-    <select id="selectProductpriceById" parameterType="String" resultMap="ProductpriceResult">
-        <include refid="selectProductpriceVo"/>
-        where SaleOrderID = #{SaleOrderID}
-    </select>
-
-    <select id="selectProductpriceNnm" parameterType="String" resultType="java.lang.Integer">
-       SELECT 1 FROM productprice WHERE SaleOrderID = #{SaleOrderID} LIMIT 1
-    </select>
-
-
-        
-    <insert id="insertProductprice" parameterType="Productprice">
-        insert into productprice
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="SaleOrderID != null">SaleOrderID,</if>
-            <if test="wlCode != null">Wl_Code,</if>
-            <if test="Itemname != null">Itemname,</if>
-            <if test="Itemstandard != null">Itemstandard,</if>
-            <if test="machineNo != null">Machine_no,</if>
-            <if test="stockDw != null">Stock_dw,</if>
-            <if test="crlName != null">Crl_Name,</if>
-            <if test="Price != null">Price,</if>
-            <if test="pCode != null">P_Code,</if>
-            <if test="pName != null">P_Name,</if>
-            <if test="SendDate != null">SendDate,</if>
-            <if test="memoText != null">Memo_TEXT,</if>
-            <if test="IsNowPrice != null">IsNowPrice,</if>
-            <if test="rmbPrice != null">RMB_Price,</if>
-            <if test="taxFlag != null">Tax_flag,</if>
-            <if test="comfirmFlag != null">ComFirm_Flag,</if>
-            <if test="comfirmMan != null">ComFirm_MAN,</if>
-            <if test="comfirmDate != null">ComFirm_Date,</if>
-            <if test="writeMan != null">write_man,</if>
-            <if test="auditingFlag != null">Auditing_Flag,</if>
-            <if test="auditingMan != null">Auditing_man,</if>
-            <if test="auditingDatetime != null">Auditing_Datetime,</if>
-            <if test="approveFlag != null">Approve_flag,</if>
-            <if test="approveMan != null">Approve_MAN,</if>
-            <if test="approveDate != null">Approve_DATE,</if>
-            <if test="lastPrice != null">last_price,</if>
-            <if test="lastCrlName != null">last_crl_name,</if>
-            <if test="taxPercent != null">tax_percent,</if>
-            <if test="noTaxPrice != null">no_tax_price,</if>
-            <if test="taxPrice != null">tax_price,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="SaleOrderID != null">#{SaleOrderID},</if>
-            <if test="wlCode != null">#{wlCode},</if>
-            <if test="Itemname != null">#{Itemname},</if>
-            <if test="Itemstandard != null">#{Itemstandard},</if>
-            <if test="machineNo != null">#{machineNo},</if>
-            <if test="stockDw != null">#{stockDw},</if>
-            <if test="crlName != null">#{crlName},</if>
-            <if test="Price != null">#{Price},</if>
-            <if test="pCode != null">#{pCode},</if>
-            <if test="pName != null">#{pName},</if>
-            <if test="SendDate != null">#{SendDate},</if>
-            <if test="memoText != null">#{memoText},</if>
-            <if test="IsNowPrice != null">#{IsNowPrice},</if>
-            <if test="rmbPrice != null">#{rmbPrice},</if>
-            <if test="taxFlag != null">#{taxFlag},</if>
-            <if test="comfirmFlag != null">#{comfirmFlag},</if>
-            <if test="comfirmMan != null">#{comfirmMan},</if>
-            <if test="comfirmDate != null">#{comfirmDate},</if>
-            <if test="writeMan != null">#{writeMan},</if>
-            <if test="auditingFlag != null">#{auditingFlag},</if>
-            <if test="auditingMan != null">#{auditingMan},</if>
-            <if test="auditingDatetime != null">#{auditingDatetime},</if>
-            <if test="approveFlag != null">#{approveFlag},</if>
-            <if test="approveMan != null">#{approveMan},</if>
-            <if test="approveDate != null">#{approveDate},</if>
-            <if test="lastPrice != null">#{lastPrice},</if>
-            <if test="lastCrlName != null">#{lastCrlName},</if>
-            <if test="taxPercent != null">#{taxPercent},</if>
-            <if test="noTaxPrice != null">#{noTaxPrice},</if>
-            <if test="taxPrice != null">#{taxPrice},</if>
-         </trim>
-    </insert>
-
-    <update id="updateProductprice" parameterType="Productprice">
-        update productprice
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="wlCode != null">Wl_Code = #{wlCode},</if>
-            <if test="Itemname != null">Itemname = #{Itemname},</if>
-            <if test="Itemstandard != null">Itemstandard = #{Itemstandard},</if>
-            <if test="machineNo != null">Machine_no = #{machineNo},</if>
-            <if test="stockDw != null">Stock_dw = #{stockDw},</if>
-            <if test="crlName != null">Crl_Name = #{crlName},</if>
-            <if test="Price != null">Price = #{Price},</if>
-            <if test="pCode != null">P_Code = #{pCode},</if>
-            <if test="pName != null">P_Name = #{pName},</if>
-            <if test="SendDate != null">SendDate = #{SendDate},</if>
-            <if test="memoText != null">Memo_TEXT = #{memoText},</if>
-            <if test="IsNowPrice != null">IsNowPrice = #{IsNowPrice},</if>
-            <if test="rmbPrice != null">RMB_Price = #{rmbPrice},</if>
-            <if test="taxFlag != null">Tax_flag = #{taxFlag},</if>
-            <if test="comfirmFlag != null">ComFirm_Flag = #{comfirmFlag},</if>
-            <if test="comfirmMan != null">ComFirm_MAN = #{comfirmMan},</if>
-            <if test="comfirmDate != null">ComFirm_Date = #{comfirmDate},</if>
-            <if test="writeMan != null">write_man = #{writeMan},</if>
-            <if test="auditingFlag != null">Auditing_Flag = #{auditingFlag},</if>
-            <if test="auditingMan != null">Auditing_man = #{auditingMan},</if>
-            <if test="auditingDatetime != null">Auditing_Datetime = #{auditingDatetime},</if>
-            <if test="approveFlag != null">Approve_flag = #{approveFlag},</if>
-            <if test="approveMan != null">Approve_MAN = #{approveMan},</if>
-            <if test="approveDate != null">Approve_DATE = #{approveDate},</if>
-            <if test="lastPrice != null">last_price = #{lastPrice},</if>
-            <if test="lastCrlName != null">last_crl_name = #{lastCrlName},</if>
-            <if test="taxPercent != null">tax_percent = #{taxPercent},</if>
-            <if test="noTaxPrice != null">no_tax_price = #{noTaxPrice},</if>
-            <if test="taxPrice != null">tax_price = #{taxPrice},</if>
-        </trim>
-        where SaleOrderID = #{SaleOrderID}
-    </update>
-
-    <update id="updateCAA" parameterType = "com.ruoyi.finance.domain.productpriceCAA">
-       UPDATE productprice SET ComFirm_Flag = '1',ComFirm_MAN = #{Name},ComFirm_Date = #{Date} WHERE SaleOrderID = #{Id}
-    </update>
-    <update id="updateCBB" parameterType = "com.ruoyi.finance.domain.productpriceCAA">
-       UPDATE productprice SET  Auditing_Flag = '1',Auditing_man = #{Name},Auditing_Datetime = #{Date} WHERE SaleOrderID = #{Id}
-    </update>
-    <update id="updateCCC" parameterType = "com.ruoyi.finance.domain.productpriceCAA">
-       UPDATE productprice SET Approve_flag = '1',Approve_MAN = #{Name},Approve_DATE = #{Date} WHERE SaleOrderID = #{Id}
-    </update>
-    
-    
-    <delete id="deleteProductpriceById" parameterType="String">
-        delete from productprice where SaleOrderID = #{SaleOrderID}
-    </delete>
-
-    <delete id="deleteProductpriceByIds" parameterType="String">
-        delete from productprice where SaleOrderID in 
-        <foreach item="SaleOrderID" collection="array" open="(" separator="," close=")">
-            #{SaleOrderID}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/StockAdjustMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/StockAdjustMapper.xml
deleted file mode 100644
index 0a641d71..00000000
--- a/ruoyi-admin/src/main/resources/mapper/stock/StockAdjustMapper.xml
+++ /dev/null
@@ -1,160 +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.stock.mapper.StockAdjustMapper">
-    
-    <resultMap type="StockAdjust" id="StockAdjustResult">
-        <result property="id"    column="id"    />
-        <result property="registerDate"    column="registerDate"    />
-        <result property="itemType"    column="itemType"    />
-        <result property="stockNo"    column="stockNo"    />
-        <result property="stockName"    column="stockName"    />
-        <result property="itemCode"    column="itemCode"    />
-        <result property="itemName"    column="itemName"    />
-        <result property="machineType"    column="machineType"    />
-        <result property="itemSpecification"    column="itemSpecification"    />
-        <result property="unit"    column="unit"    />
-        <result property="customerNo"    column="customerNo"    />
-        <result property="customerName"    column="customerName"    />
-        <result property="batchNumber"    column="batchNumber"    />
-        <result property="adjustQty"    column="adjustQty"    />
-        <result property="adjustReel"    column="adjustReel"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-    </resultMap>
-
-    <sql id="selectStockAdjustVo">
-        select id, registerDate, itemType, stockNo, stockName, itemCode, itemName, machineType, itemSpecification, unit, customerNo, customerName, batchNumber, adjustQty, adjustReel, remark, spare1, spare2, spare3, spare4, spare5, spare6 from stock_adjust
-    </sql>
-
-    <select id="selectStockAdjustList" parameterType="StockAdjust" resultMap="StockAdjustResult">
-        <include refid="selectStockAdjustVo"/>
-        <where>  
-            <if test="id != null "> and id like concat('%', #{id}, '%')</if>
-            <if test="params.beginRegisterDate != null and params.beginRegisterDate !=''"> and registerDate >= #{params.beginRegisterDate}</if>
-            <if test="params.endRegisterDate != null and params.endRegisterDate != ''">and #{params.endRegisterDate} >= registerDate</if>
-            <if test="itemType != null  and itemType != ''"> and itemType = #{itemType}</if>
-            <if test="stockNo != null  and stockNo != ''"> and stockNo like concat('%', #{stockNo}, '%')</if>
-            <if test="stockName != null  and stockName != ''"> and stockName like concat('%', #{stockName}, '%')</if>
-            <if test="itemCode != null  and itemCode != ''"> and itemCode like concat('%', #{itemCode}, '%')</if>
-            <if test="itemName != null  and itemName != ''"> and itemName like concat('%', #{itemName}, '%')</if>
-            <if test="machineType != null  and machineType != ''"> and machineType like concat('%', #{machineType}, '%')</if>
-            <if test="itemSpecification != null  and itemSpecification != ''"> and itemSpecification like concat('%', #{itemSpecification}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="customerNo != null  and customerNo != ''"> and customerNo like concat('%', #{customerNo}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and customerName like concat('%', #{customerName}, '%')</if>
-            <if test="batchNumber != null  and batchNumber != ''"> and batchNumber like concat('%', #{batchNumber}, '%')</if>
-            <if test="adjustQty != null "> and adjustQty = #{adjustQty}</if>
-            <if test="adjustReel != null "> and adjustReel = #{adjustReel}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-        </where>
-    </select>
-    
-    <select id="selectStockAdjustById" parameterType="Long" resultMap="StockAdjustResult">
-        <include refid="selectStockAdjustVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertStockAdjust" parameterType="StockAdjust">
-        insert into stock_adjust
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="registerDate != null">registerDate,</if>
-            <if test="itemType != null">itemType,</if>
-            <if test="stockNo != null">stockNo,</if>
-            <if test="stockName != null">stockName,</if>
-            <if test="itemCode != null">itemCode,</if>
-            <if test="itemName != null">itemName,</if>
-            <if test="machineType != null">machineType,</if>
-            <if test="itemSpecification != null">itemSpecification,</if>
-            <if test="unit != null">unit,</if>
-            <if test="customerNo != null">customerNo,</if>
-            <if test="customerName != null">customerName,</if>
-            <if test="batchNumber != null">batchNumber,</if>
-            <if test="adjustQty != null">adjustQty,</if>
-            <if test="adjustReel != null">adjustReel,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="registerDate != null">#{registerDate},</if>
-            <if test="itemType != null">#{itemType},</if>
-            <if test="stockNo != null">#{stockNo},</if>
-            <if test="stockName != null">#{stockName},</if>
-            <if test="itemCode != null">#{itemCode},</if>
-            <if test="itemName != null">#{itemName},</if>
-            <if test="machineType != null">#{machineType},</if>
-            <if test="itemSpecification != null">#{itemSpecification},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="customerName != null">#{customerName},</if>
-            <if test="batchNumber != null">#{batchNumber},</if>
-            <if test="adjustQty != null">#{adjustQty},</if>
-            <if test="adjustReel != null">#{adjustReel},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-         </trim>
-    </insert>
-
-    <update id="updateStockAdjust" parameterType="StockAdjust">
-        update stock_adjust
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="registerDate != null">registerDate = #{registerDate},</if>
-            <if test="itemType != null">itemType = #{itemType},</if>
-            <if test="stockNo != null">stockNo = #{stockNo},</if>
-            <if test="stockName != null">stockName = #{stockName},</if>
-            <if test="itemCode != null">itemCode = #{itemCode},</if>
-            <if test="itemName != null">itemName = #{itemName},</if>
-            <if test="machineType != null">machineType = #{machineType},</if>
-            <if test="itemSpecification != null">itemSpecification = #{itemSpecification},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="customerNo != null">customerNo = #{customerNo},</if>
-            <if test="customerName != null">customerName = #{customerName},</if>
-            <if test="batchNumber != null">batchNumber = #{batchNumber},</if>
-            <if test="adjustQty != null">adjustQty = #{adjustQty},</if>
-            <if test="adjustReel != null">adjustReel = #{adjustReel},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteStockAdjustById" parameterType="Long">
-        delete from stock_adjust where id = #{id}
-    </delete>
-
-    <delete id="deleteStockAdjustByIds" parameterType="String">
-        delete from stock_adjust where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/customer/add.html b/ruoyi-admin/src/main/resources/templates/finance/customer/add.html
deleted file mode 100644
index df9167ce..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/customer/add.html
+++ /dev/null
@@ -1,370 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增客户资料')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-customer-add">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">内外销：</label>
-                <div class="col-sm-8">
-                    <select name="NWX" id="NWX" class="form-control m-b" th:with="type=${@dict.getType('sys_NWX_class')}">
-                        <option value="">所有</option>
-                        <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 is-required">企业代码：</label>
-                <div class="col-sm-8">
-                    <input id="pCode" name="pCode"  class="form-control" type="text" readonly="readonly" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">企业名称：</label>
-                <div class="col-sm-8">
-                    <input id="pName" name="pName" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">客户简称：</label>
-                <div class="col-sm-8">
-                    <input id="pHttp" name="pHttp" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">信用额度：</label>
-                <div class="col-sm-8">
-                    <input id="creditAmt" name="creditAmt" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">英文名称：</label>
-                <div class="col-sm-8">
-                    <input name="pEnName" 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="pAddress" 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="pWbType" 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="pPost" 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="pCeo" 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="pLinkman" 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="pTel" 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="pFax" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">EMAIL：</label>
-                <div class="col-sm-8">
-                    <input name="pEmail" 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="pCiqCode" 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="pComCode" 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="pHyCode" 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="pType" 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="pCreatDate" 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="pJhbank" 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="pJhbankCode" 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="pBank" 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="pBankCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">RMB注册资金：</label>
-                <div class="col-sm-8">
-                    <input name="pRmbMoney" 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="pWbMoney" 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"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">诚信评级：</label>
-                <div class="col-sm-8">
-                    <select name="moral" class="form-control m-b" th:with="type=${@dict.getType('fin_customer_moral')}">
-                        <option value="">所有</option>
-                        <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="ordernoLen" 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="sendcpReportname" 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="saler" class="form-control" readonly="readonly" type="text" th:value="${@permission.getPrincipalProperty('userName')}">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">目的地港代号：</label>
-                <div class="col-sm-8">
-                    <input name="dWaterNo" 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="sWaterName" 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="sWaterNo" 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="comCode" 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="crlName" class="form-control m-b" 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>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">国家或地区编号：</label>
-                <div class="col-sm-8">
-                    <input name="pCountryCode" 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="pCountry" 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="senduseConfirm" class="form-control m-b" th:with="type=${@dict.getType('fin_customer_senduseConfirm')}">
-                        <option value="">所有</option>
-                        <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="taxPercent" 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="taxFlag" class="form-control">
-                        <option value="0">否</option>
-                        <option value="1">是</option>
-                    </select>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "finance/customer"
-        $("#form-customer-add").validate({
-            focusCleanup: true
-        });
-
-        var workNo = '[[${parameter.Num}]]'
-        var num = workNo.replace(/[^0-9]/ig,"");
-        $("#NWX").change(function () {
-            if ($(this).val() == "内销"){
-                $("#pCode").val("N"+num);
-            }
-            if($(this).val() == "外销"){
-                $("#pCode").val("W"+num)
-            }
-        })
-
-        Date.prototype.Format = function (fmt) {
-            var o = {
-                "M+": this.getMonth() + 1, //月份
-                "d+": this.getDate(), //日
-                "H+": this.getHours(), //小时
-                "m+": this.getMinutes(), //分
-                "s+": this.getSeconds(), //秒
-                "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-                "S": this.getMilliseconds() //毫秒
-            };
-            if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-            for (var k in o)
-                if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-            return fmt;
-        }
-
-
-
-
-        function submitHandler() {
-            console.log($("#pCode").val())
-            console.log($("#pName").val())
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-customer-add').serialize());
-            }
-        }
-
-        // 表单校验
-        $(function () {
-            var icon = "<i class='fa fa-times-circle'></i>";
-            $("#form-customer-add").validate({
-                rules:{
-                    creditAmt: "required",
-                    pHttp: "required",
-                    pCode: "required",
-                    pName: "required",
-                },
-                messages:{
-                    creditAmt: icon + "请输入报价编号",
-                    pHttp:icon + "客户简称",
-                    pCode:icon + "请输入成品名称",
-                    pName: icon + "请输入规格型号",
-                }
-            })
-        })
-
-        $("input[name='pCreatDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='comfirmDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='auditingDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='approveDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='writeDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/customer/customer.html b/ruoyi-admin/src/main/resources/templates/finance/customer/customer.html
deleted file mode 100644
index 84613800..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/customer/customer.html
+++ /dev/null
@@ -1,461 +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="pCode"/>-->
-<!--                        </li>-->
-<!--                        <li>-->
-<!--                            <label>企业名称：</label>-->
-<!--                            <input type="text" name="pName"/>-->
-<!--                        </li>-->
-<!--                        <li>-->
-<!--                            <label>内外销：</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">-->
-<!--                            <option value="">所有</option>-->
-<!--                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
-<!--                                    th:value="${dict.dictValue}"></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="$.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="finance:customer:add">-->
-<!--                <i class="fa fa-plus"></i> 添加-->
-<!--            </a>-->
-<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
-<!--               shiro:hasPermission="finance:customer:edit">-->
-<!--                <i class="fa fa-edit"></i> 修改-->
-<!--            </a>-->
-<!--            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
-<!--               shiro:hasPermission="finance:customer:remove">-->
-<!--                <i class="fa fa-remove"></i> 删除-->
-<!--            </a>-->
-<!--            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">-->
-<!--                <i class="fa fa-download"></i> 导出-->
-<!--            </a>-->
-<!--            <a class="btn btn-success single disabled" onclick="comfirm()"-->
-<!--               shiro:hasPermission="finance:customer:export">-->
-<!--                <i class="glyphicon glyphicon-ok"></i> 确认-->
-<!--            </a>-->
-<!--        </div>-->
-<!--        <div class="col-sm-12 select-table table-striped table-single">-->
-<!--            <table id="bootstrap-table"></table>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-<!--<th:block th:include="include :: footer"/>-->
-<!--<script th:inline="javascript">-->
-<!--    var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];-->
-<!--    var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];-->
-<!--    var prefix = ctx + "finance/customer";-->
-
-<!--    $(function () {-->
-<!--        var options = {-->
-<!--            url: prefix + "/list",-->
-<!--            createUrl: prefix + "/add",-->
-<!--            updateUrl: prefix + "/edit/{id}",-->
-<!--            removeUrl: prefix + "/remove",-->
-<!--            exportUrl: prefix + "/export",-->
-<!--            onClickRow: onClickRow,//行点击事件-->
-<!--            modalName: "客户资料",-->
-<!--            columns: [{-->
-<!--                checkbox: true-->
-<!--            },-->
-<!--                {-->
-<!--                    field: 'pCode',-->
-<!--                    title: '企业代码'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pName',-->
-<!--                    title: '企业名称'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pEnName',-->
-<!--                    title: '企业英文名称',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    },-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pAddress',-->
-<!--                    title: '地址',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pPost',-->
-<!--                    title: '邮编',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pCountry',-->
-<!--                    title: '国家地区',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pCeo',-->
-<!--                    title: '法人代表',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pLinkman',-->
-<!--                    title: '联系人'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pTel',-->
-<!--                    title: '联系电话',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pFax',-->
-<!--                    title: '传真',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pEmail',-->
-<!--                    title: 'EMAIL',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pHttp',-->
-<!--                    title: '客户简称',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pCiqCode',-->
-<!--                    title: '',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pComCode',-->
-<!--                    title: '付款条件',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pHyCode',-->
-<!--                    title: '发票代码',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pCreatDate',-->
-<!--                    title: '成立时间',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pJhbank',-->
-<!--                    title: '结汇银行',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pJhbankCode',-->
-<!--                    title: '结汇账号',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pBank',-->
-<!--                    title: '开户银行',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pBankCode',-->
-<!--                    title: '开户银行账号',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pRmbMoney',-->
-<!--                    title: '人民币注册资金',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pWbType',-->
-<!--                    title: '送货地址',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        return $.table.tooltip(value);-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pWbMoney',-->
-<!--                    title: '外币注册资金',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'memoText',-->
-<!--                    title: '备注内容',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'moral',-->
-<!--                    title: '诚信评级',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'comfirmDate',-->
-<!--                    title: '确认时间',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'writeMan',-->
-<!--                    title: '制单人名',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'writeDate',-->
-<!--                    title: '',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'creditAmt',-->
-<!--                    title: '信用额度',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'NWX',-->
-<!--                    title: '内外销',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'ordernoLen',-->
-<!--                    title: '订单号长度'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'sendcpReportname',-->
-<!--                    title: '出货单格式名称',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'saler',-->
-<!--                    title: '业务员'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'dWaterNo',-->
-<!--                    title: '目的地港代号',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'sWaterName',-->
-<!--                    title: '起运港名',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'crlName',-->
-<!--                    title: '币别',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'pCountryCode',-->
-<!--                    title: '国家地区编号'-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'senduseConfirm',-->
-<!--                    title: '出货需录入使用量',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'taxPercent',-->
-<!--                    title: '税率',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'senddw',-->
-<!--                    title: '',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'taxFlag',-->
-<!--                    title: '含税否',-->
-<!--                    visible: false-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'comfirmFlag',-->
-<!--                    title: '确认否',-->
-<!--                    formatter: function (value, row, index) {-->
-<!--                        if (value == 1){-->
-<!--                            value = "是"-->
-<!--                            return value-->
-<!--                        } else {-->
-<!--                            value = "否"-->
-<!--                            return value-->
-<!--                        }-->
-<!--                    }-->
-<!--                },-->
-<!--                {-->
-<!--                    field: 'comfirmMan',-->
-<!--                    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.pCode + '\')"><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.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');-->
-<!--                        return actions.join('');-->
-<!--                    }-->
-<!--                }]-->
-<!--        };-->
-<!--        $.table.init(options);-->
-<!--    });-->
-
-<!--    // 获取记录总数-->
-<!--    // $("#bootstrap-table").on("load-success.bs.table", function () {-->
-<!--    //     var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;-->
-<!--    //     console.log(total_row_num1)-->
-<!--    // });-->
-
-<!--    Date.prototype.Format = function (fmt) {-->
-<!--        var o = {-->
-<!--            "M+": this.getMonth() + 1, //月份-->
-<!--            "d+": this.getDate(), //日-->
-<!--            "H+": this.getHours(), //小时-->
-<!--            "m+": this.getMinutes(), //分-->
-<!--            "s+": this.getSeconds(), //秒-->
-<!--            "q+": Math.floor((this.getMonth() + 3) / 3), //季度-->
-<!--            "S": this.getMilliseconds() //毫秒-->
-<!--        };-->
-<!--        if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));-->
-<!--        for (var k in o)-->
-<!--            if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));-->
-<!--        return fmt;-->
-<!--    }-->
-
-
-<!--    function comfirm() {-->
-<!--        table.set();-->
-<!--        $.modal.confirm("你确定数据正确，决定要确认吗？确认的记录不能删或修改 ", function () {-->
-<!--            var P_Code = $.table.selectFirstColumns();-->
-<!--            var userName = [[${@permission.getPrincipalProperty('userName')}]];-->
-<!--            var date = new Date().Format("yyyy-MM-dd HH:mm:ss");-->
-<!--            var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}-->
-<!--            var key = "comfirm";-->
-<!--            var value = "comfirm";-->
-<!--            var url = prefix + "/edit/comfirm";-->
-<!--            editList[key] = value-->
-<!--            $.operate.submit(url, "post", "json", editList);-->
-<!--        });-->
-<!--    }-->
-
-
-<!--    function onClickRow(row) {-->
-<!--        // console.log("row"+JSON.stringify(row))-->
-
-<!--        // $("#pCode").val(row.pCode);-->
-<!--        // $("#pName").val(row.pName);-->
-<!--        // $("#pEnName").val(row.pEnName);-->
-<!--        // $("#pAddress").val(row.pAddress);-->
-<!--        // $("#pWbType").val(row.pWbType);-->
-<!--        // $("#pPost").val(row.pPost);-->
-<!--        // $("#pCeo").val(row.pCeo);-->
-<!--        //-->
-<!--        // $("#memoText").val(row.memoText);-->
-<!--        // $("#writeMan").val(row.writeMan);-->
-<!--        // $("#comfirmMan").val(row.comfirmMan);-->
-<!--        //-->
-<!--        // $("#pLinkman").val(row.pLinkman);-->
-<!--        // $("#pTel").val(row.pTel);-->
-<!--        // $("#pFax").val(row.pFax);-->
-<!--        // $("#pEmail").val(row.pEmail);-->
-<!--        // $("#pHttp").val(row.pHttp);-->
-<!--        // $("#pCiqCode").val(row.pCiqCode);-->
-<!--        // $("#pComCode").val(row.pComCode);-->
-<!--        // $("#pHyCode").val(row.pHyCode);-->
-<!--        //-->
-<!--        // $("#pType").val(row.pType);-->
-<!--        // // $("#pCreatDate").val(row.pCreatDate);-->
-<!--        // $("#pJhbank").val(row.pJhbank);-->
-<!--        // $("#pJhbankCode").val(row.pJhbankCode);-->
-<!--        // $("#pBank").val(row.pBank);-->
-<!--        // $("#pBankCode").val(row.pBankCode);-->
-<!--        // $("#pRmbMoney").val(row.pRmbMoney);-->
-<!--        // $("#pWbMoney").val(row.pWbMoney);-->
-<!--        // $("#ordernoLen").val(row.ordernoLen);-->
-<!--        // // $("#saler").val(row.saler);-->
-<!--        // $("#sendcpReportname").val(row.sendcpReportname);-->
-<!--        //-->
-<!--        // $("#dWaterNo").val(row.dWaterNo);-->
-<!--        // $("#sWaterName").val(row.sWaterName);-->
-<!--        // $("#sWaterNo").val(row.sWaterNo);-->
-<!--        // $("#comCode").val(row.comCode);-->
-<!--        // $("#crlName").val(row.crlName);-->
-<!--        // $("#creditAmt").val(row.creditAmt);-->
-<!--        // $("#ordernoLen").val(row.ordernoLen);-->
-<!--        // $("#moral").val(row.moral);-->
-<!--        // $("#senduseConfirm").val(row.senduseConfirm);-->
-<!--        // $("#pCountry").val(row.pCountry);-->
-<!--        // $("#pCountryCode").val(row.pCountryCode);-->
-<!--    }-->
-<!--</script>-->
-<!--</body>-->
-<!--<style>-->
-<!--    .label-100px li label:not(.radio-box) {-->
-<!--        width: 110px;-->
-<!--    }-->
-
-<!--    .parallel {-->
-<!--        width: 50%;-->
-<!--        height: 30px;-->
-<!--        float: left-->
-<!--    }-->
-
-<!--    #ordernoLen {-->
-<!--        width: 50px;-->
-<!--    }-->
-
-<!--    #saler {-->
-<!--        width: 86px;-->
-<!--    }-->
-
-<!--    #parallel-r {-->
-<!--        width: 108px;-->
-<!--    }-->
-
-<!--    #parallel-r {-->
-<!--        text-align: left;-->
-<!--        width: 55px;-->
-<!--    }-->
-
-<!--    #memoText {-->
-<!--        width: 570px;-->
-<!--        height: 66px;-->
-<!--        display: inline;-->
-<!--    }-->
-
-<!--    .nema {-->
-<!--        width: 200px;-->
-<!--        float: left;-->
-<!--    }-->
-
-<!--    #writeMan {-->
-<!--        width: 120px;-->
-<!--    }-->
-
-<!--    #comfirmMan {-->
-<!--        width: 120px;-->
-<!--    }-->
-<!--</style>-->
-<!--</html>-->
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/customer/edit.html b/ruoyi-admin/src/main/resources/templates/finance/customer/edit.html
deleted file mode 100644
index 4e0c63f0..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/customer/edit.html
+++ /dev/null
@@ -1,333 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改客户资料')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-customer-edit" th:object="${customer}">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">企业代码：</label>
-                <div class="col-sm-8">
-                    <input name="pCode" th:field="*{pCode}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">企业名称：</label>
-                <div class="col-sm-8">
-                    <input name="pName" th:field="*{pName}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">客户简称：</label>
-                <div class="col-sm-8">
-                    <input name="pHttp" th:field="*{pHttp}" 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="creditAmt" th:field="*{creditAmt}" 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="pEnName" th:field="*{pEnName}" 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="pWbType" th:field="*{pWbType}" 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="pPost" th:field="*{pPost}" 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="pCountryCode" th:field="*{pCountryCode}" 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="pCountry" th:field="*{pCountry}" 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="pCeo" th:field="*{pCeo}" 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="pLinkman" th:field="*{pLinkman}" 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="pTel" th:field="*{pTel}" 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="pFax" th:field="*{pFax}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">EMAIL：</label>
-                <div class="col-sm-8">
-                    <input name="pEmail" th:field="*{pEmail}" 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="pCiqCode" th:field="*{pCiqCode}" 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="pComCode" th:field="*{pComCode}" 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="pHyCode" th:field="*{pHyCode}" 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="pCreatDate" th:value="${#dates.format(customer.pCreatDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">结汇银行：</label>
-                <div class="col-sm-8">
-                    <input name="pJhbank" th:field="*{pJhbank}" 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="pJhbankCode" th:field="*{pJhbankCode}" 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="pBank" th:field="*{pBank}" 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="pBankCode" th:field="*{pBankCode}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">RMB注册资金：</label>
-                <div class="col-sm-8">
-                    <input name="pRmbMoney" th:field="*{pRmbMoney}" 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="pWbMoney" th:field="*{pWbMoney}" 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>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">业务员：</label>
-                <div class="col-sm-8">
-                    <input name="moral" th:field="*{moral}" 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="comfirmDate" th:value="${#dates.format(customer.comfirmDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-                    <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                <!--</div>-->
-            <!--</div>-->
-        <!--</div>-->
-            <!--<div class="form-group">    -->
-                <!--<label class="col-sm-3 control-label">制单人：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input name="writeMan" th:field="*{writeMan}" 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="writeDate" th:value="${#dates.format(customer.writeDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-                        <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">NWX：</label>
-                <div class="col-sm-8">
-                    <input name="NWX" th:field="*{NWX}" 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="ordernoLen" th:field="*{ordernoLen}" 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="sendcpReportname" th:field="*{sendcpReportname}" 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="saler" th:field="*{saler}" 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="dWaterNo" th:field="*{dWaterNo}" 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="sWaterName" th:field="*{sWaterName}" 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="sWaterNo" th:field="*{sWaterNo}" 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="comCode" th:field="*{comCode}" 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="senduseConfirm" th:field="*{senduseConfirm}" 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="taxPercent" th:field="*{taxPercent}" 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="senddw" th:field="*{senddw}" 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 id="taxFlag" name="taxFlag" th:field="*{taxFlag}" class="form-control" type="text">-->
-                    <select id="taxFlag" name="taxFlag"  class="form-control m-b">
-                        <option value="" selected></option>
-                        <option value="0">否</option>
-                        <option value="1">是</option>
-                    </select>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "finance/customer";
-        $("#form-customer-edit").validate({
-            focusCleanup: true
-        });
-
-        //确认在编辑是否
-        var workNo = '[[${customer.taxFlag}]]';
-        $(function () {
-            workNo == "1" ?$("#taxFlag option[selected]").text("是") : $("#taxFlag option[selected]").text("否")
-            workNo == "1" ?$("#taxFlag option[selected]").val("1") : $("#taxFlag option[selected]").val("0")
-
-            // console.log($("#taxFlag").val())
-        })
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-customer-edit').serialize());
-            }
-        }
-
-        $("input[name='pCreatDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='comfirmDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='auditingDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='approveDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='writeDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/productprice/add.html b/ruoyi-admin/src/main/resources/templates/finance/productprice/add.html
deleted file mode 100644
index ead9c1a5..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/productprice/add.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增产品报价')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="row">
-
-        <div class="col-sm-12 search-collapse">
-            <form class="form-horizontal m" id="form-productprice-add">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">报价编号：</label>
-                    <div class="col-sm-8">
-                        <input id="SaleOrderID"   th:value="${SaleOrderID}" name="SaleOrderID" 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 id="wlCode" 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 id="itemname" name="Itemname" class="form-control" readonly="readonly" type="text">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">规格型号：</label>
-                    <div class="col-sm-8">
-                        <input id="itemstandard" name="Itemstandard" class="form-control" readonly="readonly" type="text">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">机种：</label>
-                    <div class="col-sm-8">
-                        <input id="machineNo" name="machineNo" class="form-control" readonly="readonly" type="text">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">单位：</label>
-                    <div class="col-sm-8">
-                        <input id="stockDw" name="stockDw" class="form-control" readonly="readonly" type="text">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">币别：</label>
-                    <div class="col-sm-8">
-                        <!--<input id="crlName" name="crlName" class="form-control" type="text">-->
-                        <select name="crlName" class="form-control m-b" 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 id="rmbPrice" name="rmbPrice" onchange="myFunction()" 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" id="pCode">
-                            <option th:each="a:${wxProduct}" th:value="${a.pCode}" th:text="${a.pCode}"></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" id="pName">
-                            <option th:each="a:${wxProduct}" th:value="${a.pCode}" th:text="${a.pName}"></option>
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">登记人：</label>
-                    <div class="col-sm-8">
-                        <input name="writeMan" th:value="${@permission.getPrincipalProperty('userName')}">
-                    </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 id="SendDate" name="SendDate" 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 id="taxPercent" name="taxPercent" class="form-control" type="text">-->
-                        <select id="taxPercent" name="taxPercent" class="form-control m-b" th:with="type=${@dict.getType('fin_customer_taxPercent')}">
-                            <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 id="noTaxPrice" name="noTaxPrice" 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 id="taxPrice" name="taxPrice" 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 id="taxFlag" name="taxFlag" class="form-control m-b">
-                            <option value="0" selected="selected">否</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="memoText" class="form-control" type="text">
-                    </div>
-                </div>
-            </form>
-        </div>
-        <!--成品选择弹框-->
-        <div class="modal inmodal" id="cpModal" tabindex="-1"
-             role="dilog" aria-hidden="true">
-            <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">
-                            <div class="col-md-5">
-                                <form id="formId" class="form-group">
-                                    <label class="control-label col-md-4">成品代码：</label>
-                                    <div class="col-md-8">
-                                        <input type="text" class="form-control" name="wlCode"
-                                               id="cpCode2">
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="cpCodeSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="cpTable"
-                                           class="table table-striped table-responsive">
-
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selWlCode();">选择</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    </div>
-
-                </div>
-                <!--  /.modal-content -->
-            </div>
-            <!-- /.modal-dialog  -->
-        </div>
-
-        </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: bootstrap-table-editable-js" />
-    <th:block th:include="include :: datetimepicker-css" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "finance/productprice"
-
-        Date.prototype.Format = function (fmt) {
-            var o = {
-                "M+": this.getMonth() + 1, //月份
-                "d+": this.getDate(), //日
-                "H+": this.getHours(), //小时
-                "m+": this.getMinutes(), //分
-                "s+": this.getSeconds(), //秒
-                "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-                "S": this.getMilliseconds() //毫秒
-            };
-            if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-            for (var k in o)
-                if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-            return fmt;
-        }
-
-
-        $("select#pName").change(function(){
-            $("#pCode").val($(this).val());
-        });
-        $("select#pCode").change(function(){
-            console.log($(this).find("option:selected").text());
-            $("#pName").val($(this).find("option:selected").text());
-        });
-
-        // 输入单价就计算含税价（若选择含税）
-        function myFunction() {
-            var a = Number($("#rmbPrice").val());
-            var b = Number($("#taxPercent").val());
-            $("#noTaxPrice").val(a);
-            if (Number($("select#taxFlag").val())!==0) {
-                $("#taxPrice").val(Math.round((a * (b + 1))*100)/100);
-                // console.log( typeof (a * (b + 1)) )
-            }
-        }
-        // 改变税率计算含税价（若选择含税）
-        $("#taxPercent").change(function(){
-            var a = Number($("#rmbPrice").val());
-            var b = Number($("#taxPercent").val());
-           if (Number($("select#taxFlag").val())!==0) {
-               $("#taxPrice").val(Math.round((a * (b + 1))*100)/100);
-           }
-        });
-
-        // 选择含税则计算含税价
-        $("select#taxFlag").change(function(){
-            if ($("select#taxFlag").val()!==0) {
-                var a = Number($("#rmbPrice").val());
-                var b = Number($("#taxPercent").val());
-                $("#noTaxPrice").val(a);
-                $("#taxPrice").val(Math.round((a * (b + 1))*100)/100);
-            }
-        });
-
-        // 表单校验
-         $(function () {
-             var icon = "<i class='fa fa-times-circle'></i>";
-             $("#form-productprice-add").validate({
-                 rules:{
-                     SaleOrderID: "required",
-                     wlCode: "required",
-                     pCode:"required",
-                     pName:"required",
-                     crlName: "required",
-                     rmbPrice: "required"
-                 },
-                 messages:{
-                     SaleOrderID: icon + "请输入报价编号",
-                     wlCode:icon + "请输入成品代码",
-                     pCode:"请选择客户编号",
-                     pName:"请选择客户名",
-                     crlName: icon + "请输入币别",
-                     rmbPrice: icon + "请输入单价",
-                 }
-             })
-         })
-
-        $('#cpTable').bootstrapTable({
-            url : ctx + "ck/itemCP/list",
-            method : 'post',
-            striped : true, // 是否显示行间隔色
-            cache : false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-            pagination : true, // 是否显示分页（*）
-            contentType :"application/x-www-form-urlencoded",
-            queryParams : function(params) {
-                var curParams = {
-                    // 传递参数查询参数
-                    pageSize:       params.limit,
-                    pageNum:        params.offset / params.limit + 1,
-                    searchValue:    params.search,
-                    orderByColumn:  params.sort,
-                    isAsc:          params.order
-                };
-                var json= $.extend(curParams, $.common.formToJSON("formId"));
-                console.log("json"+json);
-                return json;
-            },
-            sidePagination : "server", // 分页方式：client客户端分页，server服务端分页（*）
-            pageNumber : 1, // 初始化加载第一页，默认第一页
-            pageSize : 10, // 每页的记录行数（*）
-            pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-            clickToSelect : true, // 是否启用点击选中行
-            showToggle : false, // 是否显示详细视图和列表视图的切换按钮
-            cardView : false, // 是否显示详细视图
-            detailView : false, // 是否显示父子表
-            smartDisplay : false, // 加了这个才显示每页显示的行数
-            showExport : false, // 是否显示导出按钮
-            singleSelect : true,
-            height:400,
-            columns : [
-                {
-                    checkbox: true
-                },
-                {
-                    field: 'wldm',
-                    title: '',
-                    visible: false
-
-                },
-                {
-                    field: 'wlCode',
-                    title: '成品代码'
-                },
-                {
-                    field: 'hsCode',
-                    title: '',
-                    visible: false
-
-                },
-                {
-                    field: 'itemname',
-                    title: '名称'
-                },
-                {
-                    field: 'enName',
-                    title: '',
-                    visible: false
-
-                },
-                {
-                    field: 'itemstandard',
-                    title: '规格型号'
-                },
-                {
-                    field: 'machineNo',
-                    title: '机种',
-                },
-                {
-                    field: 'stockDw',
-                    title: '库存单位'
-                },
-                {
-                    field: 'intakeorchina',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'weight',
-                    title: '单位重量'
-                },
-                {
-                    field: 'pWldm',
-                    title: '客户料号'
-                },
-                {
-                    field: 'pCode',
-                    title: '客户号'
-                },
-                {
-                    field: 'pName',
-                    title: '客户名'
-                }
-            ]
-
-        });
-
-        //点击成品代码输入栏出模态框
-        $("#wlCode").focus(function () {
-            $("#cpModal").modal("show");
-        });
-
-        //点击搜索,刷新表格
-        $("#cpCodeSearch").click(function () {
-            $('#cpTable').bootstrapTable('refresh');
-        });
-
-        function selWlCode(){
-            var row=$('#cpTable').bootstrapTable('getSelections');
-            console.log("cpTable"+row)
-            $("#wlCode").val(row[0].wlCode);
-            $("#itemname").val(row[0].itemname);
-            $("#itemstandard").val(row[0].itemstandard);
-            $("#machineNo").val(row[0].machineNo);
-            $("#stockDw").val(row[0].stockDw);
-            $("#pCode").val(row[0].pCode);
-            $("#pName").val(row[0].pName);
-            $("#cpModal").modal("hide");
-        }
-
-
-
-        // 确认提交
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-productprice-add').serialize());
-            }
-        }
-
-
-        $("input[name='SendDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true,
-            todayBtn:true
-        });
-
-        var date = new Date().Format("yyyy-MM-dd");
-        console.log(date)
-        $("#SendDate").val(date);
-
-        // $("input[name='comfirmDate']").datetimepicker({
-        //     format: "yyyy-mm-dd",
-        //     minView: "month",
-        //     autoclose: true
-        // });
-        //
-        // $("input[name='auditingDatetime']").datetimepicker({
-        //     format: "yyyy-mm-dd",
-        //     minView: "month",
-        //     autoclose: true
-        // });
-        //
-        // $("input[name='approveDate']").datetimepicker({
-        //     format: "yyyy-mm-dd",
-        //     minView: "month",
-        //     autoclose: true
-        // });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/productprice/edit.html b/ruoyi-admin/src/main/resources/templates/finance/productprice/edit.html
deleted file mode 100644
index 032e4f03..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/productprice/edit.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改产品报价')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-productprice-edit" th:object="${productprice}">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">报价编号：</label>
-                <div class="col-sm-8">
-                    <input name="SaleOrderID" th:field="*{SaleOrderID}" 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="Itemstandard" th:field="*{Itemstandard}" 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="machineNo" th:field="*{machineNo}" 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="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="pCode" th:field="*{pCode}" 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="pName" th:field="*{pName}" 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="writeMan" th:field="*{writeMan}" 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="SendDate" th:value="${#dates.format(productprice.SendDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">说明：</label>
-                <div class="col-sm-8">
-                    <input name="memoText" th:field="*{memoText}" 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="IsNowPrice" th:field="*{IsNowPrice}" 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="rmbPrice" th:field="*{rmbPrice}" 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="taxFlag" th:field="*{taxFlag}" 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="comfirmFlag" th:field="*{comfirmFlag}" 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="comfirmMan" th:field="*{comfirmMan}" 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="comfirmDate" th:value="${#dates.format(productprice.comfirmDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-                        <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">    -->
-                <!--<label class="col-sm-3 control-label">审核标志：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input name="auditingFlag" th:field="*{auditingFlag}" 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="auditingMan" th:field="*{auditingMan}" 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="auditingDatetime" th:value="${#dates.format(productprice.auditingDatetime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-                        <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">    -->
-                <!--<label class="col-sm-3 control-label">核准标志：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input name="approveFlag" th:field="*{approveFlag}" 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="approveMan" th:field="*{approveMan}" 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="approveDate" th:value="${#dates.format(productprice.approveDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-                        <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">    -->
-                <!--<label class="col-sm-3 control-label">是否为当前报价：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input name="lastPrice" th:field="*{lastPrice}" 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="lastCrlName" th:field="*{lastCrlName}" 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="noTaxPrice" th:field="*{noTaxPrice}" 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="taxPercent" th:field="*{taxPercent}" 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="taxPrice" th:field="*{taxPrice}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "finance/productprice";
-        $("#form-productprice-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-productprice-edit').serialize());
-            }
-        }
-
-        $("input[name='SendDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='comfirmDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='auditingDatetime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='approveDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/finance/productprice/productprice.html b/ruoyi-admin/src/main/resources/templates/finance/productprice/productprice.html
deleted file mode 100644
index 365a84b0..00000000
--- a/ruoyi-admin/src/main/resources/templates/finance/productprice/productprice.html
+++ /dev/null
@@ -1,365 +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="SaleOrderID"/>
-                        </li>
-                        <li>
-                            <label>客户名称：</label>
-                            <input type="text" name="pName"/>
-                        </li>
-                        <li>
-                            <label>成品代码：</label>
-                            <input type="text" name="Itemname"/>
-                        </li>
-                        <li>
-                            <label>成品名称：</label>
-                            <input type="text" name="Itemname"/>
-                        </li>
-                        <li>
-                            <label>客户料号：</label>
-                            <input type="text" name="machineNo"/>
-                        </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="finance:productprice:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="finance:productprice:edit">
-            <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="finance:productprice:remove">
-            <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()"
-               shiro:hasPermission="finance:productprice:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-            <a class="btn btn-primary single disabled" onclick="comfirm(1)" shiro:hasPermission="finance:productprice:edit">
-                <i class="glyphicon glyphicon-ok"></i> 确认
-            </a>
-            <a class="btn btn-primary single disabled" onclick="comfirm(2)" shiro:hasPermission="finance:productprice:edit">
-                <i class="glyphicon glyphicon-file"></i> 审核
-            </a>
-            <a class="btn btn-primary single disabled" onclick="comfirm(3)" shiro:hasPermission="finance:productprice:edit">
-                <i class="glyphicon glyphicon-check"></i> 核准
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-striped table-single">
-            <table id="bootstrap-table"></table>
-        </div>
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('finance:productprice:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('finance:productprice:remove')}]];
-    var prefix = ctx + "finance/productprice";
-
-    $(function () {
-        var options = {
-            url: prefix + "/list",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            // onClickRow: onClickRow,//行点击事件
-            modalName: "产品报价",
-            height: 600,
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'saleOrderID',
-                    title: '报价编号',
-                },
-                {
-                    field: 'wlCode',
-                    title: '成品代码',
-                },
-                {
-                    field: 'itemname',
-                    title: '成品名称',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value, 10, "open");
-                    }
-                },
-                {
-                    field: 'itemstandard',
-                    title: '规格型号',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value, 10, "open");
-                    }
-                },
-                {
-                    field: 'machineNo',
-                    title: '机种',
-                    formatter: function (value, row, index) {
-                        return $.table.tooltip(value);
-                    }
-                },
-                {
-                    field: 'stockDw',
-                    title: '单位',
-                    // align: 'left',
-                },
-                {
-                    field: 'crlName',
-                    title: '币别',
-                },
-                {
-                    field: 'rmbPrice',
-                    title: '单价',
-                },
-                {
-                    field: 'pCode',
-                    title: '客户编号',
-                },
-                {
-                    field: 'pName',
-                    title: '客户名称',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value, 10, "open");
-                    },
-
-                },
-                {
-                    field: 'SendDate',
-                    title: '定价日期',
-                    // formatter: function (value, row, index) {
-                    //     return $.table.tooltip(value);
-                    // },
-                    // cellStyle: function (value, row, index) {
-                    //     return {
-                    //         css: {
-                    //             "min-width": "50px",
-                    //             "text-overflow": "ellipsis",
-                    //             "overflow": "hidden",
-                    //             "max-width": "50px",
-                    //             "white-space": "nowrap"
-                    //         }
-                    //     }
-                    // }
-                },
-                {
-                    field: 'memoText',
-                    title: '说明',
-                    // cellStyle: function (value, row, index) {
-                    //     return {
-                    //         css: {
-                    //             "min-width": "150px",
-                    //             "text-overflow": "ellipsis",
-                    //             "overflow": "hidden",
-                    //             "max-width": "170px",
-                    //             "white-space": "nowrap"
-                    //         }
-                    //     }
-                    // }
-                },
-                // {
-                //     field: 'IsNowPrice',
-                //     title: '',
-                //     visible: false
-                // },
-                {
-                    field: 'comfirmFlag',
-                    title: '是否确认',
-                    formatter: function (value, row, index) {
-                        if (value == 1){
-                            value = "是"
-                            return value
-                        } else {
-                            value = "否"
-                            return value
-                        }
-                    }
-                },
-                {
-                    field: 'comfirmMan',
-                    title: '确认人'
-                },
-                {
-                    field: 'comfirmDate',
-                    title: '确认时间',
-                    formatter: function (value, row, index) {
-                        return $.table.tooltip(value);
-                    }
-                },
-                {
-                    field: 'writeMan',
-                    title: '登记人'
-                },
-                {
-                    field: 'auditingFlag',
-                    title: '是否审核',
-                    formatter: function (value, row, index) {
-                        if (value == 1){
-                            value = "是"
-                            return value
-                        } else {
-                            value = "否"
-                            return value
-                        }
-                    }
-                },
-                {
-                    field: 'auditingMan',
-                    title: '审核人'
-                },
-                {
-                    field: 'auditingDatetime',
-                    title: '审核时间',
-                    formatter: function (value, row, index) {
-                        return $.table.tooltip(value);
-                    }
-                },
-                {
-                    field: 'approveFlag',
-                    title: '是否核准',
-                    formatter: function (value, row, index) {
-                        if (value == 1){
-                            value = "是"
-                            return value
-                        } else {
-                            value = "否"
-                            return value
-                        }
-                    }
-                },
-                {
-                    field: 'approveMan',
-                    title: '核准人'
-                },
-                {
-                    field: 'approveDate',
-                    title: '核准时间',
-                    formatter: function (value, row, index) {
-                        return $.table.tooltip(value);
-                    }
-                },
-                {
-                    field: 'taxFlag',
-                    title: '是否含税'
-                },
-                {
-                    field: 'taxPercent',
-                    title: '税率'
-                },
-                {
-                    field: 'noTaxPrice',
-                    title: '不含税价'
-                },
-                {
-                    field: 'taxPrice',
-                    title: '含税价'
-                },
-                // {
-                //     field: 'rmbPrice',
-                //     title: '不含税价',
-                //     visible: false
-                // },
-                // {
-                //     field: 'taxFlag',
-                //     title: '',
-                //     visible: false
-                // },
-                // {
-                //     field: 'lastPrice',
-                //     title: '',
-                //     visible: false
-                // },
-                // {
-                //     field: 'lastCrlName',
-                //     title: '',
-                //     visible: false
-                // },
-                {
-                    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.saleOrderID + '\')"><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.saleOrderID + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-        };
-        $.table.init(options);
-    });
-
-    function onClickRow(row, $element, field) {
-        console.log("row" + JSON.stringify(row))
-    }
-
-
-    Date.prototype.Format = function (fmt) {
-        var o = {
-            "M+": this.getMonth() + 1, //月份
-            "d+": this.getDate(), //日
-            "H+": this.getHours(), //小时
-            "m+": this.getMinutes(), //分
-            "s+": this.getSeconds(), //秒
-            "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-            "S": this.getMilliseconds() //毫秒
-        };
-        if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-        for (var k in o)
-            if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-        return fmt;
-    }
-
-
-
-
-    function comfirm(tite) {
-        table.set();
-        $.modal.confirm("你确定数据正确，决定要确认吗？ ", function() {
-            var SaleOrderID = $.table.selectFirstColumns();
-            var  userName = [[${@permission.getPrincipalProperty('userName')}]];
-            var date = new Date().Format("yyyy-MM-dd HH:mm:ss");
-            var date = {"Id":SaleOrderID.join(),"Name":userName,"Date":date}
-            if (tite == 1) {
-                var key = "comfirm";
-                var value = "comfirm";
-                var url = prefix + "/edit/comfirm";
-            }
-            if (tite == 2) {
-                var key = "auditing";
-                var value = "auditing";
-                var url = prefix + "/edit/auditing";
-            }
-            if (tite == 3) {
-                var key = "approve";
-                var value = "approve";
-                var url = prefix + "/edit/approve";
-            }
-            date[key] = value
-            console.log(date)
-            $.operate.submit(url, "post", "json",date);
-        });
-    }
-
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/add.html b/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/add.html
deleted file mode 100644
index d5630022..00000000
--- a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/add.html
+++ /dev/null
@@ -1,484 +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">
-</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-stockAdjust-add">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">登记日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="registerDate" class="form-control time-input" placeholder="yyyy-MM-dd" type="text"
-                               disabled>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">物料类别：</label>
-                <div class="col-sm-8">
-                    <select name="itemType" class="form-control m-b"
-                            th:with="type=${@dict.getType('ck_meterialt_type')}">
-                        <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="stockNo" class="form-control m-b" disabled>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-                    <select name="stockName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">物料代码：</label>
-                <div class="col-sm-8">
-                    <input name="itemCode" 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="machineType" 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="itemSpecification" 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="unit" 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="customerNo" class="form-control m-b" disabled>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">客户名称：</label>
-                <div class="col-sm-8">
-                    <select name="customerName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">批号：</label>
-                <div class="col-sm-8">
-                    <input name="batchNumber" 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="adjustQty" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">调整卷/PCS量：</label>
-                <div class="col-sm-8">
-                    <input name="adjustReel" 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="remark" 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="spare1" 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="spare2" 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="spare3" 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="spare4" 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="spare5" 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="spare6" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-        </form>
-
-        <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" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="formId">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">物料代码：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="wlCode" name="wlCode">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="wlCodeSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="wlTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectWl();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var prefix = ctx + "stock/stockAdjust"
-    $("#form-stockAdjust-add").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/add", $('#form-stockAdjust-add').serialize());
-        }
-    }
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(JSON.stringify(data));
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                    $("select[name='stockNo']").append("<option value='" + data[i].stockNO + "'>" + data[i].stockNO + "</option>");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    //修改仓库名时 改变仓库号
-    $("select[name='stockName']").change(function () {
-        let stockName = $(this).val();
-        $.ajax({
-            url: ctx + "stock/stockInfo/all",
-            data: {"Stockname": stockName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    let stockList = resp.data;
-                    //alert(JSON.stringify(stockList));
-                    $("select[name='stockNo']").val(stockList[0].stockNO).trigger("change");
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    })
-
-    //获取客户代码和名称
-    $.ajax({
-        url: ctx + "finance/customer/getName",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                if (resp.data.length > 0) {
-                    // $("select[name='customerName']").empty();
-                    let data = resp.data;
-                    //alert(data);
-                    for (let i in data) {
-                        $("select[name='customerName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                        $("select[name='customerNo']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    }
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错啦！");
-        }
-    })
-
-    //修改客户名称时 改变客户号
-    $("select[name='customerName']").change(function () {
-        let customerName = $(this).val();
-        $.ajax({
-            url: ctx + "finance/customer/item",
-            data: {"pName": customerName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    let list = resp.data;
-                    //alert(JSON.stringify(stockList));
-                    $("select[name='customerNo']").val(list[0].pCode).trigger("change");
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    })
-
-    //获取今天日期
-    let today = new Date();
-    today.setTime(today.getTime());
-    let time = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
-    $("input[name='registerDate']").val(time);
-
-    //打开选择物料页面
-    $("input[name='itemCode']").on("click", function () {
-        //$("#itemModal").show();
-        $("#itemModal").modal("show");
-    })
-
-    //搜索物料列表
-    $("#wlCodeSearch").on("click", function () {
-        $("#wlTable").bootstrapTable('refresh');
-        $("#wlCode").val("");
-    })
-
-    //选择物料列表
-    $('#wlTable').bootstrapTable({
-        url: '/stock/warehouse/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("formId"));
-            //console.log(json);
-            return json;
-        },
-        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: 'machineNo',
-                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: 'qty',
-                title: '数量'
-            },
-            {
-                field: 'warehouseName',
-                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: 'warehouseNo',
-                title: '仓库号'
-            },
-        ]
-    });
-
-    //点击选择物料
-    function selectWl() {
-        let row = $("#wlTable").bootstrapTable("getSelections");
-        //console.log(row);
-        //$("#itemModal").hide();
-        $("#itemModal").modal("hide");
-        $("input[name='itemCode']").val(row[0].wlCode);
-        $("input[name='itemName']").val(row[0].itemName);
-        $("input[name='machineType']").val(row[0].machineNo);
-        $("input[name='itemSpecification']").val(row[0].itemStandard);
-        $("input[name='unit']").val(row[0].stockDw);
-        $("select[name='stockName']").val(row[0].warehouseName).trigger("change");
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/edit.html b/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/edit.html
deleted file mode 100644
index dc347bdd..00000000
--- a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/edit.html
+++ /dev/null
@@ -1,491 +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">
-</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-stockAdjust-edit" th:object="${stockAdjust}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">登记日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="registerDate" th:value="${#dates.format(stockAdjust.registerDate, 'yyyy-MM-dd')}"
-                               class="form-control time-input" placeholder="yyyy-MM-dd" type="text" disabled>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">物料类别：</label>
-                <div class="col-sm-8">
-                    <select name="itemType" class="form-control m-b"
-                            th:with="type=${@dict.getType('ck_meterialt_type')}">
-                        <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="stockNo" class="form-control m-b" disabled>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-                    <select name="stockName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">物料代码：</label>
-                <div class="col-sm-8">
-                    <input name="itemCode" th:field="*{itemCode}" 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="machineType" th:field="*{machineType}" 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="itemSpecification" th:field="*{itemSpecification}" 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="unit" th:field="*{unit}" 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="customerNo" class="form-control m-b" disabled>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">客户名称：</label>
-                <div class="col-sm-8">
-                    <select name="customerName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">批号：</label>
-                <div class="col-sm-8">
-                    <input name="batchNumber" th:field="*{batchNumber}" 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="adjustQty" th:field="*{adjustQty}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">调整卷/PCS量：</label>
-                <div class="col-sm-8">
-                    <input name="adjustReel" th:field="*{adjustReel}" 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="remark" th:field="*{remark}" 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="spare1" th:field="*{spare1}" 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="spare2" th:field="*{spare2}" 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="spare3" th:field="*{spare3}" 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="spare4" th:field="*{spare4}" 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="spare5" th:field="*{spare5}" 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="spare6" th:field="*{spare6}" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-        </form>
-
-        <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" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="formId">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">物料代码：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="wlCode" name="wlCode">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="wlCodeSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="wlTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectWl();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var prefix = ctx + "stock/stockAdjust";
-    $("#form-stockAdjust-edit").validate({
-        focusCleanup: true
-    });
-
-    //获取返回数据
-    let stockAdjust = [[${stockAdjust}]];
-    $("select[name='itemType']").val(stockAdjust.itemType).trigger("change");
-
-    function submitHandler() {
-        if ($.validate.form()) {
-            $.operate.save(prefix + "/edit", $('#form-stockAdjust-edit').serialize());
-        }
-    }
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(JSON.stringify(data));
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                    $("select[name='stockNo']").append("<option value='" + data[i].stockNO + "'>" + data[i].stockNO + "</option>");
-                }
-                $("select[name='stockName']").val(stockAdjust.stockName).trigger("change");
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    //修改仓库名时 改变仓库号
-    $("select[name='stockName']").change(function () {
-        let stockName = $(this).val();
-        $.ajax({
-            url: ctx + "stock/stockInfo/all",
-            data: {"Stockname": stockName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    let stockList = resp.data;
-                    //alert(JSON.stringify(stockList));
-                    $("select[name='stockNo']").val(stockList[0].stockNO).trigger("change");
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    })
-
-    //获取客户代码和名称
-    $.ajax({
-        url: ctx + "finance/customer/getName",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                if (resp.data.length > 0) {
-                    // $("select[name='customerName']").empty();
-                    let data = resp.data;
-                    //alert(data);
-                    for (let i in data) {
-                        $("select[name='customerName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                        $("select[name='customerNo']").append("<option value='" + data[i].pCode + "'>" + data[i].pCode + "</option>");
-                    }
-                    $("select[name='customerName']").val(stockAdjust.customerName).trigger("change");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错啦！");
-        }
-    })
-
-    //修改客户名称时 改变客户号
-    $("select[name='customerName']").change(function () {
-        let customerName = $(this).val();
-        $.ajax({
-            url: ctx + "finance/customer/item",
-            data: {"pName": customerName},
-            type: "post",
-            resultType: "json",
-            success: function (resp) {
-                if (resp.code === 0) {
-                    let list = resp.data;
-                    //alert(JSON.stringify(stockList));
-                    $("select[name='customerNo']").val(list[0].pCode).trigger("change");
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        })
-    })
-
-    //获取今天日期
-    let today = new Date();
-    today.setTime(today.getTime());
-    let time = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
-    $("input[name='registerDate']").val(time);
-
-    //打开选择物料页面
-    $("input[name='itemCode']").on("click", function () {
-        //$("#itemModal").show();
-        $("#itemModal").modal("show");
-    })
-
-    //搜索物料列表
-    $("#wlCodeSearch").on("click", function () {
-        $("#wlTable").bootstrapTable('refresh');
-        $("#wlCode").val("");
-    })
-
-    //选择物料列表
-    $('#wlTable').bootstrapTable({
-        url: '/stock/warehouse/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("formId"));
-            //console.log(json);
-            return json;
-        },
-        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: 'machineNo',
-                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: 'qty',
-                title: '数量'
-            },
-            {
-                field: 'warehouseName',
-                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: 'warehouseNo',
-                title: '仓库号'
-            },
-        ]
-    });
-
-    //点击选择物料
-    function selectWl() {
-        let row = $("#wlTable").bootstrapTable("getSelections");
-        //console.log(row);
-        //$("#itemModal").hide();
-        $("#itemModal").modal("hide");
-        $("input[name='itemCode']").val(row[0].wlCode);
-        $("input[name='itemName']").val(row[0].itemName);
-        $("input[name='machineType']").val(row[0].machineNo);
-        $("input[name='itemSpecification']").val(row[0].itemStandard);
-        $("input[name='unit']").val(row[0].stockDw);
-        $("select[name='stockName']").val(row[0].warehouseName).trigger("change");
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/stockAdjust.html b/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/stockAdjust.html
deleted file mode 100644
index e7e4f1d3..00000000
--- a/ruoyi-admin/src/main/resources/templates/stock/stockAdjust/stockAdjust.html
+++ /dev/null
@@ -1,364 +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="id"/>-->
-                        <!--                            </li>-->
-                        <li class="select-time">
-                            <label>登记日期：</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
-                                   name="params[beginRegisterDate]"/>
-                            <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
-                                   name="params[endRegisterDate]"/>
-                        </li>
-                        <li>
-                            <label>物料类别：</label>
-                            <select name="itemType" class="form-control m-b"
-                                    th:with="type=${@dict.getType('ck_meterialt_type')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <!--                            <li>-->
-                        <!--                                <label>仓库号：</label>-->
-                        <!--                                <select name="stockNo">-->
-                        <!--                                    <option value="">所有</option>-->
-                        <!--                                    <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                                </select>-->
-                        <!--                            </li>-->
-                        <li>
-                            <label>仓库名称：</label>
-                            <select name="stockName" class="form-control m-b">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>物料代码：</label>
-                            <input type="text" name="itemCode"/>
-                        </li>
-                        <!--                            <li>-->
-                        <!--                                <label>物料名称：</label>-->
-                        <!--                                <input type="text" name="itemName"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>机种：</label>-->
-                        <!--                                <select name="machineType">-->
-                        <!--                                    <option value="">所有</option>-->
-                        <!--                                    <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                                </select>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>规格型号：</label>-->
-                        <!--                                <input type="text" name="itemSpecification"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>单位：</label>-->
-                        <!--                                <input type="text" name="unit"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>客户号：</label>-->
-                        <!--                                <select name="customerNo">-->
-                        <!--                                    <option value="">所有</option>-->
-                        <!--                                    <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                                </select>-->
-                        <!--                            </li>-->
-                        <li>
-                            <label>客户名称：</label>
-                            <select name="customerName" class="form-control m-b">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <!--                            <li>-->
-                        <!--                                <label>批号：</label>-->
-                        <!--                                <input type="text" name="batchNumber"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>调整数量：</label>-->
-                        <!--                                <input type="text" name="adjustQty"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>调整卷/PCS量：</label>-->
-                        <!--                                <input type="text" name="adjustReel"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare1"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare2"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare3"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare4"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare5"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare6"/>-->
-                        <!--                            </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="stock:stockAdjust:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="stock:stockAdjust:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick=""
-               shiro:hasPermission="stock:stockAdjust:remove" disabled>
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="stock:stockAdjust:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-            <a class="btn btn-primary single disabled" onclick="updateInventory()"
-               shiro:hasPermission="stock:stockAdjust:edit">
-                <i class="fa fa-edit"></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:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('stock:stockAdjust:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('stock:stockAdjust:remove')}]];
-    var prefix = ctx + "stock/stockAdjust";
-
-    $(function () {
-        var options = {
-            url: prefix + "/list",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            modalName: "库存调整",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'id',
-                    title: '编号',
-                    visible: false
-                },
-                {
-                    field: 'registerDate',
-                    title: '登记日期'
-                },
-                {
-                    field: 'itemType',
-                    title: '物料类别'
-                },
-                {
-                    field: 'stockNo',
-                    title: '仓库号'
-                },
-                {
-                    field: 'stockName',
-                    title: '仓库名称'
-                },
-                {
-                    field: 'itemCode',
-                    title: '物料代码'
-                },
-                {
-                    field: 'itemName',
-                    title: '物料名称'
-                },
-                {
-                    field: 'machineType',
-                    title: '机种'
-                },
-                {
-                    field: 'itemSpecification',
-                    title: '规格型号'
-                },
-                {
-                    field: 'unit',
-                    title: '单位'
-                },
-                {
-                    field: 'customerNo',
-                    title: '客户号'
-                },
-                {
-                    field: 'customerName',
-                    title: '客户名称'
-                },
-                {
-                    field: 'batchNumber',
-                    title: '批号'
-                },
-                {
-                    field: 'adjustQty',
-                    title: '调整数量'
-                },
-                {
-                    field: 'adjustReel',
-                    title: '调整卷/PCS量'
-                },
-                {
-                    field: 'remark',
-                    title: '备注'
-                },
-                {
-                    field: 'spare1',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'spare2',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'spare3',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'spare4',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'spare5',
-                    title: '',
-                    visible: false
-                },
-                {
-                    field: 'spare6',
-                    title: '',
-                    visible: false
-                },
-                {
-                    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="" disabled><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="" disabled><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-        };
-        $.table.init(options);
-    });
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(data);
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    //获取客户代码和名称
-    $.ajax({
-        url: ctx + "finance/customer/getName",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                if (resp.data.length > 0) {
-                    // $("select[name='customerName']").empty();
-                    let data = resp.data;
-                    //alert(data);
-                    for (let i in data) {
-                        $("select[name='customerName']").append("<option value='" + data[i].pName + "'>" + data[i].pName + "</option>");
-                    }
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("出错啦！");
-        }
-    })
-
-    //重置
-    function reset() {
-        $("select[name='stockName']").val("").select2();
-        $("select[name='customerName']").val("").select2();
-        $("select[name='itemType']").val("").select2();
-        $.form.reset();
-    }
-
-    //更新库存
-    function updateInventory(){
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        $.modal.confirm("是否确定更新？", function () {
-            $.ajax({
-                url: prefix + "/inventory",
-                type: "post",
-                dataType: "json",
-                data: {"id":row[0].id,"itemCode":row[0].itemCode},
-                success: function (resp) {
-                    if (resp.code === 0) {
-                        //$.modal.msgSuccess("更新成功！");
-                        alert("更新成功！");
-                        window.location.reload();
-                    } else {
-                        $.modal.msgError(resp.msg);
-                    }
-                },
-                error: function () {
-                    $.modal.msgError("后台出错啦！");
-                }
-            })
-        });
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file