From faf1db51a53db913da67df15633db0cd9394dc8e Mon Sep 17 00:00:00 2001 From: zxy Date: Mon, 8 Jun 2026 15:29:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(rawstorageinventory):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E9=9B=86=E6=88=90=E6=A3=80=E9=AA=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RawStorageInventoryController.java | 38 +- .../vo/RawStorageInventoryRespVO.java | 4 + .../views/biz/rawstorageinventory/index.vue | 440 ++++++------------ 3 files changed, 170 insertions(+), 312 deletions(-) diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/RawStorageInventoryController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/RawStorageInventoryController.java index 637f22e..f1f7a6a 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/RawStorageInventoryController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/RawStorageInventoryController.java @@ -1,17 +1,17 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ningxia.yunxi.chemmes.framework.common.pojo.CommonResult; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageParam; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; import com.ningxia.yunxi.chemmes.framework.excel.core.util.ExcelUtils; import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLog; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.RawStorageInventoryPageReqVO; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.RawStorageInventoryRespVO; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.RawStorageInventorySaveReqVO; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.MaterialInventoryPageReqVO; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.MaterialInventoryRespVO; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.rawstorageinventory.vo.*; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.rawmaterialinsp.RawMaterialInspDO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.rawstorageinventory.RawStorageInventoryDO; +import com.ningxia.yunxi.chemmes.module.biz.dal.mysql.rawmaterialinsp.RawMaterialInspMapper; import com.ningxia.yunxi.chemmes.module.biz.service.rawstorageinventory.RawStorageInventoryService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -40,6 +40,9 @@ public class RawStorageInventoryController { @Resource private RawStorageInventoryService rawStorageInventoryService; + @Resource + private RawMaterialInspMapper rawMaterialInspMapper; + @PostMapping("/create") @Operation(summary = "创建原料库存") @PreAuthorize("@ss.hasPermission('twm:raw-storage-inventory:create')") @@ -78,7 +81,30 @@ public class RawStorageInventoryController { @PreAuthorize("@ss.hasPermission('twm:raw-storage-inventory:query')") public CommonResult> getRawStorageInventoryPage(@Valid RawStorageInventoryPageReqVO pageReqVO) { PageResult pageResult = rawStorageInventoryService.getRawStorageInventoryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, RawStorageInventoryRespVO.class)); + PageResult voPageResult = BeanUtils.toBean(pageResult, RawStorageInventoryRespVO.class); + if (CollUtil.isNotEmpty(voPageResult.getList())) { + // 批量填充来料检验结果(通过 materialId 关联 tqm_raw_material_insp) + fillCheckResult(voPageResult.getList()); + } + return success(voPageResult); + } + + /** + * 通过 lot_no 关联 tqm_raw_material_insp 表,获取检验结果 + */ + private void fillCheckResult(List list) { + for (RawStorageInventoryRespVO vo : list) { + if (vo.getLotNo() == null) { + continue; + } + RawMaterialInspDO insp = rawMaterialInspMapper.selectOne( + new LambdaQueryWrapper() + .eq(RawMaterialInspDO::getLotNo, vo.getLotNo()) + .last("LIMIT 1")); + if (insp != null) { + vo.setCheckResult(insp.getCheckResult()); + } + } } @GetMapping("/export-excel") diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/vo/RawStorageInventoryRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/vo/RawStorageInventoryRespVO.java index 5cd397f..33c1182 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/vo/RawStorageInventoryRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/rawstorageinventory/vo/RawStorageInventoryRespVO.java @@ -106,4 +106,8 @@ public class RawStorageInventoryRespVO { @ExcelProperty("存货账单号") private String inventBillNo; + @Schema(description = "来料检验结果(0 合格 1 不合格 2让步接收)") + @ExcelProperty("检验结果") + private String checkResult; + } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue index 4ef8c9d..fd364cf 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue @@ -8,276 +8,78 @@ :inline="true" label-width="80px" > - - + + @change="handleStoreHouseChange" + > + + - - + + > + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 搜索 + 搜索 重置 - - 新增 - - - 导出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + +
- - - + +