From db6a5fa7e41d01f78af7727a9471330d17de674f Mon Sep 17 00:00:00 2001 From: siontion Date: Sun, 4 Feb 2024 17:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=20=E8=99=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5vMatName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 出入库 虚物料数据字段vMatName --- .../controller/admin/material/MaterialController.java | 7 +++++++ .../module/heli/dal/dataobject/storage/StorageDO.java | 2 ++ .../module/heli/dal/mysql/material/MaterialMapper.java | 5 +++++ .../module/heli/service/material/MaterialService.java | 1 + .../heli/service/material/MaterialServiceImpl.java | 5 +++++ mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts | 5 ++++- .../src/views/heli/storage/StorageOut.vue | 9 +++++++-- 7 files changed, 31 insertions(+), 3 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java index 4e94cfc6..a8cb3b64 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java @@ -100,4 +100,11 @@ public class MaterialController { return success(list); } + @GetMapping({"/all-simples-virtual"}) + @Operation(summary = "TODO:获取物料精简信息列表", description = "只包含被开启的物料，主要用于前端的下拉选项") + public CommonResult> > getSimpleVirtualList() { + List> list = materialService.selectSimpleVirtualList(); + // 拼接数据 + return success(list); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java index 2a3d3024..157c97a8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java @@ -99,4 +99,6 @@ public class StorageDO extends BaseDO { */ private LocalDateTime createTime; + private String vMatName; + } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index 6928b940..39d182b0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -45,4 +45,9 @@ public interface MaterialMapper extends BaseMapperX { return selectMaps(new QueryWrapper().select("id", "name","short_name","code","material_type","spec","unit","brand").eq("virtual_part", YesOrNoEnum.N.name()).lambda()); } + default List> selectSimpleVirtualList() { + + return selectMaps(new QueryWrapper().select("id", "name","short_name","code","material_type","spec","unit","brand").eq("virtual_part", YesOrNoEnum.Y.name()).lambda()); + + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java index 7260961c..a298defd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java @@ -53,5 +53,6 @@ public interface MaterialService { PageResult getMaterialPage(MaterialPageReqVO pageReqVO); List> getSimpleList(); + List> selectSimpleVirtualList(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java index 20ebf656..8807cbc4 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java @@ -92,4 +92,9 @@ public class MaterialServiceImpl implements MaterialService { public List> getSimpleList() { return materialMapper.selectSimpleList(); } + + @Override + public List> selectSimpleVirtualList() { + return materialMapper.selectSimpleVirtualList(); + } } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts index b0a272bc..8360586f 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts @@ -28,7 +28,10 @@ export interface MaterialVO { virtualPart: string logo: string } - +// 查询物料 +export const getSimpVirtualList = async () => { + return await request.get({ url: `/heli/material/all-simples-virtual` }) +} // 查询物料 export const getSimpList = async () => { return await request.get({ url: `/heli/material/all-simples` }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 137bfa93..c0e8aefa 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -755,6 +755,7 @@ const initStatus = async (status) => { } const userList = ref([]) // 用户列表 const matSimpList = ref([]) // 物料基本信息列表 +const matSimpVirtualList = ref([]) // 物料基本信息列表 /** 初始化 **/ onMounted(async () => { @@ -768,17 +769,17 @@ onMounted(async () => { // 获取原始物料信息 matSimpList.value = await MaterialApi.getSimpList() + matSimpVirtualList.value = await MaterialApi.getSimpVirtualList() + matList.value = matSimpList.value.filter( mat => matLastData.value.filter( row => row.matId == mat.id).length>0) // 编辑时获取入库单据信息，包括基础信息、物料信息、附件信息 if (query.id) { - // 获取库存信息 formData.value = await StorageApi.getStorage(query.id) - // 页面控件可视初始化 await initStatus(formData.value.status) @@ -814,6 +815,10 @@ onMounted(async () => { }) matList.value = matSimpList.value.filter( mat => matLastData.value.filter( row => row.matId == mat.id).length>0 || formData.value.matItemDOList.filter(fan => fan.matId == mat.id).length>0) + if(matList.value.length == 0){ + matList.value = matSimpVirtualList.value.filter( mat => matLastData.value.filter( row => row.matId == mat.id).length>0 || formData.value.matItemDOList.filter(fan => fan.matId == mat.id).length>0) + } + // 附件信息 let attParams = { pageNo: 1,