From 676c8c98e5ecb55b04ea925550e859551079381b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Thu, 24 Jul 2025 11:01:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ErpMaterialController.java | 8 ++ .../domain/vo/ErpMaterialCheckVo.java | 10 ++ .../business/domain/vo/ErpPostVo.java | 2 +- .../business/mapper/ErpMaterialMapper.java | 10 ++ .../business/service/IErpMaterialService.java | 5 + .../impl/ErpMaterialCheckServiceImpl.java | 15 ++- .../service/impl/ErpMaterialServiceImpl.java | 21 +++- .../resources/mapper/ErpMaterialMapper.xml | 49 ++++++++ maintain-ui/src/api/business/material.js | 9 ++ .../src/views/business/material/index.vue | 2 - .../views/business/materialCheck/index.vue | 112 ++++++++++++++---- .../views/business/materialPutaway/index.vue | 2 +- .../views/business/materialReturns/index.vue | 60 +++++----- 13 files changed, 246 insertions(+), 59 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialController.java index 24683f5..beb0dae 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialController.java @@ -60,6 +60,14 @@ public class ErpMaterialController extends BaseController { return iErpMaterialService.customQueryPageList(bo, pageQuery); } + /** + * 查询物资列表根据仓库ID + */ + @GetMapping("/customListByWarehouseId") + public R> customQueryListByWarehouseId(ErpMaterialBo bo) { + return R.ok(iErpMaterialService.customQueryListByWarehouseId(bo)); + } + /** * 查询物资列表(全部) */ diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialCheckVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialCheckVo.java index 1947a4e..1d2b1d4 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialCheckVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialCheckVo.java @@ -120,4 +120,14 @@ public class ErpMaterialCheckVo implements Serializable { */ private List checkInfoList; + /** + * 盘点明细列表(盘亏) + */ + private List checkInfoLoseList; + + /** + * 盘点明细列表(盘盈) + */ + private List checkInfoJustList; + } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpPostVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpPostVo.java index f564947..bf53ede 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpPostVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpPostVo.java @@ -43,7 +43,7 @@ public class ErpPostVo implements Serializable { /** * 类型（1维修 2管理） */ - @ExcelProperty(value = "岗位类型") + @ExcelProperty(value = "岗位类型", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "post_type") private Integer type; diff --git a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialMapper.java b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialMapper.java index 0581e4b..b3c7fa3 100644 --- a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialMapper.java +++ b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialMapper.java @@ -10,6 +10,8 @@ import com.maintain.business.domain.vo.ErpMaterialVo; import com.maintain.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 物资Mapper接口 * @@ -35,4 +37,12 @@ public interface ErpMaterialMapper extends BaseMapperPlus customQueryPageListByWarehouseId(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper, @Param("warehouseId") Long warehouseId); + + /** + * 根据仓库自定义查询(不分页) + * @param warehouseId + * @return + */ + List customQueryListByWarehouseId(@Param("warehouseId") Long warehouseId); + } diff --git a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialService.java b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialService.java index f744031..854ab78 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialService.java +++ b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialService.java @@ -33,6 +33,11 @@ public interface IErpMaterialService { */ TableDataInfo customQueryPageList(ErpMaterialBo bo, PageQuery pageQuery); + /** + * 查询物资列表根据仓库ID(不分页) + */ + List customQueryListByWarehouseId(ErpMaterialBo bo); + /** * 查询物资列表(自定义查询全部) */ diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java index fb85479..2926846 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.maintain.business.domain.*; import com.maintain.business.domain.bo.ErpMaterialCheckInfoBo; +import com.maintain.business.domain.vo.ErpMaterialCheckInfoVo; import com.maintain.business.domain.vo.ErpMaterialInventoryRecordVo; import com.maintain.business.domain.vo.ErpWarehouseVo; import com.maintain.business.mapper.*; @@ -65,7 +66,19 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { ErpMaterialCheckVo checkVo = baseMapper.selectVoById(id); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(ErpMaterialCheckInfo::getCheckId, id); - checkVo.setCheckInfoList(checkInfoMapper.selectVoList(lqw)); + List checkInfoVoList = checkInfoMapper.selectVoList(lqw); + checkVo.setCheckInfoList(checkInfoVoList); + List checkInfoJustList = new ArrayList<>(); + List checkInfoLoseList = new ArrayList<>(); + for (ErpMaterialCheckInfoVo infoVo : checkInfoVoList) { + if (infoVo.getResultState() == 1) { + checkInfoJustList.add(infoVo); + }else if (infoVo.getResultState() == 2) { + checkInfoLoseList.add(infoVo); + } + } + checkVo.setCheckInfoJustList(checkInfoJustList); + checkVo.setCheckInfoLoseList(checkInfoLoseList); return checkVo; } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialServiceImpl.java index 32deb13..8f3acac 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialServiceImpl.java @@ -64,10 +64,29 @@ public class ErpMaterialServiceImpl implements IErpMaterialService { */ @Override public TableDataInfo customQueryPageList(ErpMaterialBo bo, PageQuery pageQuery) { - Page result = baseMapper.customQueryPageList(pageQuery.build(), this.customBuildQueryWrapper(bo)); + QueryWrapper query = Wrappers.query(); + query.like(null != bo.getVendorName(), "t.vendor_name", bo.getVendorName()) + .like(null != bo.getMaterialName(), "t.material_name", bo.getMaterialName()) + .like(null != bo.getMaterialCode(), "t.material_code", bo.getMaterialCode()) + .like(null != bo.getMaterialSpecifications(), "t.material_specifications", bo.getMaterialSpecifications()) + .like(null != bo.getWarehouseName(), "t.name", bo.getWarehouseName()) + .eq(null != bo.getWarehouseId(), "t.warehouse_id", bo.getWarehouseId()) + .in(null != bo.getWarehouseIdList(), "t.warehouse_id", bo.getWarehouseIdList()) + .ge(null != bo.getInventory(), "t.inventory", bo.getInventory()); + Page result = baseMapper.customQueryPageList(pageQuery.build(), query); return TableDataInfo.build(result); } + /** + * 查询物资列表根据仓库ID(不分页) + * + * @param bo + */ + @Override + public List customQueryListByWarehouseId(ErpMaterialBo bo) { + return baseMapper.customQueryListByWarehouseId(bo.getWarehouseId()); + } + /** * 查询物资列表(自定义查询全部) * diff --git a/maintain-business/src/main/resources/mapper/ErpMaterialMapper.xml b/maintain-business/src/main/resources/mapper/ErpMaterialMapper.xml index b2de657..6b759a0 100644 --- a/maintain-business/src/main/resources/mapper/ErpMaterialMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpMaterialMapper.xml @@ -105,6 +105,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) bac ON m.id = bac.material_id ${ew.getCustomSqlSegment} + diff --git a/maintain-ui/src/api/business/material.js b/maintain-ui/src/api/business/material.js index 7f383cc..d7d5b88 100644 --- a/maintain-ui/src/api/business/material.js +++ b/maintain-ui/src/api/business/material.js @@ -27,6 +27,15 @@ export function customListAll(query) { }) } +// 查询物资列表(自定义查询用于物料盘点初始化) +export function customListAllByWarehouseId(query) { + return request({ + url: '/business/material/customListByWarehouseId', + method: 'get', + params: query + }) +} + // 查询物资库存列表 export function listMaterialInventory(query) { return request({ diff --git a/maintain-ui/src/views/business/material/index.vue b/maintain-ui/src/views/business/material/index.vue index e57f454..8bbd9e6 100644 --- a/maintain-ui/src/views/business/material/index.vue +++ b/maintain-ui/src/views/business/material/index.vue @@ -583,10 +583,8 @@ export default { this.reset(); this.open = true; this.title = "添加物资"; - this.getTypeList(); this.getVendorList(); this.getWarehouseList(); - this.getWarehouseLocationList(); }, /** 修改按钮操作 */ handleUpdate(row) { diff --git a/maintain-ui/src/views/business/materialCheck/index.vue b/maintain-ui/src/views/business/materialCheck/index.vue index 5531c2d..21cbca7 100644 --- a/maintain-ui/src/views/business/materialCheck/index.vue +++ b/maintain-ui/src/views/business/materialCheck/index.vue @@ -249,6 +249,9 @@ 新增 + + 初始化 + @@ -373,27 +376,78 @@ 盘点明细 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -410,7 +464,7 @@ import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { getSiteTree } from '@/api/business/unit' import {listSiteWarehouse, listWarehouseAll} from '@/api/business/siteWarehouse' -import {customListAll, listMaterial} from '@/api/business/material' +import {customListAll, customListAllByWarehouseId, listMaterial} from '@/api/business/material' import { formatDate } from '@/utils' export default { @@ -419,6 +473,7 @@ export default { dicts: ['check_state', 'check_type', 'check_state', 'check_info_state', 'material_unit'], data() { return { + activeName: 'all', // 按钮loading materialLoading: false, // 按钮loading @@ -606,7 +661,9 @@ export default { updateBy: undefined, updateTime: undefined, createDeptId: undefined, - checkInfoList: [] + checkInfoList: [], + checkInfoJustList: [], + checkInfoLoseList: [] }; this.resetForm("form"); }, @@ -636,6 +693,15 @@ export default { this.open2 = true this.getMaterialList() }, + /* 初始化 */ + openMaterialInit() { + if (!this.form.warehouseId) { + this.$modal.msgError("请先选择要盘点的仓库"); + } + customListAllByWarehouseId({warehouseId: this.form.warehouseId}).then(response => { + this.form.checkInfoList = response.data; + }) + }, /** 搜索按钮操作 */ handleMaterialQuery() { this.queryMaterialParams.pageNum = 1; diff --git a/maintain-ui/src/views/business/materialPutaway/index.vue b/maintain-ui/src/views/business/materialPutaway/index.vue index ff5e7ca..4f0b2aa 100644 --- a/maintain-ui/src/views/business/materialPutaway/index.vue +++ b/maintain-ui/src/views/business/materialPutaway/index.vue @@ -625,7 +625,7 @@ export default { arrivalNumber: undefined, putawayNumber: undefined, putawayType: undefined, - putawayTime: undefined, + putawayTime: formatDate(new Date().getTime()), putawayMoney: undefined, returnNumber: undefined, returnTime: undefined, diff --git a/maintain-ui/src/views/business/materialReturns/index.vue b/maintain-ui/src/views/business/materialReturns/index.vue index e2cf9d5..44a15fc 100644 --- a/maintain-ui/src/views/business/materialReturns/index.vue +++ b/maintain-ui/src/views/business/materialReturns/index.vue @@ -107,13 +107,13 @@ icon="el-icon-document" @click="handleDetail(scope.row)" >详情 - 删除 + + + + + + + @@ -144,13 +144,11 @@ - - - - - - - + + + + + + + + + + + + @@ -176,13 +181,19 @@ - - + + + - - + + @@ -192,17 +203,6 @@ - - - - - - @@ -416,7 +416,7 @@ export default { id: undefined, returnsCode: undefined, returnsMoney: undefined, - returnsTime: undefined, + returnsTime: formatDate(new Date().getTime()), putawayId: undefined, putawayNumber: undefined, orderNumber: undefined, -- 2.22.0