From 603803f5e767ffe8e6d64abad137806ffe5edbf6 Mon Sep 17 00:00:00 2001 From: AlanScipio Date: Mon, 26 Feb 2024 16:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDataSelect=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index.vue.vm | 2 +- .../src/main/resources/vm/vue/v3/index.vue.vm | 2 +- .../system/mapper/SysDictTypeMapper.java | 44 +-- .../system/service/ISysDictDataService.java | 34 +-- .../system/service/ISysDictTypeService.java | 50 ++-- .../ruoyi/system/mapper/SysDictTypeMapper.xml | 197 +++++++------- .../controller/stock/BaseStockController.java | 44 +-- .../stock/InvTransHisController.java | 75 ++++++ .../java/com/ruoyi/wms/domain/BaseStock.java | 11 + .../com/ruoyi/wms/domain/InvTransHis.java | 252 +++--------------- .../mapper/stock/InvTransHisExtMapper.java | 15 ++ .../service/stock/BaseStockServiceImpl.java | 30 +-- .../wms/service/stock/IBaseStockService.java | 3 +- .../service/stock/IInvTransHisService.java | 45 ++++ .../service/stock/InvTransHisServiceImpl.java | 92 +++++++ .../mapper/{ => master}/ItemInfoExtMapper.xml | 0 .../mapper/{ => stock}/BaseStockExtMapper.xml | 6 +- .../wms/mapper/stock/InvTransHisExtMapper.xml | 100 +++++++ ruoyi-ui/src/api/wms/BaseStock.js | 9 +- ruoyi-ui/src/api/wms/InvTransHis.js | 26 ++ ruoyi-ui/src/components/DataSelect/index.vue | 111 ++++++++ .../src/components/RightToolbar/index.vue | 7 +- ruoyi-ui/src/main.js | 6 + ruoyi-ui/src/views/file/FileRecord/index.vue | 2 +- ruoyi-ui/src/views/monitor/job/index.vue | 2 +- ruoyi-ui/src/views/monitor/job/log.vue | 2 +- ruoyi-ui/src/views/monitor/online/index.vue | 2 +- ruoyi-ui/src/views/system/SeqRule/index.vue | 2 +- ruoyi-ui/src/views/system/config/index.vue | 2 +- ruoyi-ui/src/views/system/dict/data.vue | 2 +- ruoyi-ui/src/views/system/dict/index.vue | 2 +- .../src/views/system/logininfor/index.vue | 2 +- ruoyi-ui/src/views/system/notice/index.vue | 2 +- ruoyi-ui/src/views/system/operlog/index.vue | 2 +- ruoyi-ui/src/views/system/post/index.vue | 2 +- ruoyi-ui/src/views/system/role/authUser.vue | 2 +- ruoyi-ui/src/views/system/role/index.vue | 2 +- ruoyi-ui/src/views/system/role/selectUser.vue | 2 +- ruoyi-ui/src/views/system/user/authRole.vue | 2 +- ruoyi-ui/src/views/system/user/index.vue | 2 +- ruoyi-ui/src/views/tool/gen/importTable.vue | 2 +- ruoyi-ui/src/views/tool/gen/index.vue | 2 +- ruoyi-ui/src/views/wms/BaseStock/index.vue | 125 +++++---- ruoyi-ui/src/views/wms/InvTransHis/index.vue | 234 ++++++++++++++++ ruoyi-ui/src/views/wms/ItemInfo/index.vue | 2 +- ruoyi-ui/src/views/wms/ItemType/index.vue | 2 +- ruoyi-ui/src/views/wms/UnitInfo/index.vue | 2 +- .../src/views/wms/WarehouseInfo/index.vue | 2 +- 48 files changed, 1071 insertions(+), 495 deletions(-) create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/InvTransHisController.java create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.java create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IInvTransHisService.java create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/InvTransHisServiceImpl.java rename ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/{ => master}/ItemInfoExtMapper.xml (100%) rename ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/{ => stock}/BaseStockExtMapper.xml (92%) create mode 100644 ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.xml create mode 100644 ruoyi-ui/src/api/wms/InvTransHis.js create mode 100644 ruoyi-ui/src/components/DataSelect/index.vue create mode 100644 ruoyi-ui/src/views/wms/InvTransHis/index.vue diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm index 70ff30dd..d0da7bd4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm @@ -398,7 +398,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, #foreach ($column in $columns) #if($column.query) $column.javaField: null#if($foreach.count != $columns.size()),#end diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm index 7155c0c9..53ddf56a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm @@ -377,7 +377,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, #foreach ($column in $columns) #if($column.query) $column.javaField: null#if($foreach.count != $columns.size()),#end diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 3a172a52..a1d8c1d6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,83 +1,83 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.api.domain.SysDictType; +import java.util.List; + /** * 字典表 数据层 - * + * * @author ruoyi */ -public interface SysDictTypeMapper -{ +public interface SysDictTypeMapper { /** * 根据条件分页查询字典类型 - * + * * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - public List selectDictTypeList(SysDictType dictType); + List selectDictTypeList(SysDictType dictType); /** * 根据所有字典类型 - * + * * @return 字典类型集合信息 */ - public List selectDictTypeAll(); + List selectDictTypeAll(); /** * 根据字典类型ID查询信息 - * + * * @param dictId 字典类型ID * @return 字典类型 */ - public SysDictType selectDictTypeById(Long dictId); + SysDictType selectDictTypeById(Long dictId); /** * 根据字典类型查询信息 - * + * * @param dictType 字典类型 * @return 字典类型 */ - public SysDictType selectDictTypeByType(String dictType); + SysDictType selectDictTypeByType(String dictType); /** * 通过字典ID删除字典信息 - * + * * @param dictId 字典ID * @return 结果 */ - public int deleteDictTypeById(Long dictId); + int deleteDictTypeById(Long dictId); /** * 批量删除字典类型信息 - * + * * @param dictIds 需要删除的字典ID * @return 结果 */ - public int deleteDictTypeByIds(Long[] dictIds); + int deleteDictTypeByIds(Long[] dictIds); /** * 新增字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int insertDictType(SysDictType dictType); + int insertDictType(SysDictType dictType); /** * 修改字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int updateDictType(SysDictType dictType); + int updateDictType(SysDictType dictType); /** * 校验字典类型称是否唯一 - * + * * @param dictType 字典类型 * @return 结果 */ - public SysDictType checkDictTypeUnique(String dictType); + SysDictType checkDictTypeUnique(String dictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 6e06bfde..bdf591a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,60 +1,60 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysDictData; +import java.util.List; + /** * 字典 业务层 - * + * * @author ruoyi */ -public interface ISysDictDataService -{ +public interface ISysDictDataService { /** * 根据条件分页查询字典数据 - * + * * @param dictData 字典数据信息 * @return 字典数据集合信息 */ - public List selectDictDataList(SysDictData dictData); + List selectDictDataList(SysDictData dictData); /** * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 + * + * @param dictType 字典类型 * @param dictValue 字典键值 * @return 字典标签 */ - public String selectDictLabel(String dictType, String dictValue); + String selectDictLabel(String dictType, String dictValue); /** * 根据字典数据ID查询信息 - * + * * @param dictCode 字典数据ID * @return 字典数据 */ - public SysDictData selectDictDataById(Long dictCode); + SysDictData selectDictDataById(Long dictCode); /** * 批量删除字典数据信息 - * + * * @param dictCodes 需要删除的字典数据ID */ - public void deleteDictDataByIds(Long[] dictCodes); + void deleteDictDataByIds(Long[] dictCodes); /** * 新增保存字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ - public int insertDictData(SysDictData dictData); + int insertDictData(SysDictData dictData); /** * 修改保存字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ - public int updateDictData(SysDictData dictData); + int updateDictData(SysDictData dictData); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index e8534c50..65e77b1f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,98 +1,98 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.api.domain.SysDictType; +import java.util.List; + /** * 字典 业务层 - * + * * @author ruoyi */ -public interface ISysDictTypeService -{ +public interface ISysDictTypeService { /** * 根据条件分页查询字典类型 - * + * * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - public List selectDictTypeList(SysDictType dictType); + List selectDictTypeList(SysDictType dictType); /** * 根据所有字典类型 - * + * * @return 字典类型集合信息 */ - public List selectDictTypeAll(); + List selectDictTypeAll(); /** * 根据字典类型查询字典数据 - * + * * @param dictType 字典类型 * @return 字典数据集合信息 */ - public List selectDictDataByType(String dictType); + List selectDictDataByType(String dictType); /** * 根据字典类型ID查询信息 - * + * * @param dictId 字典类型ID * @return 字典类型 */ - public SysDictType selectDictTypeById(Long dictId); + SysDictType selectDictTypeById(Long dictId); /** * 根据字典类型查询信息 - * + * * @param dictType 字典类型 * @return 字典类型 */ - public SysDictType selectDictTypeByType(String dictType); + SysDictType selectDictTypeByType(String dictType); /** * 批量删除字典信息 - * + * * @param dictIds 需要删除的字典ID */ - public void deleteDictTypeByIds(Long[] dictIds); + void deleteDictTypeByIds(Long[] dictIds); /** * 加载字典缓存数据 */ - public void loadingDictCache(); + void loadingDictCache(); /** * 清空字典缓存数据 */ - public void clearDictCache(); + void clearDictCache(); /** * 重置字典缓存数据 */ - public void resetDictCache(); + void resetDictCache(); /** * 新增保存字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int insertDictType(SysDictType dictType); + int insertDictType(SysDictType dictType); /** * 修改保存字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int updateDictType(SysDictType dictType); + int updateDictType(SysDictType dictType); /** * 校验字典类型称是否唯一 - * + * * @param dictType 字典类型 * @return 结果 */ - public boolean checkDictTypeUnique(SysDictType dictType); + boolean checkDictTypeUnique(SysDictType dictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/com/ruoyi/system/mapper/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/com/ruoyi/system/mapper/SysDictTypeMapper.xml index 55b4075f..e761d96c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/com/ruoyi/system/mapper/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/com/ruoyi/system/mapper/SysDictTypeMapper.xml @@ -1,105 +1,108 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from sys_dict_type + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type - - - - - - - - - - - - delete from sys_dict_type where dict_id = #{dictId} - - - - delete from sys_dict_type where dict_id in - - #{dictId} - - + + + + + + + + + + + + delete + from sys_dict_type + where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + - - update sys_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where dict_id = #{dictId} - - - - insert into sys_dict_type( - dict_name, - dict_type, - status, - remark, - create_by, - create_time - )values( - #{dictName}, - #{dictType}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java index b4f0a5ab..a9f2ffca 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java @@ -1,16 +1,17 @@ package com.ruoyi.wms.controller.stock; +import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.wms.domain.BaseStock; import com.ruoyi.wms.service.stock.IBaseStockService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,6 +24,7 @@ import java.util.List; @RestController @RequestMapping("/BaseStock") public class BaseStockController extends BaseController { + @Autowired private IBaseStockService baseStockService; @@ -37,31 +39,29 @@ public class BaseStockController extends BaseController { return getDataTable(list); } - //TODO 如果要启用导出功能，需要在domain实体类的字段上添加注解：@com.ruoyi.common.core.annotation.Excel(name = "字段名") - /* + /** * 导出基本库存列表 */ -// @RequiresPermissions("wms:BaseStock:export") -// @Log(title = "基本库存", businessType = BusinessType.EXPORT) -// @PostMapping("/export") -// public void export(HttpServletResponse response, BaseStock baseStock) -// { -// List list = baseStockService.selectBaseStockList(baseStock); -// if (list.isEmpty()) { -// responseJsonWarn(response, "没有数据可以导出"); -// return; -// } -// ExcelUtil util = new ExcelUtil<>(BaseStock.class); -// util.exportExcel(response, list, "基本库存数据"); -// } + @RequiresPermissions("wms:BaseStock:export") + @Log(title = "基本库存", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseStock baseStock) { + List list = baseStockService.selectBaseStockList(baseStock); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } + ExcelUtil util = new ExcelUtil<>(BaseStock.class); + util.exportExcel(response, list, "基本库存数据"); + } /** * 获取基本库存详细信息 */ @RequiresPermissions("wms:BaseStock:query") - @GetMapping(value = "/{whsCd}") - public AjaxResult getInfo(@PathVariable("whsCd") String whsCd) { - return success(baseStockService.selectBaseStockByWhsCd(whsCd)); + @PostMapping(value = "/getInfo") + public AjaxResult getInfo(@RequestBody BaseStock form) { + return success(baseStockService.selectBaseStockByPK(form.getWhsCd(), form.getStgBinCd(), form.getItemCd(), form.getLotNo(), form.getSubLotNo())); } } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/InvTransHisController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/InvTransHisController.java new file mode 100644 index 00000000..f57949c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/InvTransHisController.java @@ -0,0 +1,75 @@ +package com.ruoyi.wms.controller.stock; + +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.wms.domain.InvTransHis; +import com.ruoyi.wms.service.stock.IInvTransHisService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 入出库履历Controller + * + * @author ryas + * created on 2024-02-23 + */ +@RestController +@RequestMapping("/InvTransHis") +public class InvTransHisController extends BaseController { + @Autowired + private IInvTransHisService invTransHisService; + + /** + * 查询入出库履历列表 + */ + @RequiresPermissions("wms:InvTransHis:list") + @GetMapping("/list") + public TableDataInfo list(InvTransHis invTransHis) { + startPage(); + List list = invTransHisService.selectInvTransHisList(invTransHis); + return getDataTable(list); + } + + /** + * 导出入出库履历列表 + */ + @RequiresPermissions("wms:InvTransHis:export") + @Log(title = "入出库履历", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, InvTransHis invTransHis) { + List list = invTransHisService.selectInvTransHisList(invTransHis); + if (list.isEmpty()) { + responseJsonWarn(response, "没有数据可以导出"); + return; + } + ExcelUtil util = new ExcelUtil<>(InvTransHis.class); + util.exportExcel(response, list, "入出库履历数据"); + } + + /** + * 获取入出库履历详细信息 + */ + @RequiresPermissions("wms:InvTransHis:query") + @GetMapping(value = "/{invTransNo}") + public AjaxResult getInfo(@PathVariable("invTransNo") String invTransNo) { + return success(invTransHisService.selectInvTransHisByInvTransNo(invTransNo)); + } + + /** + * 删除入出库履历 + */ + @RequiresPermissions("wms:InvTransHis:remove") + @Log(title = "入出库履历", businessType = BusinessType.DELETE) + @DeleteMapping("/{invTransNos}") + public AjaxResult remove(@PathVariable String[] invTransNos) { + return toAjax(invTransHisService.deleteInvTransHisByInvTransNos(invTransNos)); + } +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java index 2739d896..9d585491 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java @@ -1,5 +1,6 @@ package com.ruoyi.wms.domain; +import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.ExtBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -65,26 +66,31 @@ public class BaseStock extends ExtBaseEntity implements Serializable { /** * 仓库代码 */ + @Excel(name = "仓库代码", sort = 1) private String whsCd; /** * 货架号 */ + @Excel(name = "货架号", sort = 2) private String stgBinCd; /** * 物品代码 */ + @Excel(name = "物品代码", sort = 3) private String itemCd; /** * 批号 */ + @Excel(name = "批号", sort = 4) private String lotNo; /** * 子批号 */ + @Excel(name = "子批号", sort = 5) private String subLotNo; /** @@ -95,26 +101,31 @@ public class BaseStock extends ExtBaseEntity implements Serializable { /** * 标准单位数量 */ + @Excel(name = "标准单位数量", sort = 6) private BigDecimal stdUnitQty; /** * 包装单位数量 */ + @Excel(name = "包装单位数量", sort = 7) private BigDecimal pkgUnitQty; /** * 序列号 */ + @Excel(name = "序列号", sort = 8) private String serialNo; /** * 托盘ID */ + @Excel(name = "托盘ID", sort = 9) private String palletId; /** * 父托盘ID */ + @Excel(name = "父托盘ID", sort = 10) private String parentPalletId; /** diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java index 34f73855..5d3bff9d 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java @@ -1,6 +1,10 @@ package com.ruoyi.wms.domain; +import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.ExtBaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serial; import java.io.Serializable; @@ -17,10 +21,47 @@ import java.math.BigDecimal; * @author ryas * created on 2024-02-22 */ +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@Data public class InvTransHis extends ExtBaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + //==================== ↓↓↓↓↓↓ 非表字段 ↓↓↓↓↓↓ ==================== + + /** + * 创建者用户名 + */ + private String createByUser; + + /** + * 标准单位代码 + */ + private String stdUnitCd; + + /** + * 标准单位名称 + */ + private String stdUnitName; + + /** + * 包装单位代码 + */ + private String pkgUnitCd; + + /** + * 包装单位名称 + */ + private String pkgUnitName; + + //==================== ↓↓↓↓↓↓ 表字段 ↓↓↓↓↓↓ ==================== + /** * 入出库履历号 */ + @Excel(name = "入出库履历号", sort = 1) private String invTransNo; /** @@ -128,215 +169,4 @@ public class InvTransHis extends ExtBaseEntity implements Serializable { */ private String remark5; - @Serial - private static final long serialVersionUID = 1L; - - public String getInvTransNo() { - return invTransNo; - } - - public void setInvTransNo(String invTransNo) { - this.invTransNo = invTransNo == null ? null : invTransNo.trim(); - } - - public Integer getDeptId() { - return deptId; - } - - public void setDeptId(Integer deptId) { - this.deptId = deptId; - } - - public Integer getInvTransType() { - return invTransType; - } - - public void setInvTransType(Integer invTransType) { - this.invTransType = invTransType; - } - - public String getWhsCd() { - return whsCd; - } - - public void setWhsCd(String whsCd) { - this.whsCd = whsCd == null ? null : whsCd.trim(); - } - - public String getStgBinCd() { - return stgBinCd; - } - - public void setStgBinCd(String stgBinCd) { - this.stgBinCd = stgBinCd == null ? null : stgBinCd.trim(); - } - - public String getPalletId() { - return palletId; - } - - public void setPalletId(String palletId) { - this.palletId = palletId == null ? null : palletId.trim(); - } - - public BigDecimal getStdUnitQty() { - return stdUnitQty; - } - - public void setStdUnitQty(BigDecimal stdUnitQty) { - this.stdUnitQty = stdUnitQty; - } - - public BigDecimal getPkgUnitQty() { - return pkgUnitQty; - } - - public void setPkgUnitQty(BigDecimal pkgUnitQty) { - this.pkgUnitQty = pkgUnitQty; - } - - public String getTransOrderNo() { - return transOrderNo; - } - - public void setTransOrderNo(String transOrderNo) { - this.transOrderNo = transOrderNo == null ? null : transOrderNo.trim(); - } - - public String getTransOrderDetlNo() { - return transOrderDetlNo; - } - - public void setTransOrderDetlNo(String transOrderDetlNo) { - this.transOrderDetlNo = transOrderDetlNo == null ? null : transOrderDetlNo.trim(); - } - - public String getOperator() { - return operator; - } - - public void setOperator(String operator) { - this.operator = operator == null ? null : operator.trim(); - } - - public String getBusinessCls() { - return businessCls; - } - - public void setBusinessCls(String businessCls) { - this.businessCls = businessCls == null ? null : businessCls.trim(); - } - - public String getItemCd() { - return itemCd; - } - - public void setItemCd(String itemCd) { - this.itemCd = itemCd == null ? null : itemCd.trim(); - } - - public String getLotNo() { - return lotNo; - } - - public void setLotNo(String lotNo) { - this.lotNo = lotNo == null ? null : lotNo.trim(); - } - - public String getSubLotNo() { - return subLotNo; - } - - public void setSubLotNo(String subLotNo) { - this.subLotNo = subLotNo == null ? null : subLotNo.trim(); - } - - public String getSerialNo() { - return serialNo; - } - - public void setSerialNo(String serialNo) { - this.serialNo = serialNo == null ? null : serialNo.trim(); - } - - public String getReason() { - return reason; - } - - public void setReason(String reason) { - this.reason = reason == null ? null : reason.trim(); - } - - public String getRemark1() { - return remark1; - } - - public void setRemark1(String remark1) { - this.remark1 = remark1 == null ? null : remark1.trim(); - } - - public String getRemark2() { - return remark2; - } - - public void setRemark2(String remark2) { - this.remark2 = remark2 == null ? null : remark2.trim(); - } - - public String getRemark3() { - return remark3; - } - - public void setRemark3(String remark3) { - this.remark3 = remark3 == null ? null : remark3.trim(); - } - - public String getRemark4() { - return remark4; - } - - public void setRemark4(String remark4) { - this.remark4 = remark4 == null ? null : remark4.trim(); - } - - public String getRemark5() { - return remark5; - } - - public void setRemark5(String remark5) { - this.remark5 = remark5 == null ? null : remark5.trim(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", invTransNo=").append(invTransNo); - sb.append(", deptId=").append(deptId); - sb.append(", invTransType=").append(invTransType); - sb.append(", whsCd=").append(whsCd); - sb.append(", stgBinCd=").append(stgBinCd); - sb.append(", palletId=").append(palletId); - sb.append(", stdUnitQty=").append(stdUnitQty); - sb.append(", pkgUnitQty=").append(pkgUnitQty); - sb.append(", transOrderNo=").append(transOrderNo); - sb.append(", transOrderDetlNo=").append(transOrderDetlNo); - sb.append(", operator=").append(operator); - sb.append(", businessCls=").append(businessCls); - sb.append(", itemCd=").append(itemCd); - sb.append(", lotNo=").append(lotNo); - sb.append(", subLotNo=").append(subLotNo); - sb.append(", serialNo=").append(serialNo); - sb.append(", reason=").append(reason); - sb.append(", remark1=").append(remark1); - sb.append(", remark2=").append(remark2); - sb.append(", remark3=").append(remark3); - sb.append(", remark4=").append(remark4); - sb.append(", remark5=").append(remark5); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.java new file mode 100644 index 00000000..d12f2600 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.wms.mapper.stock; + +import com.ruoyi.wms.domain.InvTransHis; + +import java.util.List; + +/** + * @author Alan Scipio + * created on 2024/2/23 + */ +public interface InvTransHisExtMapper { + + List selectPageList(InvTransHis invTransHis); + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java index 3beda454..e906f575 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java @@ -1,12 +1,11 @@ package com.ruoyi.wms.service.stock; -import com.ruoyi.common.core.web.domain.ExtBaseEntity; import com.ruoyi.wms.domain.BaseStock; import com.ruoyi.wms.mapper.stock.BaseStockDynamicSqlSupport; +import com.ruoyi.wms.mapper.stock.BaseStockExtMapper; import com.ruoyi.wms.mapper.stock.BaseStockMapper; +import jakarta.annotation.Resource; import org.mybatis.dynamic.sql.SqlBuilder; -import org.mybatis.dynamic.sql.render.RenderingStrategies; -import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,8 +20,11 @@ import java.util.Optional; */ @Service public class BaseStockServiceImpl implements IBaseStockService { + @Autowired private BaseStockMapper baseStockMapper; + @Resource + private BaseStockExtMapper baseStockExtMapper; /** * 查询基本库存 @@ -31,8 +33,14 @@ public class BaseStockServiceImpl implements IBaseStockService { * @return 基本库存 */ @Override - public BaseStock selectBaseStockByWhsCd(String whsCd) { - Optional result = baseStockMapper.selectOne(dsl -> dsl.where(BaseStockDynamicSqlSupport.whsCd, SqlBuilder.isEqualTo(whsCd))); + public BaseStock selectBaseStockByPK(String whsCd, String stgBinCd, String itemCd, String lotNo, String subLotNo) { + Optional result = baseStockMapper.selectOne(dsl -> + dsl.where(BaseStockDynamicSqlSupport.whsCd, SqlBuilder.isEqualTo(whsCd)) + .and(BaseStockDynamicSqlSupport.stgBinCd, SqlBuilder.isEqualTo(stgBinCd)) + .and(BaseStockDynamicSqlSupport.itemCd, SqlBuilder.isEqualTo(itemCd)) + .and(BaseStockDynamicSqlSupport.lotNo, SqlBuilder.isEqualTo(lotNo)) + .and(BaseStockDynamicSqlSupport.subLotNo, SqlBuilder.isEqualTo(subLotNo)) + ); return result.orElse(null); } @@ -44,17 +52,7 @@ public class BaseStockServiceImpl implements IBaseStockService { */ @Override public List selectBaseStockList(BaseStock baseStock) { - SelectStatementProvider provider = SqlBuilder.select(BaseStockMapper.selectList) - .from(BaseStockDynamicSqlSupport.baseStock) - .where(BaseStockDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE)) - .and(BaseStockDynamicSqlSupport.whsCd, SqlBuilder.isEqualToWhenPresent(baseStock.getWhsCd())) - .and(BaseStockDynamicSqlSupport.stgBinCd, SqlBuilder.isEqualToWhenPresent(baseStock.getStgBinCd())) - .and(BaseStockDynamicSqlSupport.itemCd, SqlBuilder.isLikeWhenPresent(baseStock.getItemCd() == null ? null : "%" + baseStock.getItemCd() + "%")) - .and(BaseStockDynamicSqlSupport.lotNo, SqlBuilder.isLikeWhenPresent(baseStock.getLotNo() == null ? null : "%" + baseStock.getLotNo() + "%")) - .orderBy(BaseStockDynamicSqlSupport.whsCd) - .build() - .render(RenderingStrategies.MYBATIS3); - return baseStockMapper.selectMany(provider); + return baseStockExtMapper.selectPageList(baseStock); } } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java index 0cf6c0c1..2bb8d320 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java @@ -11,13 +11,14 @@ import java.util.List; * created on 2024-02-22 */ public interface IBaseStockService { + /** * 查询基本库存 * * @param whsCd 基本库存主键 * @return 基本库存 */ - BaseStock selectBaseStockByWhsCd(String whsCd); + BaseStock selectBaseStockByPK(String whsCd, String stgBinCd, String itemCd, String lotNo, String subLotNo); /** * 查询基本库存列表 diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IInvTransHisService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IInvTransHisService.java new file mode 100644 index 00000000..d9675dbf --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IInvTransHisService.java @@ -0,0 +1,45 @@ +package com.ruoyi.wms.service.stock; + +import com.ruoyi.wms.domain.InvTransHis; + +import java.util.List; + +/** + * 入出库履历Service接口 + * + * @author ryas + * created on 2024-02-23 + */ +public interface IInvTransHisService { + /** + * 查询入出库履历 + * + * @param invTransNo 入出库履历主键 + * @return 入出库履历 + */ + InvTransHis selectInvTransHisByInvTransNo(String invTransNo); + + /** + * 查询入出库履历列表 + * + * @param invTransHis 入出库履历 + * @return 入出库履历集合 + */ + List selectInvTransHisList(InvTransHis invTransHis); + + /** + * 批量删除入出库履历 + * + * @param invTransNos 需要删除的入出库履历主键集合 + * @return 结果 + */ + int deleteInvTransHisByInvTransNos(String[] invTransNos); + + /** + * 删除入出库履历信息 + * + * @param invTransNo 入出库履历主键 + * @return 结果 + */ + int deleteInvTransHisByInvTransNo(String invTransNo); +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/InvTransHisServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/InvTransHisServiceImpl.java new file mode 100644 index 00000000..f7ce7b1a --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/InvTransHisServiceImpl.java @@ -0,0 +1,92 @@ +package com.ruoyi.wms.service.stock; + +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.web.domain.ExtBaseEntity; +import com.ruoyi.common.security.utils.SecurityUtilsExt; +import com.ruoyi.wms.domain.InvTransHis; +import com.ruoyi.wms.mapper.stock.InvTransHisDynamicSqlSupport; +import com.ruoyi.wms.mapper.stock.InvTransHisExtMapper; +import com.ruoyi.wms.mapper.stock.InvTransHisMapper; +import jakarta.annotation.Resource; +import org.mybatis.dynamic.sql.SqlBuilder; +import org.mybatis.dynamic.sql.render.RenderingStrategies; +import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +/** + * 入出库履历Service业务层处理 + * + * @author ryas + * created on 2024-02-23 + */ +@Service +public class InvTransHisServiceImpl implements IInvTransHisService { + + @Resource + private InvTransHisMapper invTransHisMapper; + @Resource + private InvTransHisExtMapper invTransHisExtMapper; + + /** + * 查询入出库履历 + * + * @param invTransNo 入出库履历主键 + * @return 入出库履历 + */ + @Override + public InvTransHis selectInvTransHisByInvTransNo(String invTransNo) { + Optional result = invTransHisMapper.selectOne(dsl -> dsl.where(InvTransHisDynamicSqlSupport.invTransNo, SqlBuilder.isEqualTo(invTransNo))); + return result.orElse(null); + } + + /** + * 查询入出库履历列表 + * + * @param invTransHis 入出库履历 + * @return 入出库履历 + */ + @Override + public List selectInvTransHisList(InvTransHis invTransHis) { + return invTransHisExtMapper.selectPageList(invTransHis); + } + + /** + * 批量删除入出库履历 + * + * @param invTransNos 需要删除的入出库履历主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteInvTransHisByInvTransNos(String[] invTransNos) { + String userId = SecurityUtilsExt.getUserIdStr(); + UpdateStatementProvider provider = SqlBuilder.update(InvTransHisDynamicSqlSupport.invTransHis) + .set(InvTransHisDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED) + .set(InvTransHisDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate()) + .set(InvTransHisDynamicSqlSupport.updateBy).equalTo(userId) + .where(InvTransHisDynamicSqlSupport.invTransNo, SqlBuilder.isIn(invTransNos)) + .build() + .render(RenderingStrategies.MYBATIS3); + return invTransHisMapper.update(provider); + } + + /** + * 删除入出库履历信息 + * + * @param invTransNo 入出库履历主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteInvTransHisByInvTransNo(String invTransNo) { + InvTransHis record = new InvTransHis(); + record.setInvTransNo(invTransNo); + record.setDeleteFlag(ExtBaseEntity.DELETED); + record.setUpdateTime(DateUtils.getNowDate()); + return invTransHisMapper.updateByPrimaryKey(record); + } +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/master/ItemInfoExtMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml rename to ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/master/ItemInfoExtMapper.xml diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.xml similarity index 92% rename from ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml rename to ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.xml index 6882cb36..a87f0e4c 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.xml @@ -54,12 +54,12 @@ item.STD_UNIT_CD, item.PKG_UNIT_CD, stdUnit.UNIT_NAME as STD_UNIT_NAME, - pkgUnit.UNIT_NAME as PKG_UNIT_NAME, + pkgUnit.UNIT_NAME as PKG_UNIT_NAME from WMS_B_BASE_STOCK t left join WMS_M_WAREHOUSE_INFO whs on t.WHS_CD = whs.WHS_CD and whs.DELETE_FLAG = 0 left join WMS_M_ITEM_INFO item on t.ITEM_CD = item.ITEM_CD and item.DELETE_FLAG = 0 - left join WMS_M_ITEM_UNIT_INFO stdUnit on item.STD_UNIT_CD = stdUnit.UNIT_CD and stdUnit.DELETE_FLAG = 0 - left join WMS_M_ITEM_UNIT_INFO pkgUnit on item.PKG_UNIT_CD = pkgUnit.UNIT_CD and pkgUnit.DELETE_FLAG = 0 + left join WMS_M_UNIT_INFO stdUnit on item.STD_UNIT_CD = stdUnit.UNIT_CODE and stdUnit.DELETE_FLAG = 0 + left join WMS_M_UNIT_INFO pkgUnit on item.PKG_UNIT_CD = pkgUnit.UNIT_CODE and pkgUnit.DELETE_FLAG = 0 and t.DELETE_FLAG = 0 diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.xml new file mode 100644 index 00000000..e3b96baa --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/stock/InvTransHisExtMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/wms/BaseStock.js b/ruoyi-ui/src/api/wms/BaseStock.js index 20039652..3de7c54d 100644 --- a/ruoyi-ui/src/api/wms/BaseStock.js +++ b/ruoyi-ui/src/api/wms/BaseStock.js @@ -9,10 +9,11 @@ export function listBaseStock(query) { }) } -// TODO 查询基本库存详细 主键需要注意 -export function getBaseStock(whsCd) { +// 询基本库存详细 +export function getBaseStock(data) { return request({ - url: '/wms/BaseStock/' + whsCd, - method: 'get' + url: '/wms/BaseStock/getInfo', + method: 'post', + data: data }) } diff --git a/ruoyi-ui/src/api/wms/InvTransHis.js b/ruoyi-ui/src/api/wms/InvTransHis.js new file mode 100644 index 00000000..e4296544 --- /dev/null +++ b/ruoyi-ui/src/api/wms/InvTransHis.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 查询入出库履历列表 +export function listInvTransHis(query) { + return request({ + url: '/wms/InvTransHis/list', + method: 'get', + params: query + }) +} + +// 查询入出库履历详细 +export function getInvTransHis(invTransNo) { + return request({ + url: '/wms/InvTransHis/' + invTransNo, + method: 'get' + }) +} + +// 删除入出库履历 +export function delInvTransHis(invTransNo) { + return request({ + url: '/wms/InvTransHis/' + invTransNo, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/components/DataSelect/index.vue b/ruoyi-ui/src/components/DataSelect/index.vue new file mode 100644 index 00000000..6cbd44b1 --- /dev/null +++ b/ruoyi-ui/src/components/DataSelect/index.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue index 5a53dd49..c7868c3f 100644 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ b/ruoyi-ui/src/components/RightToolbar/index.vue @@ -4,7 +4,7 @@ - + @@ -60,6 +60,11 @@ const props = defineProps({ type: Number, default: 10, }, + /* 是否显示刷新图标 */ + showRefresh: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['update:showSearch', 'queryTable']); diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 8c335fd6..5597f7a4 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -24,7 +24,10 @@ import elementIcons from '@/components/SvgIcon/svgicon' import './permission' // permission control +//字典 import { useDict } from '@/utils/dict' +import { optionselect } from '@/api/system/dict/type' + import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi' // 分页组件 @@ -45,6 +48,8 @@ import TreeSelect from '@/components/TreeSelect' import DictTag from '@/components/DictTag' // FilePond文件上传组件 import FpFileUpload from '@/components/FpFileUpload' +// 自定义下拉选项组件 +import DataSelect from '@/components/DataSelect' const app = createApp(App) @@ -68,6 +73,7 @@ app.component('ImagePreview', ImagePreview) app.component('RightToolbar', RightToolbar) app.component('Editor', Editor) app.component('FpFileUpload', FpFileUpload) +app.component('DataSelect', DataSelect) app.use(router) app.use(store) diff --git a/ruoyi-ui/src/views/file/FileRecord/index.vue b/ruoyi-ui/src/views/file/FileRecord/index.vue index a1f7e072..0fd6eb03 100644 --- a/ruoyi-ui/src/views/file/FileRecord/index.vue +++ b/ruoyi-ui/src/views/file/FileRecord/index.vue @@ -113,7 +113,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, fileId: null, savedName: null, originalName: null, diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index e4229dc9..01b63f32 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -308,7 +308,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, jobName: undefined, jobGroup: undefined, status: undefined diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index f71a501f..ac010454 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -191,7 +191,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, dictName: undefined, dictType: undefined, status: undefined diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index 9af1eee6..963d85a6 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -62,7 +62,7 @@ const onlineList = ref([]); const loading = ref(true); const total = ref(0); const pageNum = ref(1); -const pageSize = ref(10); +const pageSize = ref(30); const queryParams = ref({ ipaddr: undefined, diff --git a/ruoyi-ui/src/views/system/SeqRule/index.vue b/ruoyi-ui/src/views/system/SeqRule/index.vue index 34b300de..3ad1d631 100644 --- a/ruoyi-ui/src/views/system/SeqRule/index.vue +++ b/ruoyi-ui/src/views/system/SeqRule/index.vue @@ -170,7 +170,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, seqDistCd: null, ruleName: null, }, diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index 34fd53da..7889014c 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -185,7 +185,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, configName: undefined, configKey: undefined, configType: undefined diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index f817fd04..92f56ad0 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -209,7 +209,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, dictType: undefined, dictLabel: undefined, status: undefined diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 297ac84f..d05cd300 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -193,7 +193,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, dictName: undefined, dictType: undefined, status: undefined diff --git a/ruoyi-ui/src/views/system/logininfor/index.vue b/ruoyi-ui/src/views/system/logininfor/index.vue index 0d0a9008..2dbcd98a 100644 --- a/ruoyi-ui/src/views/system/logininfor/index.vue +++ b/ruoyi-ui/src/views/system/logininfor/index.vue @@ -140,7 +140,7 @@ const defaultSort = ref({ prop: "accessTime", order: "descending" }); // 查询参数 const queryParams = ref({ pageNum: 1, - pageSize: 10, + pageSize: 30, ipaddr: undefined, userName: undefined, status: undefined, diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index c26b8c40..3b72be19 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -178,7 +178,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, noticeTitle: undefined, createBy: undefined, status: undefined diff --git a/ruoyi-ui/src/views/system/operlog/index.vue b/ruoyi-ui/src/views/system/operlog/index.vue index 4b9608b3..600068c7 100644 --- a/ruoyi-ui/src/views/system/operlog/index.vue +++ b/ruoyi-ui/src/views/system/operlog/index.vue @@ -220,7 +220,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, operIp: undefined, title: undefined, operName: undefined, diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index 6fd1b641..4dbe7b8f 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -164,7 +164,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, postCode: undefined, postName: undefined, status: undefined diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue index 66b5f5e6..f1e487da 100644 --- a/ruoyi-ui/src/views/system/role/authUser.vue +++ b/ruoyi-ui/src/views/system/role/authUser.vue @@ -108,7 +108,7 @@ const userIds = ref([]); const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 30, roleId: route.params.roleId, userName: undefined, phonenumber: undefined, diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 65c82160..be50a1ef 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -282,7 +282,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, roleName: undefined, roleKey: undefined, status: undefined diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue index 9be1ec96..81414c7d 100644 --- a/ruoyi-ui/src/views/system/role/selectUser.vue +++ b/ruoyi-ui/src/views/system/role/selectUser.vue @@ -79,7 +79,7 @@ const userIds = ref([]); const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 30, roleId: undefined, userName: undefined, phonenumber: undefined diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue index 0b5c14bc..52b4f55f 100644 --- a/ruoyi-ui/src/views/system/user/authRole.vue +++ b/ruoyi-ui/src/views/system/user/authRole.vue @@ -54,7 +54,7 @@ const { proxy } = getCurrentInstance(); const loading = ref(true); const total = ref(0); const pageNum = ref(1); -const pageSize = ref(10); +const pageSize = ref(30); const roleIds = ref([]); const roles = ref([]); const form = ref({ diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index d6cfdd61..7510c6a1 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -382,7 +382,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, userName: undefined, phonenumber: undefined, status: undefined, diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue index 33b56337..98078878 100644 --- a/ruoyi-ui/src/views/tool/gen/importTable.vue +++ b/ruoyi-ui/src/views/tool/gen/importTable.vue @@ -59,7 +59,7 @@ const { proxy } = getCurrentInstance(); const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 30, tableName: undefined, tableComment: undefined }); diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index cddc03bd..15515e87 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -171,7 +171,7 @@ const uniqueId = ref(""); const data = reactive({ queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 30, tableName: undefined, tableComment: undefined }, diff --git a/ruoyi-ui/src/views/wms/BaseStock/index.vue b/ruoyi-ui/src/views/wms/BaseStock/index.vue index 6a0308dc..f89111a5 100644 --- a/ruoyi-ui/src/views/wms/BaseStock/index.vue +++ b/ruoyi-ui/src/views/wms/BaseStock/index.vue @@ -1,13 +1,14 @@ diff --git a/ruoyi-ui/src/views/wms/InvTransHis/index.vue b/ruoyi-ui/src/views/wms/InvTransHis/index.vue new file mode 100644 index 00000000..0c8b3d02 --- /dev/null +++ b/ruoyi-ui/src/views/wms/InvTransHis/index.vue @@ -0,0 +1,234 @@ + + + diff --git a/ruoyi-ui/src/views/wms/ItemInfo/index.vue b/ruoyi-ui/src/views/wms/ItemInfo/index.vue index 9a6ccb87..6e8be439 100644 --- a/ruoyi-ui/src/views/wms/ItemInfo/index.vue +++ b/ruoyi-ui/src/views/wms/ItemInfo/index.vue @@ -440,7 +440,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, itemCd: null, itemName: null, }, diff --git a/ruoyi-ui/src/views/wms/ItemType/index.vue b/ruoyi-ui/src/views/wms/ItemType/index.vue index 201bdcc5..31fb0adb 100644 --- a/ruoyi-ui/src/views/wms/ItemType/index.vue +++ b/ruoyi-ui/src/views/wms/ItemType/index.vue @@ -125,7 +125,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, itemTypeName: null, remark1: null, }, diff --git a/ruoyi-ui/src/views/wms/UnitInfo/index.vue b/ruoyi-ui/src/views/wms/UnitInfo/index.vue index 731a897e..a316d2df 100644 --- a/ruoyi-ui/src/views/wms/UnitInfo/index.vue +++ b/ruoyi-ui/src/views/wms/UnitInfo/index.vue @@ -125,7 +125,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, unitCode: null, unitName: null, }, diff --git a/ruoyi-ui/src/views/wms/WarehouseInfo/index.vue b/ruoyi-ui/src/views/wms/WarehouseInfo/index.vue index bc10e754..95bf49dd 100644 --- a/ruoyi-ui/src/views/wms/WarehouseInfo/index.vue +++ b/ruoyi-ui/src/views/wms/WarehouseInfo/index.vue @@ -173,7 +173,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 30, whsCd: null, whsName: null, },