From ce9f21baa89b1b1553481ff3456862fc4e358490 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 21 Oct 2024 09:12:36 +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=E7=9B=98=E5=BA=95=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=20check=5Flist=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stock/controller/CheckListController.java | 144 --------- .../com/ruoyi/stock/domain/CheckList.java | 289 ------------------ .../ruoyi/stock/mapper/CheckListMapper.java | 68 ----- .../stock/service/ICheckListService.java | 68 ----- .../service/impl/CheckListServiceImpl.java | 117 ------- .../mapper/stock/CheckListMapper.xml | 156 ---------- .../templates/stock/checkList/add.html | 145 --------- .../templates/stock/checkList/checkList.html | 227 -------------- .../templates/stock/checkList/edit.html | 140 --------- 9 files changed, 1354 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/controller/CheckListController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckList.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/CheckListMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/ICheckListService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/CheckListServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/stock/CheckListMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/checkList/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/checkList/checkList.html delete mode 100644 ruoyi-admin/src/main/resources/templates/stock/checkList/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/CheckListController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/CheckListController.java deleted file mode 100644 index 37d8b703..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/CheckListController.java +++ /dev/null @@ -1,144 +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.CheckList; -import com.ruoyi.stock.service.ICheckListService; -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-20 - */ -@Controller -@RequestMapping("/stock/checkList") -public class CheckListController extends BaseController -{ - private String prefix = "stock/checkList"; - - @Autowired - private ICheckListService checkListService; - - @RequiresPermissions("stock:checkList:view") - @GetMapping() - public String checkList() - { - return prefix + "/checkList"; - } - - /** - * 查询盘底列表 - */ - @RequiresPermissions("stock:checkList:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(CheckList checkList) - { - startPage(); - List list = checkListService.selectCheckListList(checkList); - return getDataTable(list); - } - - /** - * 导出盘底列表 - */ - @RequiresPermissions("stock:checkList:export") - @Log(title = "盘底", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(CheckList checkList) - { - List list = checkListService.selectCheckListList(checkList); - ExcelUtil util = new ExcelUtil(CheckList.class); - return util.exportExcel(list, "盘底数据"); - } - - /** - * 新增盘底 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存盘底 - */ - @RequiresPermissions("stock:checkList:add") - @Log(title = "盘底", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(CheckList checkList) - { - return toAjax(checkListService.insertCheckList(checkList)); - } - - /** - * 修改盘底 - */ - @GetMapping("/edit/{checkId}") - public String edit(@PathVariable("checkId") String checkId, ModelMap mmap) - { - CheckList checkList = checkListService.selectCheckListById(checkId); - mmap.put("checkList", checkList); - return prefix + "/edit"; - } - - /** - * 修改保存盘底 - */ - @RequiresPermissions("stock:checkList:edit") - @Log(title = "盘底", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(CheckList checkList) - { - return toAjax(checkListService.updateCheckList(checkList)); - } - - /** - * 删除盘底 - */ - @RequiresPermissions("stock:checkList:remove") - @Log(title = "盘底", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(checkListService.deleteCheckListByIds(ids)); - } - - @ResponseBody - @PostMapping("/isUpdate") - public Result selectByCheckIdWithItemCode(CheckList checkList)throws Exception{ - CheckList get = checkListService.selectByCheckIdWithItemCode(checkList); - String isUpdate = get.getIsUpdate(); - if ("1".equals(isUpdate)){ - return Result.getFailResult("已更新，无法修改！", null); - }else { - return Result.getSuccessResult(null); - } - } - - //更新库存 - @ResponseBody - @PostMapping("/inventory") - public Result updateInventory(CheckList checkList)throws Exception{ - System.out.println(checkList); - return Result.getSuccessResult(checkListService.updateInventory(checkList)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckList.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckList.java deleted file mode 100644 index 5ad578a5..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/CheckList.java +++ /dev/null @@ -1,289 +0,0 @@ -package com.ruoyi.stock.domain; - -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 盘底对象 check_list - * - * @author ruoyi - * @date 2021-12-20 - */ -public class CheckList extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 盘底单号 */ - @Excel(name = "盘底单号") - private String checkId; - - /** 项次 */ - @Excel(name = "项次") - private String itemNo; - - /** 物料代码 */ - @Excel(name = "物料代码") - private String itemCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String itemName; - - /** 物料规格 */ - @Excel(name = "物料规格") - private String itemSpecification; - - /** 机种 */ - @Excel(name = "机种") - private String machineType; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 数量 */ - @Excel(name = "数量") - private String qty; - - /** 目前数量 */ - @Excel(name = "目前数量") - private String nowQty; - - /** 盘底数量 */ - @Excel(name = "盘底数量") - private String checkQty; - - /** 批号 */ - @Excel(name = "批号") - private String batchNumber; - - /** 更新否 */ - @Excel(name = "更新否") - private String isUpdate; - - /** 存放位置 */ - @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; - - /** 备注 */ - @Excel(name = "备注") - private String remark; - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - public void setCheckId(String checkId) - { - this.checkId = checkId; - } - - public String getCheckId() - { - return checkId; - } - public void setItemNo(String itemNo) - { - this.itemNo = itemNo; - } - - public String getItemNo() - { - return itemNo; - } - 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 setItemSpecification(String itemSpecification) - { - this.itemSpecification = itemSpecification; - } - - public String getItemSpecification() - { - return itemSpecification; - } - public void setMachineType(String machineType) - { - this.machineType = machineType; - } - - public String getMachineType() - { - return machineType; - } - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - public void setQty(String qty) - { - this.qty = qty; - } - - public String getQty() - { - return qty; - } - public void setNowQty(String nowQty) - { - this.nowQty = nowQty; - } - - public String getNowQty() - { - return nowQty; - } - public void setCheckQty(String checkQty) - { - this.checkQty = checkQty; - } - - public String getCheckQty() - { - return checkQty; - } - public void setBatchNumber(String batchNumber) - { - this.batchNumber = batchNumber; - } - - public String getBatchNumber() - { - return batchNumber; - } - public void setIsUpdate(String isUpdate) - { - this.isUpdate = isUpdate; - } - - public String getIsUpdate() - { - return isUpdate; - } - 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 "CheckList{" + - "checkId='" + checkId + '\'' + - ", itemNo='" + itemNo + '\'' + - ", itemCode='" + itemCode + '\'' + - ", itemName='" + itemName + '\'' + - ", itemSpecification='" + itemSpecification + '\'' + - ", machineType='" + machineType + '\'' + - ", unit='" + unit + '\'' + - ", qty='" + qty + '\'' + - ", nowQty='" + nowQty + '\'' + - ", checkQty='" + checkQty + '\'' + - ", batchNumber='" + batchNumber + '\'' + - ", isUpdate='" + isUpdate + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare3='" + spare3 + '\'' + - ", spare4='" + spare4 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", remark='" + remark + '\'' + - '}'; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/CheckListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/CheckListMapper.java deleted file mode 100644 index f1c1c414..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/CheckListMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.stock.mapper; - -import com.ruoyi.stock.domain.CheckList; - -import java.util.List; - -/** - * 盘底Mapper接口 - * - * @author ruoyi - * @date 2021-12-20 - */ -public interface CheckListMapper -{ - /** - * 查询盘底 - * - * @param checkId 盘底ID - * @return 盘底 - */ - public CheckList selectCheckListById(String checkId); - - /** - * 查询盘底列表 - * - * @param checkList 盘底 - * @return 盘底集合 - */ - public List selectCheckListList(CheckList checkList); - - /** - * 新增盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - public int insertCheckList(CheckList checkList); - - /** - * 修改盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - public int updateCheckList(CheckList checkList); - - /** - * 删除盘底 - * - * @param checkId 盘底ID - * @return 结果 - */ - public int deleteCheckListById(String checkId); - - /** - * 批量删除盘底 - * - * @param checkIds 需要删除的数据ID - * @return 结果 - */ - public int deleteCheckListByIds(String[] checkIds); - - public List selectByCheckId(CheckList checkList); - - public CheckList selectByCheckIdWithItemCode(CheckList checkList); - - public int updateNowQty(CheckList checkList); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/ICheckListService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/ICheckListService.java deleted file mode 100644 index 31eb2a33..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/ICheckListService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.stock.service; - -import com.ruoyi.stock.domain.CheckList; - -import java.util.List; - -/** - * 盘底Service接口 - * - * @author ruoyi - * @date 2021-12-20 - */ -public interface ICheckListService -{ - /** - * 查询盘底 - * - * @param checkId 盘底ID - * @return 盘底 - */ - public CheckList selectCheckListById(String checkId); - - /** - * 查询盘底列表 - * - * @param checkList 盘底 - * @return 盘底集合 - */ - public List selectCheckListList(CheckList checkList); - - /** - * 新增盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - public int insertCheckList(CheckList checkList); - - /** - * 修改盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - public int updateCheckList(CheckList checkList); - - /** - * 批量删除盘底 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteCheckListByIds(String ids); - - /** - * 删除盘底信息 - * - * @param checkId 盘底ID - * @return 结果 - */ - public int deleteCheckListById(String checkId); - - public List selectByCheckId(CheckList checkList); - - public CheckList selectByCheckIdWithItemCode(CheckList checkList); - - public int updateInventory(CheckList checkList); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/CheckListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/CheckListServiceImpl.java deleted file mode 100644 index 9f9615d1..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/CheckListServiceImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.ruoyi.stock.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.stock.domain.CheckList; -import com.ruoyi.stock.domain.Warehouse; -import com.ruoyi.stock.mapper.CheckListMapper; -import com.ruoyi.stock.mapper.WarehouseMapper; -import com.ruoyi.stock.service.ICheckListService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 盘底Service业务层处理 - * - * @author ruoyi - * @date 2021-12-20 - */ -@Service -public class CheckListServiceImpl implements ICheckListService { - @Autowired - private CheckListMapper checkListMapper; - - @Autowired - private WarehouseMapper warehouseMapper; - - /** - * 查询盘底 - * - * @param checkId 盘底ID - * @return 盘底 - */ - @Override - public CheckList selectCheckListById(String checkId) { - return checkListMapper.selectCheckListById(checkId); - } - - /** - * 查询盘底列表 - * - * @param checkList 盘底 - * @return 盘底 - */ - @Override - public List selectCheckListList(CheckList checkList) { - return checkListMapper.selectCheckListList(checkList); - } - - /** - * 新增盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - @Override - public int insertCheckList(CheckList checkList) { - return checkListMapper.insertCheckList(checkList); - } - - /** - * 修改盘底 - * - * @param checkList 盘底 - * @return 结果 - */ - @Override - public int updateCheckList(CheckList checkList) { - return checkListMapper.updateCheckList(checkList); - } - - /** - * 删除盘底对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteCheckListByIds(String ids) { - return checkListMapper.deleteCheckListByIds(Convert.toStrArray(ids)); - } - - /** - * 删除盘底信息 - * - * @param checkId 盘底ID - * @return 结果 - */ - @Override - public int deleteCheckListById(String checkId) { - return checkListMapper.deleteCheckListById(checkId); - } - - @Override - public List selectByCheckId(CheckList checkList) { - return checkListMapper.selectByCheckId(checkList); - } - - @Override - public CheckList selectByCheckIdWithItemCode(CheckList checkList) { - return checkListMapper.selectByCheckIdWithItemCode(checkList); - } - - @Override - public int updateInventory(CheckList checkList) { - checkList.setIsUpdate("1"); - Warehouse warehouse = new Warehouse(); - warehouse.setWlCode(checkList.getItemCode()); - Warehouse getWarehouse = warehouseMapper.selectByCode(warehouse); - if (getWarehouse != null) { - checkList.setNowQty(getWarehouse.getQty() + ""); - } else { - checkList.setNowQty("0"); - } - return checkListMapper.updateNowQty(checkList); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/stock/CheckListMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/CheckListMapper.xml deleted file mode 100644 index c93aeec7..00000000 --- a/ruoyi-admin/src/main/resources/mapper/stock/CheckListMapper.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select checkId, itemNo, itemCode, itemName, itemSpecification, machineType, unit, qty, nowQty, remark, checkQty, batchNumber, isUpdate, spare1, spare2, spare3, spare4, spare5, spare6 from check_list - - - - - - - - insert into check_list - - checkId, - itemNo, - itemCode, - itemName, - itemSpecification, - machineType, - unit, - qty, - nowQty, - remark, - checkQty, - batchNumber, - isUpdate, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - - - #{checkId}, - #{itemNo}, - #{itemCode}, - #{itemName}, - #{itemSpecification}, - #{machineType}, - #{unit}, - #{qty}, - #{nowQty}, - #{remark}, - #{checkQty}, - #{batchNumber}, - #{isUpdate}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - - - - - update check_list - - itemNo = #{itemNo}, - itemCode = #{itemCode}, - itemName = #{itemName}, - itemSpecification = #{itemSpecification}, - machineType = #{machineType}, - unit = #{unit}, - qty = #{qty}, - nowQty = #{nowQty}, - remark = #{remark}, - checkQty = #{checkQty}, - batchNumber = #{batchNumber}, - isUpdate = #{isUpdate}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - - where checkId = #{checkId} - - - - delete from check_list where checkId = #{checkId} - - - - delete from check_list where checkId in - - #{checkId} - - - - - - - - - update check_list set nowQty = #{nowQty},isUpdate = #{isUpdate} where checkId = #{checkId} and itemCode=#{itemCode} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/checkList/add.html b/ruoyi-admin/src/main/resources/templates/stock/checkList/add.html deleted file mode 100644 index 82c1595b..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/checkList/add.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/checkList/checkList.html b/ruoyi-admin/src/main/resources/templates/stock/checkList/checkList.html deleted file mode 100644 index 9865a78e..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/checkList/checkList.html +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/checkList/edit.html b/ruoyi-admin/src/main/resources/templates/stock/checkList/edit.html deleted file mode 100644 index 66c6bce7..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/checkList/edit.html +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file