From 4ffb6db0a207e0d49faa570298833eec64fa6532 Mon Sep 17 00:00:00 2001 From: Ledo Date: Sun, 6 Jul 2025 09:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=BA=93=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=BA=E8=B4=9F=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storagecheck/StorageCheckController.java | 2 +- .../vo/StorageInventoryPageReqVO.java | 2 +- .../StorageCheckMatMapper.java | 5 +- .../StorageInventoryMapper.java | 1 + .../storagecheck/StorageCheckServiceImpl.java | 4 +- .../StorageCheckMatService.java | 2 +- .../StorageCheckMatServiceImpl.java | 6 + .../StorageInventoryServiceImpl.java | 4 +- .../storagecheckmat/StorageCheckMatMapper.xml | 6 +- .../StorageInventoryMapper.xml | 138 +++++++++++++----- .../views/heli/storagecheck/checkdetail.vue | 7 +- .../views/heli/storagecheck/materialsNew.vue | 5 +- 12 files changed, 130 insertions(+), 52 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java index 524e38e..c9fec33 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java @@ -64,7 +64,7 @@ public class StorageCheckController { @PreAuthorize("@ss.hasPermission('heli:storage-mat:create')") public CommonResult createStorageCheckMat(@Valid @RequestBody List createReqVO, @RequestParam("checkId") Long checkId) { - storageCheckMatService.deleteCheckMatList(checkId); + storageCheckMatService.deleteCheckMatListNew(checkId); for (StorageCheckMatSaveReqVO item : createReqVO) { item.setId(null); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storageinventory/vo/StorageInventoryPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storageinventory/vo/StorageInventoryPageReqVO.java index 732a70c..2343c89 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storageinventory/vo/StorageInventoryPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storageinventory/vo/StorageInventoryPageReqVO.java @@ -88,5 +88,5 @@ public class StorageInventoryPageReqVO extends PageParam { @Schema(description = "是否排除库存为0的物料") private Integer noZero; @Schema(description = "是否全部数据") - private boolean isALL; + private Integer selectAll; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java index e14e19a..dfa03ee 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java @@ -8,6 +8,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; +import org.apache.ibatis.annotations.Param; /** * 盘点物料 Mapper @@ -35,10 +36,12 @@ public interface StorageCheckMatMapper extends BaseMapperX { .orderByDesc(StorageCheckMatDO::getId)); } + int deleteCheckMatList(@Param("checkId") Long checkId); + default List selectListByCheckID(Long checkId) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(StorageCheckMatDO::getCheckId, checkId) .orderByDesc(StorageCheckMatDO::getId)); } -} \ 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/storageinventory/StorageInventoryMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java index e36003a..040887f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java @@ -116,6 +116,7 @@ public interface StorageInventoryMapper extends BaseMapperX List selectNowList(StorageInventoryPageReqVO reqVO); + List selectNowListAll(StorageInventoryPageReqVO reqVO); default PageResult getStorageNowPageAll(StorageLogPageReqVO pageReqVO){ // MPJLambdaWrapper query = new MPJLambdaWrapper<>(); // diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java index 2efaeb9..3d1173e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java @@ -170,7 +170,7 @@ public class StorageCheckServiceImpl implements StorageCheckService { //要同步设置 } else { - storageInventoryDO.setYardAmount(storageInventoryDO.getYardAmount().add(storageMatDO.getStorageOkQty())); + storageInventoryDO.setYardAmount(storageMatDO.getStorageOkQty()); } if (storageMatDO.getOnemoney() != null && !storageMatDO.getOnemoney().trim().equals("")) { @@ -188,7 +188,7 @@ public class StorageCheckServiceImpl implements StorageCheckService { wrapper.eq(StorageInventoryDO::getDeleted, 0); StorageInventoryDO storageInventoryDO = storageInventoryMapper.selectOne(wrapper); if (ObjectUtil.isNotEmpty(storageInventoryDO)) { - storageInventoryDO.setYardAmount(storageInventoryDO.getYardAmount().subtract(storageMatDO.getStorageOkQty())); + storageInventoryDO.setYardAmount(storageMatDO.getStorageOkQty()); } if (storageMatDO.getOnemoney() != null && !storageMatDO.getOnemoney().trim().equals("")) { BigDecimal bigDecimal = new BigDecimal(storageMatDO.getOnemoney()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java index 2c2ed77..5c6cee0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java @@ -55,5 +55,5 @@ public interface StorageCheckMatService { List getStorageMatListByCheckId(Long id); Integer deleteCheckMatList(Long checkId); - + Integer deleteCheckMatListNew(Long checkId); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java index 29c309b..d95dee2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java @@ -146,4 +146,10 @@ public class StorageCheckMatServiceImpl implements StorageCheckMatService { return storageCheckMatMapper.deleteByMap(columnMap); } + + @Override + public Integer deleteCheckMatListNew(Long checkId) { + //删除条件 + return storageCheckMatMapper.deleteCheckMatList(checkId); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java index ce27c14..2b30fad 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java @@ -86,8 +86,8 @@ public class StorageInventoryServiceImpl implements StorageInventoryService { return storageInventoryMapper.selectNoZero(queryReqVO); }else{ // 筛选全部的实时库存数据，包含未分配仓库的物料信息和已分配仓库的物料信息 - if(queryReqVO.isALL()){ - return storageInventoryMapper.selectNowList(queryReqVO); + if(queryReqVO.getSelectAll() == 1){ + return storageInventoryMapper.selectNowListAll(queryReqVO); }else{ return storageInventoryMapper.selectNowList(queryReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml index 21bc3b4..32210b1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagecheckmat/StorageCheckMatMapper.xml @@ -8,5 +8,7 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - \ No newline at end of file + + delete from wms_storage_check_mat where check_id = #{checkId} + + diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml index 1ca289f..d75275e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml @@ -54,44 +54,6 @@ AND t.tenant_id = 2 GROUP BY t.id - - UNION ALL - - -- 第二部分：查询不在库存中的物料 - SELECT - mat.id as id, - mat.id as material_id, - mat.spec as boom_spec, - mat.unit as boom_unit, - mat.code AS mat_code, - mat.name AS mat_name, - (SELECT label FROM system_dict_data WHERE dict_type = 'heli_material_type' AND value = mat.material_type) AS mat_type, - mat.spec AS mat_spec, - (SELECT label FROM system_dict_data WHERE dict_type = 'heli_material_unit' AND value = mat.unit) AS mat_unit, - mat.brand AS mat_brand, - '' AS wh_id, - '' AS wh_name, - '' AS rg_id, - '' AS rg_name, - '' AS pn_id, - '' AS pn_name, - '' AS lot_no, - 0 AS price, - mat.short_name as short_name, - 0 AS mat_rest, - 1 as exist - FROM - base_material AS mat - WHERE - mat.virtual_part = 'N' - AND mat.status = 1 - AND NOT EXISTS ( - SELECT 1 FROM wms_storage_inventory ml - WHERE ml.wh_id = #{whId} - AND ml.material_id = mat.id - AND ml.tenant_id = 2 - ) - AND mat.tenant_id = 2 ) gh @@ -106,4 +68,104 @@ ORDER BY gh.mat_code + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue index ac9455f..529f9f1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue @@ -135,7 +135,7 @@ @@ -151,7 +151,7 @@ @@ -733,7 +733,10 @@ const handleSub = async (pNum, scope) => { //-------------------库位全数据 // scope.row.matSub = Number(pNum) - Number(scope.row.matRest) // console.log(typeof scope.row.matSub) + if(scope.row.storageOkQty < 0){ + scope.row.storageOkQty = 0; + } const matSubValue = Number(pNum) - Number(scope.row.matRest) scope.row.matSub = matSubValue.toFixed(2) // 保留两位小数 console.log(typeof scope.row.matSub) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue index 63e422a..5b93a55 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue @@ -94,7 +94,7 @@ const queryReqVo: any = reactive({ matCode: undefined, matType: undefined, matSpec: undefined, - isAll:false, + selectAll: 0, }) /** 搜索按钮操作 */ const handleQuery = async () => { @@ -125,7 +125,7 @@ const getList = async () => { } const overallList = async () => { // queryReqVo.pageSize = overallnum.value - queryReqVo.isAll = true + queryReqVo.selectAll = 1 const data1 = await SotrageInventoryApi.getStorageNowList(queryReqVo) // queryReqVo.pageSize = 10 handleSelectionChange(data1) @@ -149,6 +149,7 @@ const open = async (noZero: number, whId?: number, isAll?: number) => { getList() chkboxEnable.value = isAll === 2 ? false : true if (isAll == 2) { + queryReqVo.selectAll = 1 getList() overallList() }