From 81fc4941f145908ba11dafcfe1c3536e9d636fac Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 21 Oct 2024 09:33:08 +0800 Subject: [PATCH] =?UTF-8?q?[delete]=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20customer=E5=92=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E4=BA=A7=E5=93=81=E6=8A=A5=E4=BB=B7=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=20productprice=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4=E5=AF=B9=E8=B1=A1=20stock=5Fadjust?= =?UTF-8?q?=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerController.java | 186 ---- .../controller/ProductpriceController.java | 235 ----- .../com/ruoyi/finance/domain/Customer.java | 819 ------------------ .../ruoyi/finance/domain/Productprice.java | 452 ---------- .../ruoyi/finance/mapper/CustomerMapper.java | 84 -- .../finance/mapper/ProductpriceMapper.java | 98 --- .../finance/service/ICustomerService.java | 83 -- .../finance/service/IProductpriceService.java | 97 --- .../service/impl/CustomerServiceImpl.java | 128 --- .../service/impl/ProductpriceServiceImpl.java | 155 ---- .../controller/StockAdjustController.java | 130 --- .../com/ruoyi/stock/domain/StockAdjust.java | 323 ------- .../ruoyi/stock/mapper/StockAdjustMapper.java | 62 -- .../stock/service/IStockAdjustService.java | 64 -- .../service/impl/StockAdjustServiceImpl.java | 130 --- .../mapper/finance/CustomerMapper.xml | 335 ------- .../mapper/finance/ProductpriceMapper.xml | 217 ----- .../mapper/stock/StockAdjustMapper.xml | 160 ---- .../templates/finance/customer/add.html | 370 -------- .../templates/finance/customer/customer.html | 461 ---------- .../templates/finance/customer/edit.html | 333 ------- .../templates/finance/productprice/add.html | 430 --------- .../templates/finance/productprice/edit.html | 243 ------ .../finance/productprice/productprice.html | 365 -------- .../templates/stock/stockAdjust/add.html | 484 ----------- .../templates/stock/stockAdjust/edit.html | 491 ----------- .../stock/stockAdjust/stockAdjust.html | 364 -------- 27 files changed, 7299 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/controller/CustomerController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/controller/ProductpriceController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Customer.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/domain/Productprice.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/CustomerMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/mapper/ProductpriceMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/service/ICustomerService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/service/IProductpriceService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/CustomerServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/finance/service/impl/ProductpriceServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/controller/StockAdjustController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockAdjust.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/StockAdjustMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/IStockAdjustService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/StockAdjustServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/finance/CustomerMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/finance/ProductpriceMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/StockAdjustMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/customer/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/customer/customer.html delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/customer/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/productprice/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/productprice/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/finance/productprice/productprice.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/stockAdjust/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/stockAdjust/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/stockAdjust/stockAdjust.html 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 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 list = customerService.selectCustomerList(customer); - ExcelUtil util = new ExcelUtil(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 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 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 list = productpriceService.selectProductpriceList(productprice); - ExcelUtil util = new ExcelUtil(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 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 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 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 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 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 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 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 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 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 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 list = stockAdjustService.selectStockAdjustList(stockAdjust); - ExcelUtil util = new ExcelUtil(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 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 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 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - insert into customer - - 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, - - - #{pCode}, - #{pName}, - #{pEnName}, - #{pAddress}, - #{pPost}, - #{pCountry}, - #{pCeo}, - #{pLinkman}, - #{pTel}, - #{pFax}, - #{pEmail}, - #{pHttp}, - #{pCiqCode}, - #{pComCode}, - #{pHyCode}, - #{pType}, - #{pCreatDate}, - #{pJhbank}, - #{pJhbankCode}, - #{pBank}, - #{pBankCode}, - #{pRmbMoney}, - #{pWbType}, - #{pWbMoney}, - #{memoText}, - #{moral}, - #{comfirmFlag}, - #{comfirmMan}, - #{comfirmDate}, - #{writeMan}, - #{auditingFlag}, - #{auditingMan}, - #{auditingDate}, - #{approveFlag}, - #{approveMan}, - #{approveDate}, - #{writeDate}, - #{memotext}, - #{creditAmt}, - #{PID}, - #{NWX}, - #{ordernoLen}, - #{sendcpReportname}, - #{saler}, - #{dWaterNo}, - #{sWaterName}, - #{sWaterNo}, - #{comCode}, - #{crlName}, - #{pCountryCode}, - #{CID}, - #{senduseConfirm}, - #{taxPercent}, - #{senddw}, - #{taxFlag}, - - - - - update customer - - P_Name = #{pName}, - P_EN_NAME = #{pEnName}, - P_Address = #{pAddress}, - P_Post = #{pPost}, - P_Country = #{pCountry}, - P_CEO = #{pCeo}, - P_LinkMan = #{pLinkman}, - P_TEL = #{pTel}, - P_FAX = #{pFax}, - P_EMAIL = #{pEmail}, - P_HTTP = #{pHttp}, - P_CIQ_CODE = #{pCiqCode}, - P_COM_CODE = #{pComCode}, - P_HY_CODE = #{pHyCode}, - P_TYPE = #{pType}, - P_Creat_Date = #{pCreatDate}, - P_JHbank = #{pJhbank}, - P_JHbank_code = #{pJhbankCode}, - P_bank = #{pBank}, - P_bank_code = #{pBankCode}, - P_RMB_MONEY = #{pRmbMoney}, - P_WB_TYPE = #{pWbType}, - P_WB_MONEY = #{pWbMoney}, - memo_text = #{memoText}, - moral = #{moral}, - comfirm_flag = #{comfirmFlag}, - comfirm_man = #{comfirmMan}, - comfirm_DATE = #{comfirmDate}, - write_man = #{writeMan}, - Auditing_Flag = #{auditingFlag}, - Auditing_man = #{auditingMan}, - Auditing_Date = #{auditingDate}, - Approve_flag = #{approveFlag}, - Approve_man = #{approveMan}, - Approve_date = #{approveDate}, - write_date = #{writeDate}, - memotext = #{memotext}, - Credit_Amt = #{creditAmt}, - PID = #{PID}, - NWX = #{NWX}, - OrderNO_Len = #{ordernoLen}, - SendCP_ReportName = #{sendcpReportname}, - saler = #{saler}, - d_water_no = #{dWaterNo}, - S_Water_Name = #{sWaterName}, - S_Water_NO = #{sWaterNo}, - Com_Code = #{comCode}, - Crl_Name = #{crlName}, - P_Country_Code = #{pCountryCode}, - CID = #{CID}, - SendUse_Confirm = #{senduseConfirm}, - TAX_Percent = #{taxPercent}, - senddw = #{senddw}, - tax_flag = #{taxFlag}, - - where P_Code = #{pCode} - - - - UPDATE customer SET comfirm_flag = '1',comfirm_man = #{Name},comfirm_DATE = #{Date} WHERE P_Code = #{Id} - - - - delete from customer where P_Code = #{pCode} - - - - delete from customer where P_Code in - - #{pCode} - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - insert into productprice - - 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, - - - #{SaleOrderID}, - #{wlCode}, - #{Itemname}, - #{Itemstandard}, - #{machineNo}, - #{stockDw}, - #{crlName}, - #{Price}, - #{pCode}, - #{pName}, - #{SendDate}, - #{memoText}, - #{IsNowPrice}, - #{rmbPrice}, - #{taxFlag}, - #{comfirmFlag}, - #{comfirmMan}, - #{comfirmDate}, - #{writeMan}, - #{auditingFlag}, - #{auditingMan}, - #{auditingDatetime}, - #{approveFlag}, - #{approveMan}, - #{approveDate}, - #{lastPrice}, - #{lastCrlName}, - #{taxPercent}, - #{noTaxPrice}, - #{taxPrice}, - - - - - update productprice - - Wl_Code = #{wlCode}, - Itemname = #{Itemname}, - Itemstandard = #{Itemstandard}, - Machine_no = #{machineNo}, - Stock_dw = #{stockDw}, - Crl_Name = #{crlName}, - Price = #{Price}, - P_Code = #{pCode}, - P_Name = #{pName}, - SendDate = #{SendDate}, - Memo_TEXT = #{memoText}, - IsNowPrice = #{IsNowPrice}, - RMB_Price = #{rmbPrice}, - Tax_flag = #{taxFlag}, - ComFirm_Flag = #{comfirmFlag}, - ComFirm_MAN = #{comfirmMan}, - ComFirm_Date = #{comfirmDate}, - write_man = #{writeMan}, - Auditing_Flag = #{auditingFlag}, - Auditing_man = #{auditingMan}, - Auditing_Datetime = #{auditingDatetime}, - Approve_flag = #{approveFlag}, - Approve_MAN = #{approveMan}, - Approve_DATE = #{approveDate}, - last_price = #{lastPrice}, - last_crl_name = #{lastCrlName}, - tax_percent = #{taxPercent}, - no_tax_price = #{noTaxPrice}, - tax_price = #{taxPrice}, - - where SaleOrderID = #{SaleOrderID} - - - - UPDATE productprice SET ComFirm_Flag = '1',ComFirm_MAN = #{Name},ComFirm_Date = #{Date} WHERE SaleOrderID = #{Id} - - - UPDATE productprice SET Auditing_Flag = '1',Auditing_man = #{Name},Auditing_Datetime = #{Date} WHERE SaleOrderID = #{Id} - - - UPDATE productprice SET Approve_flag = '1',Approve_MAN = #{Name},Approve_DATE = #{Date} WHERE SaleOrderID = #{Id} - - - - - delete from productprice where SaleOrderID = #{SaleOrderID} - - - - delete from productprice where SaleOrderID in - - #{SaleOrderID} - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into stock_adjust - - id, - registerDate, - itemType, - stockNo, - stockName, - itemCode, - itemName, - machineType, - itemSpecification, - unit, - customerNo, - customerName, - batchNumber, - adjustQty, - adjustReel, - remark, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - - - #{id}, - #{registerDate}, - #{itemType}, - #{stockNo}, - #{stockName}, - #{itemCode}, - #{itemName}, - #{machineType}, - #{itemSpecification}, - #{unit}, - #{customerNo}, - #{customerName}, - #{batchNumber}, - #{adjustQty}, - #{adjustReel}, - #{remark}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - - - - - update stock_adjust - - registerDate = #{registerDate}, - itemType = #{itemType}, - stockNo = #{stockNo}, - stockName = #{stockName}, - itemCode = #{itemCode}, - itemName = #{itemName}, - machineType = #{machineType}, - itemSpecification = #{itemSpecification}, - unit = #{unit}, - customerNo = #{customerNo}, - customerName = #{customerName}, - batchNumber = #{batchNumber}, - adjustQty = #{adjustQty}, - adjustReel = #{adjustReel}, - remark = #{remark}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - - where id = #{id} - - - - delete from stock_adjust where id = #{id} - - - - delete from stock_adjust where id in - - #{id} - - - - \ 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 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - -
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - -
- -
- - -
-
-
-
- - - - - \ 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 @@ - - - - - - - -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - -
- - - - - - - \ 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 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
- - - - - - -
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - \ 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 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - \ 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 @@ - - - - - - - - - -
-
-
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- - - - - - \ 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 @@ - - - - - - - - - -
-
-
- -
-
- -
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- - - - - - \ 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 @@ - - - - - - - - -
-
-
-
-
-
    - - - - -
  • - - - - - -
  • -
  • - - -
  • - - - - - - - -
  • - - -
  • -
  • - - -
  • - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • - - -
  • - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - - \ No newline at end of file