From 52ccaf1f498c874d8e4322456176841d4bb5bb3f Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 18 Oct 2024 14:30:29 +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=BA=93=E5=AD=98=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=20warehousing=5Fsearch=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=B3=BB=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 --- .../WarehousingSearchController.java | 126 ----------- .../storehouse/domain/WarehousingSearch.java | 206 ------------------ .../mapper/WarehousingSearchMapper.java | 61 ------ .../service/IWarehousingSearchService.java | 61 ------ .../impl/WarehousingSearchServiceImpl.java | 94 -------- .../storehouse/WarehousingSearchMapper.xml | 180 --------------- .../storehouse/warehousingSearch/add.html | 105 --------- .../storehouse/warehousingSearch/edit.html | 106 --------- .../warehousingSearch/warehousingSearch.html | 195 ----------------- 9 files changed, 1134 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java deleted file mode 100644 index 040292d4..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingSearchController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.ruoyi.storehouse.controller; - -import java.util.List; -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.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.storehouse.domain.WarehousingSearch; -import com.ruoyi.storehouse.service.IWarehousingSearchService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 库存Controller - * - * @author ruoyi - * @date 2023-05-16 - */ -@Controller -@RequestMapping("/storehouse/warehousingSearch") -public class WarehousingSearchController extends BaseController -{ - private String prefix = "storehouse/warehousingSearch"; - - @Autowired - private IWarehousingSearchService warehousingSearchService; - - @RequiresPermissions("storehouse:warehousingSearch:view") - @GetMapping() - public String warehousingSearch() - { - return prefix + "/warehousingSearch"; - } - - /** - * 查询库存列表 - */ - @RequiresPermissions("storehouse:warehousingSearch:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(WarehousingSearch warehousingSearch) - { - startPage(); - List list = warehousingSearchService.selectWarehousingSearchList(warehousingSearch); - return getDataTable(list); - } - - /** - * 导出库存列表 - */ - @RequiresPermissions("storehouse:warehousingSearch:export") - @Log(title = "库存", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(WarehousingSearch warehousingSearch) - { - List list = warehousingSearchService.selectWarehousingSearchList(warehousingSearch); - ExcelUtil util = new ExcelUtil(WarehousingSearch.class); - return util.exportExcel(list, "库存数据"); - } - - /** - * 新增库存 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存库存 - */ - @RequiresPermissions("storehouse:warehousingSearch:add") - @Log(title = "库存", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(WarehousingSearch warehousingSearch) - { - return toAjax(warehousingSearchService.insertWarehousingSearch(warehousingSearch)); - } - - /** - * 修改库存 - */ - @GetMapping("/edit/{materialCode}") - public String edit(@PathVariable("materialCode") String materialCode, ModelMap mmap) - { - WarehousingSearch warehousingSearch = warehousingSearchService.selectWarehousingSearchById(materialCode); - mmap.put("warehousingSearch", warehousingSearch); - return prefix + "/edit"; - } - - /** - * 修改保存库存 - */ - @RequiresPermissions("storehouse:warehousingSearch:edit") - @Log(title = "库存", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(WarehousingSearch warehousingSearch) - { - return toAjax(warehousingSearchService.updateWarehousingSearch(warehousingSearch)); - } - - /** - * 删除库存 - */ - @RequiresPermissions("storehouse:warehousingSearch:remove") - @Log(title = "库存", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(warehousingSearchService.deleteWarehousingSearchByIds(ids)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java deleted file mode 100644 index 9afb3cd7..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingSearch.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.ruoyi.storehouse.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 库存对象 warehousing_search - * - * @author ruoyi - * @date 2023-05-16 - */ -public class WarehousingSearch extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 物料代码 */ - @Excel(name = "物料代码") - private String materialCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String materialName; - - /** 物料类型 */ - @Excel(name = "物料类型") - private String materialType; - - /** 批号 */ - @Excel(name = "批号") - private String batchNumber; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - /** 单位 */ - @Excel(name = "单位") - private String inventoryUnit; - - /** 库存数量 */ - @Excel(name = "库存数量") - private String stockQuantity; - - /** 仓库号 */ - @Excel(name = "仓库号") - private String stockNumber; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 客户编号 */ - @Excel(name = "客户编号") - private String enterpriseCode; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String enterpriseName; - - /** 存放地址 */ - @Excel(name = "存放地址") - private String storageLocation; - - public void setMaterialCode(String materialCode) - { - this.materialCode = materialCode; - } - - public String getMaterialCode() - { - return materialCode; - } - public void setMaterialName(String materialName) - { - this.materialName = materialName; - } - - public String getMaterialName() - { - return materialName; - } - public void setMaterialType(String materialType) - { - this.materialType = materialType; - } - - public String getMaterialType() - { - return materialType; - } - public void setBatchNumber(String batchNumber) - { - this.batchNumber = batchNumber; - } - - public String getBatchNumber() - { - return batchNumber; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setTypeMachine(String typeMachine) - { - this.typeMachine = typeMachine; - } - - public String getTypeMachine() - { - return typeMachine; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setStockQuantity(String stockQuantity) - { - this.stockQuantity = stockQuantity; - } - - public String getStockQuantity() - { - return stockQuantity; - } - public void setStockNumber(String stockNumber) - { - this.stockNumber = stockNumber; - } - - public String getStockNumber() - { - return stockNumber; - } - public void setStockName(String stockName) - { - this.stockName = stockName; - } - - public String getStockName() - { - return stockName; - } - public void setEnterpriseCode(String enterpriseCode) - { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseCode() - { - return enterpriseCode; - } - public void setEnterpriseName(String enterpriseName) - { - this.enterpriseName = enterpriseName; - } - - public String getEnterpriseName() - { - return enterpriseName; - } - public void setStorageLocation(String storageLocation) - { - this.storageLocation = storageLocation; - } - - public String getStorageLocation() - { - return storageLocation; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("materialCode", getMaterialCode()) - .append("materialName", getMaterialName()) - .append("materialType", getMaterialType()) - .append("batchNumber", getBatchNumber()) - .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) - .append("inventoryUnit", getInventoryUnit()) - .append("stockQuantity", getStockQuantity()) - .append("stockNumber", getStockNumber()) - .append("stockName", getStockName()) - .append("enterpriseCode", getEnterpriseCode()) - .append("enterpriseName", getEnterpriseName()) - .append("storageLocation", getStorageLocation()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java deleted file mode 100644 index ae00cf76..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingSearchMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.storehouse.mapper; - -import java.util.List; -import com.ruoyi.storehouse.domain.WarehousingSearch; - -/** - * 库存Mapper接口 - * - * @author ruoyi - * @date 2023-05-16 - */ -public interface WarehousingSearchMapper -{ - /** - * 查询库存 - * - * @param materialCode 库存ID - * @return 库存 - */ - public WarehousingSearch selectWarehousingSearchById(String materialCode); - - /** - * 查询库存列表 - * - * @param warehousingSearch 库存 - * @return 库存集合 - */ - public List selectWarehousingSearchList(WarehousingSearch warehousingSearch); - - /** - * 新增库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - public int insertWarehousingSearch(WarehousingSearch warehousingSearch); - - /** - * 修改库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - public int updateWarehousingSearch(WarehousingSearch warehousingSearch); - - /** - * 删除库存 - * - * @param materialCode 库存ID - * @return 结果 - */ - public int deleteWarehousingSearchById(String materialCode); - - /** - * 批量删除库存 - * - * @param materialCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingSearchByIds(String[] materialCodes); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java deleted file mode 100644 index 547456d9..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingSearchService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.storehouse.service; - -import java.util.List; -import com.ruoyi.storehouse.domain.WarehousingSearch; - -/** - * 库存Service接口 - * - * @author ruoyi - * @date 2023-05-16 - */ -public interface IWarehousingSearchService -{ - /** - * 查询库存 - * - * @param materialCode 库存ID - * @return 库存 - */ - public WarehousingSearch selectWarehousingSearchById(String materialCode); - - /** - * 查询库存列表 - * - * @param warehousingSearch 库存 - * @return 库存集合 - */ - public List selectWarehousingSearchList(WarehousingSearch warehousingSearch); - - /** - * 新增库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - public int insertWarehousingSearch(WarehousingSearch warehousingSearch); - - /** - * 修改库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - public int updateWarehousingSearch(WarehousingSearch warehousingSearch); - - /** - * 批量删除库存 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingSearchByIds(String ids); - - /** - * 删除库存信息 - * - * @param materialCode 库存ID - * @return 结果 - */ - public int deleteWarehousingSearchById(String materialCode); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java deleted file mode 100644 index cc4e6eba..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingSearchServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.storehouse.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.storehouse.mapper.WarehousingSearchMapper; -import com.ruoyi.storehouse.domain.WarehousingSearch; -import com.ruoyi.storehouse.service.IWarehousingSearchService; -import com.ruoyi.common.core.text.Convert; - -/** - * 库存Service业务层处理 - * - * @author ruoyi - * @date 2023-05-16 - */ -@Service -public class WarehousingSearchServiceImpl implements IWarehousingSearchService -{ - @Autowired - private WarehousingSearchMapper warehousingSearchMapper; - - /** - * 查询库存 - * - * @param materialCode 库存ID - * @return 库存 - */ - @Override - public WarehousingSearch selectWarehousingSearchById(String materialCode) - { - return warehousingSearchMapper.selectWarehousingSearchById(materialCode); - } - - /** - * 查询库存列表 - * - * @param warehousingSearch 库存 - * @return 库存 - */ - @Override - public List selectWarehousingSearchList(WarehousingSearch warehousingSearch) - { - return warehousingSearchMapper.selectWarehousingSearchList(warehousingSearch); - } - - /** - * 新增库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - @Override - public int insertWarehousingSearch(WarehousingSearch warehousingSearch) - { - return warehousingSearchMapper.insertWarehousingSearch(warehousingSearch); - } - - /** - * 修改库存 - * - * @param warehousingSearch 库存 - * @return 结果 - */ - @Override - public int updateWarehousingSearch(WarehousingSearch warehousingSearch) - { - return warehousingSearchMapper.updateWarehousingSearch(warehousingSearch); - } - - /** - * 删除库存对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWarehousingSearchByIds(String ids) - { - return warehousingSearchMapper.deleteWarehousingSearchByIds(Convert.toStrArray(ids)); - } - - /** - * 删除库存信息 - * - * @param materialCode 库存ID - * @return 结果 - */ - @Override - public int deleteWarehousingSearchById(String materialCode) - { - return warehousingSearchMapper.deleteWarehousingSearchById(materialCode); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml deleted file mode 100644 index 07a3d432..00000000 --- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingSearchMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT - material_code, - material_name, - material_type, - batch_number, - specification_model, - type_machine, - inventory_unit, - sum( count ) AS stock_quantity, - stock_number, - stock_name, - enterprise_code, - enterprise_name, - storage_location - FROM - ( - SELECT - warehousing_in_detail.material_code AS material_code, - warehousing_in_detail.material_name AS material_name, - warehousing_in_detail.material_type AS material_type, - warehousing_in_detail.batch_number AS batch_number, - warehousing_in_detail.specification_model AS specification_model, - warehousing_in_detail.type_machine AS type_machine, - warehousing_in_detail.inventory_unit AS inventory_unit, - SUM( warehousing_in_detail.warehousing_quantity ) AS `count`, - warehousing_in_info.stock_number AS stock_number, - warehousing_in_info.stock_name AS stock_name, - warehousing_in_info.enterprise_code AS enterprise_code, - warehousing_in_info.enterprise_name AS enterprise_name, - warehousing_in_detail.storage_location AS storage_location - FROM - warehousing_in_detail, - warehousing_in_info - WHERE - warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number - GROUP BY - warehousing_in_detail.material_code,warehousing_in_detail.storage_location UNION ALL - SELECT - outbound_detail.material_code AS material_code, - outbound_detail.material_name AS material_name, - outbound_info.material_type AS material_type, - outbound_detail.batch_number AS batch_number, - outbound_detail.specification_model AS specification_model, - outbound_detail.type_machine AS type_machine, - outbound_detail.inventory_unit AS inventory_unit, - - SUM( outbound_detail.actual_count ) AS `count`, - outbound_info.stock_no AS stock_number, - outbound_info.stock_name AS stock_name, - outbound_info.enterprise_code AS enterprise_code, - outbound_info.enterprise_name AS enterprise_name, - outbound_detail.storage_location AS storage_location - FROM - outbound_detail, - outbound_info - WHERE - outbound_detail.outbound_no = outbound_info.outbound_no - GROUP BY - outbound_detail.material_code, outbound_detail.storage_location - ) AS tabletemp - GROUP BY - material_code, storage_location - - - - - - - - insert into warehousing_search - - material_code, - material_name, - material_type, - batch_number, - specification_model, - type_machine, - inventory_unit, - stock_quantity, - stock_number, - stock_name, - enterprise_code, - enterprise_name, - storage_location, - - - #{materialCode}, - #{materialName}, - #{materialType}, - #{batchNumber}, - #{specificationModel}, - #{typeMachine}, - #{inventoryUnit}, - #{stockQuantity}, - #{stockNumber}, - #{stockName}, - #{enterpriseCode}, - #{enterpriseName}, - #{storageLocation}, - - - - - update warehousing_search - - material_name = #{materialName}, - material_type = #{materialType}, - batch_number = #{batchNumber}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - inventory_unit = #{inventoryUnit}, - stock_quantity = #{stockQuantity}, - stock_number = #{stockNumber}, - stock_name = #{stockName}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - storage_location = #{storageLocation}, - - where material_code = #{materialCode} - - - - delete from warehousing_search where material_code = #{materialCode} - - - - delete from warehousing_search where material_code in - - #{materialCode} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html deleted file mode 100644 index 78b2ecb3..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/add.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html deleted file mode 100644 index 21b08b8d..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/edit.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html deleted file mode 100644 index c06a7f6e..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingSearch/warehousingSearch.html +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- -
- - - - - - - - - - - - -
-
-
- -
-
-
- - - - \ No newline at end of file